From 1883c47d5c336af5580804bc059f3b32ae45a4a1 Mon Sep 17 00:00:00 2001
From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
Date: Mon, 11 Mar 2024 19:46:05 -0500
Subject: [PATCH 1/7] basic ref regex
makes the proc calls compatible with 515
---
code/__DEFINES/callbacks.dm | 2 +-
code/__DEFINES/cooldowns.dm | 4 +-
code/__DEFINES/skills/helpers.dm | 2 +-
code/__HELPERS/_lists.dm | 6 +-
code/__HELPERS/_string_lists.dm | 2 +-
code/__HELPERS/areas.dm | 4 +-
code/__HELPERS/game.dm | 2 +-
code/__HELPERS/global_lists.dm | 2 +-
code/__HELPERS/icons.dm | 2 +-
code/__HELPERS/priority_announce.dm | 2 +-
code/__HELPERS/qdel.dm | 4 +-
code/__HELPERS/roundend.dm | 2 +-
code/__HELPERS/stat_tracking.dm | 2 +-
code/__HELPERS/unsorted.dm | 17 ++++-
code/_onclick/ai.dm | 4 +-
code/_onclick/click.dm | 2 +-
code/_onclick/cyborg.dm | 4 +-
code/_onclick/hud/alert.dm | 10 +--
code/_onclick/hud/credits.dm | 2 +-
code/_onclick/hud/new_player.dm | 20 ++---
code/_onclick/hud/radial.dm | 2 +-
code/_onclick/hud/screen_objects.dm | 2 +-
code/_onclick/hud/screen_objects/storage.dm | 4 +-
code/_onclick/other_mobs.dm | 2 +-
code/_rendering/atom_huds/atom_hud.dm | 4 +-
code/_rendering/fullscreen/fullscreen.dm | 2 +-
code/_rendering/parallax/parallax_object.dm | 2 +-
code/controllers/admin.dm | 2 +-
.../configuration/configuration.dm | 2 +-
code/controllers/failsafe.dm | 2 +-
code/controllers/master.dm | 12 +--
code/controllers/subsystem/activity.dm | 4 +-
code/controllers/subsystem/air.dm | 2 +-
code/controllers/subsystem/dbcore.dm | 4 +-
code/controllers/subsystem/job.dm | 2 +-
code/controllers/subsystem/mapping.dm | 4 +-
code/controllers/subsystem/materials.dm | 2 +-
code/controllers/subsystem/npcpool.dm | 2 +-
code/controllers/subsystem/pai.dm | 2 +-
code/controllers/subsystem/pathfinder.dm | 2 +-
.../subsystem/processing/quirks.dm | 2 +-
.../subsystem/processing/weather.dm | 2 +-
code/controllers/subsystem/shuttle.dm | 2 +-
code/controllers/subsystem/statpanel.dm | 2 +-
code/controllers/subsystem/throwing.dm | 2 +-
code/controllers/subsystem/ticker.dm | 4 +-
code/controllers/subsystem/timer.dm | 2 +-
code/controllers/subsystem/vote.dm | 2 +-
code/datums/action.dm | 4 +-
code/datums/beam.dm | 8 +-
code/datums/brain_damage/brain_trauma.dm | 4 +-
code/datums/brain_damage/imaginary_friend.dm | 6 +-
code/datums/brain_damage/mild.dm | 4 +-
code/datums/brain_damage/phobia.dm | 2 +-
code/datums/brain_damage/severe.dm | 4 +-
code/datums/brain_damage/special.dm | 4 +-
code/datums/brain_damage/split_personality.dm | 4 +-
code/datums/browser.dm | 4 +-
code/datums/callback.dm | 10 +--
code/datums/chatmessage.dm | 4 +-
code/datums/cinematic.dm | 4 +-
code/datums/components/acid.dm | 4 +-
code/datums/components/activity.dm | 12 +--
code/datums/components/anti_magic.dm | 8 +-
code/datums/components/area_sound_manager.dm | 10 +--
code/datums/components/armor_plate.dm | 8 +-
code/datums/components/bane.dm | 4 +-
code/datums/components/bouncy.dm | 4 +-
code/datums/components/butchering.dm | 8 +-
code/datums/components/caltrop.dm | 2 +-
code/datums/components/chasm.dm | 4 +-
code/datums/components/combat_mode.dm | 20 ++---
code/datums/components/construction.dm | 4 +-
code/datums/components/crafting/crafting.dm | 4 +-
code/datums/components/dejavu.dm | 8 +-
code/datums/components/dullahan.dm | 6 +-
code/datums/components/earprotection.dm | 2 +-
code/datums/components/edible.dm | 8 +-
code/datums/components/edit_complainer.dm | 2 +-
code/datums/components/embedded.dm | 16 ++--
code/datums/components/explodable.dm | 18 ++---
code/datums/components/field_of_vision.dm | 32 ++++----
code/datums/components/footstep.dm | 4 +-
code/datums/components/fried.dm | 4 +-
code/datums/components/fullauto.dm | 24 +++---
code/datums/components/gps.dm | 12 +--
code/datums/components/honkspam.dm | 4 +-
code/datums/components/identification.dm | 8 +-
code/datums/components/igniter.dm | 6 +-
code/datums/components/infective.dm | 20 ++---
code/datums/components/jousting.dm | 10 +--
code/datums/components/killerqueen.dm | 8 +-
code/datums/components/knockback.dm | 6 +-
code/datums/components/knockoff.dm | 6 +-
code/datums/components/label.dm | 4 +-
code/datums/components/lifesteal.dm | 6 +-
code/datums/components/lockon_aiming.dm | 4 +-
code/datums/components/magnetic_catch.dm | 18 ++---
code/datums/components/material_container.dm | 4 +-
code/datums/components/mirv.dm | 2 +-
code/datums/components/mood.dm | 26 +++----
code/datums/components/multiple_lives.dm | 4 +-
code/datums/components/nanites.dm | 52 ++++++-------
code/datums/components/omen.dm | 6 +-
code/datums/components/orbiter.dm | 6 +-
code/datums/components/paintable.dm | 2 +-
code/datums/components/pellet_cloud.dm | 32 ++++----
code/datums/components/phantomthief.dm | 2 +-
code/datums/components/plumbing/_plumbing.dm | 4 +-
code/datums/components/pricetag.dm | 8 +-
code/datums/components/rad_insulation.dm | 6 +-
code/datums/components/radioactive.dm | 10 +--
code/datums/components/remote_materials.dm | 4 +-
code/datums/components/riding.dm | 10 +--
code/datums/components/rotation.dm | 8 +-
code/datums/components/shielded.dm | 12 +--
code/datums/components/slippery.dm | 2 +-
code/datums/components/spawner.dm | 4 +-
code/datums/components/spooky.dm | 2 +-
code/datums/components/squeak.dm | 26 +++----
code/datums/components/stationloving.dm | 8 +-
.../components/storage/concrete/_concrete.dm | 6 +-
.../components/storage/concrete/emergency.dm | 2 +-
.../components/storage/concrete/rped.dm | 4 +-
code/datums/components/storage/storage.dm | 68 ++++++++---------
code/datums/components/storage/ui.dm | 6 +-
code/datums/components/summoning.dm | 8 +-
code/datums/components/swarming.dm | 4 +-
code/datums/components/tackle.dm | 12 +--
code/datums/components/thermite.dm | 6 +-
code/datums/components/twitch_plays.dm | 10 +--
code/datums/components/twohanded.dm | 18 ++---
code/datums/components/uplink.dm | 22 +++---
code/datums/components/virtual_reality.dm | 22 +++---
code/datums/components/waddling.dm | 2 +-
code/datums/components/wearertargeting.dm | 6 +-
code/datums/components/wet_floor.dm | 8 +-
code/datums/dash_weapon.dm | 2 +-
code/datums/diseases/advance/advance.dm | 2 +-
.../datums/diseases/advance/symptoms/cough.dm | 6 +-
code/datums/diseases/advance/symptoms/heal.dm | 4 +-
.../diseases/advance/symptoms/shedding.dm | 4 +-
code/datums/diseases/pierrot_throat.dm | 2 +-
code/datums/elements/_element.dm | 2 +-
code/datums/elements/art.dm | 8 +-
code/datums/elements/beauty.dm | 4 +-
code/datums/elements/bed_tucking.dm | 4 +-
code/datums/elements/bsa_blocker.dm | 2 +-
code/datums/elements/cleaning.dm | 2 +-
code/datums/elements/connect_loc.dm | 2 +-
code/datums/elements/decal.dm | 12 +--
code/datums/elements/dusts_on_leaving_area.dm | 2 +-
code/datums/elements/dwarfism.dm | 2 +-
code/datums/elements/earhealing.dm | 2 +-
code/datums/elements/embed.dm | 14 ++--
code/datums/elements/empprotection.dm | 2 +-
code/datums/elements/firestacker.dm | 6 +-
code/datums/elements/flavor_text.dm | 16 ++--
code/datums/elements/forced_gravity.dm | 4 +-
.../datums/elements/ghost_role_eligibility.dm | 2 +-
code/datums/elements/mob_holder.dm | 8 +-
code/datums/elements/object_reskinning.dm | 8 +-
code/datums/elements/polychromic.dm | 24 +++---
code/datums/elements/scavenging.dm | 8 +-
.../contextual_screentip_bare_hands.dm | 2 +-
.../contextual_screentip_item_typechecks.dm | 2 +-
.../contextual_screentip_sharpness.dm | 2 +-
.../screentips/contextual_screentip_tools.dm | 2 +-
code/datums/elements/snail_crawl.dm | 4 +-
code/datums/elements/spellcasting.dm | 8 +-
code/datums/elements/squish.dm | 2 +-
code/datums/elements/strippable.dm | 4 +-
code/datums/elements/swimming.dm | 2 +-
code/datums/elements/sword_point.dm | 2 +-
code/datums/elements/tactical.dm | 4 +-
code/datums/elements/trash.dm | 2 +-
code/datums/elements/turf_transparency.dm | 4 +-
code/datums/elements/update_icon_blocker.dm | 2 +-
.../elements/update_icon_updates_onmob.dm | 2 +-
code/datums/elements/ventcrawling.dm | 6 +-
code/datums/elements/weather_listener.dm | 4 +-
code/datums/elements/wuv.dm | 6 +-
code/datums/explosion.dm | 2 +-
code/datums/holocall.dm | 2 +-
code/datums/looping_sounds/_looping_sound.dm | 6 +-
code/datums/martial/sleeping_carp.dm | 4 +-
code/datums/martial/wrestling.dm | 4 +-
code/datums/materials/_material.dm | 4 +-
code/datums/mind.dm | 6 +-
.../mood_events/generic_negative_events.dm | 2 +-
code/datums/mutations/_mutations.dm | 4 +-
code/datums/mutations/actions.dm | 2 +-
code/datums/mutations/body.dm | 2 +-
code/datums/mutations/hulk.dm | 2 +-
code/datums/mutations/space_adaptation.dm | 2 +-
code/datums/mutations/speech.dm | 10 +--
code/datums/profiling.dm | 2 +-
code/datums/progressbar.dm | 6 +-
code/datums/screentips/atom_context.dm | 2 +-
code/datums/screentips/item_context.dm | 2 +-
code/datums/skills/_skill.dm | 2 +-
code/datums/skills/_skill_modifier.dm | 10 +--
code/datums/station_traits/_station_trait.dm | 2 +-
code/datums/station_traits/negative_traits.dm | 6 +-
code/datums/station_traits/neutral_traits.dm | 4 +-
code/datums/station_traits/positive_traits.dm | 8 +-
code/datums/status_effects/debuffs.dm | 10 +--
code/datums/status_effects/gas.dm | 2 +-
code/datums/status_effects/neutral.dm | 8 +-
code/datums/status_effects/wound_effects.dm | 8 +-
code/datums/tgs_event_handler.dm | 2 +-
code/datums/traits/_quirk.dm | 4 +-
code/datums/traits/negative.dm | 12 +--
code/datums/traits/neutral.dm | 2 +-
code/datums/weather/weather.dm | 6 +-
code/datums/wires/airalarm.dm | 4 +-
code/datums/wires/airlock.dm | 6 +-
code/datums/wires/apc.dm | 6 +-
code/datums/wires/autolathe.dm | 6 +-
code/datums/wounds/_scars.dm | 4 +-
code/datums/wounds/_wounds.dm | 2 +-
code/datums/wounds/bones.dm | 12 +--
code/datums/wounds/burns.dm | 4 +-
code/datums/wounds/pierce.dm | 4 +-
code/datums/wounds/slash.dm | 10 +--
code/game/area/areas.dm | 6 +-
code/game/atoms.dm | 6 +-
code/game/atoms_movable.dm | 2 +-
code/game/gamemodes/dynamic/dynamic.dm | 4 +-
.../gamemodes/dynamic/dynamic_hijacking.dm | 2 +-
.../game/gamemodes/dynamic/ruleset_picking.dm | 6 +-
code/game/gamemodes/game_mode.dm | 6 +-
code/game/gamemodes/traitor/traitor.dm | 2 +-
code/game/machinery/_machinery.dm | 4 +-
code/game/machinery/ai_slipper.dm | 2 +-
code/game/machinery/autolathe.dm | 8 +-
code/game/machinery/buttons.dm | 2 +-
code/game/machinery/camera/camera.dm | 4 +-
code/game/machinery/civilian_bountys.dm | 2 +-
code/game/machinery/cloning.dm | 2 +-
code/game/machinery/computer/apc_control.dm | 2 +-
code/game/machinery/computer/arcade/battle.dm | 2 +-
code/game/machinery/computer/camera.dm | 4 +-
code/game/machinery/computer/cloning.dm | 2 +-
code/game/machinery/computer/crew.dm | 2 +-
.../computer/prisoner/gulag_teleporter.dm | 2 +-
code/game/machinery/computer/teleporter.dm | 4 +-
code/game/machinery/constructable_frame.dm | 12 +--
code/game/machinery/dance_machine.dm | 2 +-
code/game/machinery/deployable.dm | 2 +-
code/game/machinery/doors/airlock.dm | 26 +++----
code/game/machinery/doors/alarmlock.dm | 2 +-
code/game/machinery/doors/brigdoors.dm | 4 +-
code/game/machinery/doors/door.dm | 4 +-
code/game/machinery/doors/firedoor.dm | 2 +-
code/game/machinery/doors/poddoor.dm | 4 +-
code/game/machinery/doors/windowdoor.dm | 12 +--
code/game/machinery/doppler_array.dm | 2 +-
.../embedded_controller_base.dm | 4 +-
code/game/machinery/harvester.dm | 4 +-
code/game/machinery/hologram.dm | 2 +-
code/game/machinery/hypnochair.dm | 2 +-
code/game/machinery/limbgrower.dm | 4 +-
code/game/machinery/magnet.dm | 4 +-
code/game/machinery/mass_driver.dm | 2 +-
.../machinery/porta_turret/portable_turret.dm | 20 ++---
code/game/machinery/posi_alert.dm | 2 +-
code/game/machinery/recycler.dm | 2 +-
code/game/machinery/requests_console.dm | 2 +-
code/game/machinery/sheetifier.dm | 4 +-
code/game/machinery/slotmachine.dm | 8 +-
code/game/machinery/suit_storage_unit.dm | 6 +-
code/game/machinery/syndicatebomb.dm | 2 +-
.../machinery/telecomms/computers/message.dm | 4 +-
code/game/machinery/transformer.dm | 2 +-
code/game/machinery/washing_machine.dm | 2 +-
code/game/objects/effects/anomalies.dm | 6 +-
code/game/objects/effects/blessing.dm | 2 +-
code/game/objects/effects/contraband.dm | 2 +-
code/game/objects/effects/countdown.dm | 2 +-
code/game/objects/effects/decals/cleanable.dm | 2 +-
.../effects/effect_system/effect_system.dm | 4 +-
.../effect_system/effects_explosion.dm | 4 +-
.../effects/effect_system/effects_foam.dm | 2 +-
.../effects/effect_system/effects_smoke.dm | 4 +-
code/game/objects/effects/glowshroom.dm | 8 +-
code/game/objects/effects/proximity.dm | 2 +-
.../effects/spawners/xeno_egg_delivery.dm | 2 +-
.../effects/temporary_visuals/clockcult.dm | 2 +-
.../temporary_visuals/miscellaneous.dm | 4 +-
code/game/objects/items.dm | 6 +-
code/game/objects/items/RCD.dm | 14 ++--
code/game/objects/items/RCL.dm | 8 +-
code/game/objects/items/binoculars.dm | 8 +-
code/game/objects/items/body_egg.dm | 4 +-
code/game/objects/items/boombox.dm | 2 +-
code/game/objects/items/broom.dm | 6 +-
code/game/objects/items/cardboard_cutouts.dm | 2 +-
code/game/objects/items/chainsaw.dm | 4 +-
code/game/objects/items/charter.dm | 2 +-
code/game/objects/items/cosmetics.dm | 4 +-
code/game/objects/items/crab17.dm | 8 +-
code/game/objects/items/debug_items.dm | 2 +-
code/game/objects/items/defib.dm | 6 +-
code/game/objects/items/devices/PDA/PDA.dm | 2 +-
.../objects/items/devices/PDA/PDA_types.dm | 2 +-
code/game/objects/items/devices/PDA/cart.dm | 2 +-
.../objects/items/devices/desynchronizer.dm | 2 +-
.../objects/items/devices/dogborg_sleeper.dm | 2 +-
.../devices/electroadaptive_pseudocircuit.dm | 2 +-
.../objects/items/devices/geiger_counter.dm | 4 +-
code/game/objects/items/devices/megaphone.dm | 2 +-
.../items/devices/portable_chem_mixer.dm | 2 +-
.../objects/items/devices/pressureplates.dm | 2 +-
.../game/objects/items/devices/radio/radio.dm | 4 +-
.../items/devices/reverse_bear_trap.dm | 2 +-
code/game/objects/items/devices/scanners.dm | 2 +-
code/game/objects/items/devices/swapper.dm | 2 +-
.../objects/items/devices/traitordevices.dm | 2 +-
.../objects/items/devices/transfer_valve.dm | 4 +-
code/game/objects/items/dualsaber.dm | 8 +-
code/game/objects/items/eightball.dm | 2 +-
code/game/objects/items/electrostaff.dm | 4 +-
code/game/objects/items/fireaxe.dm | 4 +-
.../objects/items/grenades/antigravity.dm | 2 +-
.../objects/items/grenades/chem_grenade.dm | 2 +-
.../objects/items/grenades/clusterbuster.dm | 2 +-
code/game/objects/items/grenades/grenade.dm | 2 +-
code/game/objects/items/grenades/plastic.dm | 6 +-
code/game/objects/items/hand_items.dm | 10 +--
code/game/objects/items/handcuffs.dm | 2 +-
code/game/objects/items/his_grace.dm | 4 +-
code/game/objects/items/holy_weapons.dm | 4 +-
code/game/objects/items/hot_potato.dm | 2 +-
.../items/implants/implant_deathrattle.dm | 2 +-
.../items/implants/implant_explosive.dm | 10 +--
.../objects/items/implants/implant_misc.dm | 2 +-
.../objects/items/implants/implant_stealth.dm | 2 +-
code/game/objects/items/melee/misc.dm | 4 +-
code/game/objects/items/pinpointer.dm | 2 +-
code/game/objects/items/pitchfork.dm | 4 +-
code/game/objects/items/plushes.dm | 2 +-
code/game/objects/items/robot/robot_items.dm | 2 +-
code/game/objects/items/shields.dm | 2 +-
code/game/objects/items/singularityhammer.dm | 8 +-
code/game/objects/items/spear.dm | 4 +-
code/game/objects/items/stacks/medical.dm | 2 +-
code/game/objects/items/stacks/stack.dm | 4 +-
code/game/objects/items/storage/bags.dm | 2 +-
code/game/objects/items/storage/book.dm | 2 +-
code/game/objects/items/storage/boxes.dm | 2 +-
code/game/objects/items/summon.dm | 14 ++--
code/game/objects/items/tanks/jetpack.dm | 2 +-
code/game/objects/items/teleportation.dm | 4 +-
code/game/objects/items/theft_tools.dm | 4 +-
code/game/objects/items/toys.dm | 6 +-
code/game/objects/items/weaponry.dm | 4 +-
code/game/objects/obj_defense.dm | 2 +-
code/game/objects/structures/aliens.dm | 4 +-
code/game/objects/structures/barsigns.dm | 2 +-
.../objects/structures/beds_chairs/chair.dm | 4 +-
.../structures/crates_lockers/closets.dm | 2 +-
.../crates_lockers/closets/cardboardbox.dm | 2 +-
code/game/objects/structures/divine.dm | 2 +-
code/game/objects/structures/electricchair.dm | 2 +-
code/game/objects/structures/femur_breaker.dm | 4 +-
code/game/objects/structures/flora.dm | 2 +-
.../objects/structures/ghost_role_spawners.dm | 2 +-
code/game/objects/structures/guillotine.dm | 8 +-
code/game/objects/structures/hivebot.dm | 2 +-
code/game/objects/structures/holosign.dm | 4 +-
.../structures/icemoon/cave_entrance.dm | 2 +-
code/game/objects/structures/janicart.dm | 2 +-
code/game/objects/structures/ladders.dm | 2 +-
.../structures/lavaland/necropolis_tendril.dm | 2 +-
code/game/objects/structures/life_candle.dm | 4 +-
code/game/objects/structures/manned_turret.dm | 2 +-
code/game/objects/structures/mineral_doors.dm | 2 +-
code/game/objects/structures/plasticflaps.dm | 2 +-
code/game/objects/structures/railings.dm | 4 +-
code/game/objects/structures/stairs.dm | 2 +-
code/game/objects/structures/statues.dm | 4 +-
code/game/objects/structures/tables_racks.dm | 4 +-
.../transit_tube_construction.dm | 4 +-
code/game/objects/structures/watercloset.dm | 4 +-
.../objects/structures/windoor_assembly.dm | 2 +-
code/game/objects/structures/window.dm | 12 +--
code/game/say.dm | 2 +-
code/game/turfs/open.dm | 2 +-
code/game/turfs/simulated/minerals.dm | 6 +-
code/game/turfs/turf.dm | 2 +-
code/game/world.dm | 4 +-
code/modules/VR/vr_sleeper.dm | 16 ++--
code/modules/admin/admin_verbs.dm | 4 +-
code/modules/admin/antag_panel.dm | 2 +-
code/modules/admin/check_antagonists.dm | 2 +-
code/modules/admin/player_panel2.dm | 2 +-
code/modules/admin/playtimes.dm | 2 +-
code/modules/admin/tag.dm | 2 +-
code/modules/admin/verbs/SDQL2/SDQL_2.dm | 2 +-
code/modules/admin/verbs/adminpm.dm | 2 +-
code/modules/admin/verbs/debug.dm | 6 +-
.../modules/admin/verbs/individual_logging.dm | 2 +-
code/modules/admin/verbs/one_click_antag.dm | 4 +-
code/modules/admin/verbs/onlyone.dm | 4 +-
code/modules/admin/verbs/possess.dm | 4 +-
code/modules/admin/verbs/randomverbs.dm | 14 ++--
code/modules/admin/verbs/secrets.dm | 8 +-
.../admin/view_variables/topic_basic.dm | 4 +-
.../antagonists/_common/antag_datum.dm | 6 +-
code/modules/antagonists/abductor/abductor.dm | 2 +-
.../abductor/equipment/abduction_gear.dm | 2 +-
.../antagonists/abductor/equipment/gland.dm | 2 +-
.../abductor/equipment/glands/access.dm | 2 +-
.../abductor/equipment/glands/electric.dm | 2 +-
.../abductor/equipment/glands/heal.dm | 6 +-
.../abductor/equipment/glands/mindshock.dm | 2 +-
.../abductor/equipment/glands/plasma.dm | 4 +-
.../abductor/equipment/glands/quantum.dm | 2 +-
.../antagonists/abductor/machinery/pad.dm | 4 +-
.../antagonists/ashwalker/ashwalker.dm | 4 +-
.../antagonists/blob/blob/blobs/core.dm | 2 +-
.../modules/antagonists/blob/blob/overmind.dm | 2 +-
.../blood_contract/blood_contract.dm | 2 +-
.../bloodsucker/datum_bloodsucker.dm | 2 +-
.../antagonists/bloodsucker/powers/feed.dm | 4 +-
.../antagonists/bloodsucker/powers/haste.dm | 2 +-
.../antagonists/bloodsucker/powers/lunge.dm | 4 +-
.../bloodsucker/powers/mesmerize.dm | 4 +-
.../antagonists/changeling/changeling.dm | 4 +-
.../changeling/powers/biodegrade.dm | 10 +--
.../changeling/powers/fakedeath.dm | 2 +-
.../changeling/powers/mutations.dm | 6 +-
.../changeling/powers/strained_muscles.dm | 2 +-
.../changeling/powers/tiny_prick.dm | 2 +-
.../changeling/powers/transform.dm | 2 +-
.../clockcult/clock_effects/clock_overlay.dm | 2 +-
.../clockcult/clock_effects/clock_sigils.dm | 2 +-
.../clock_effects/spatial_gateway.dm | 4 +-
.../clock_helpers/fabrication_helpers.dm | 8 +-
.../clock_helpers/scripture_checks.dm | 2 +-
.../clock_items/clock_weapons/_call_weapon.dm | 2 +-
.../clock_weapons/ratvarian_shield.dm | 2 +-
.../clockcult/clock_items/clockwork_armor.dm | 8 +-
.../clockcult/clock_items/clockwork_slab.dm | 4 +-
.../clockcult/clock_items/judicial_visor.dm | 8 +-
.../clock_items/replica_fabricator.dm | 2 +-
.../clockcult/clock_mobs/_eminence.dm | 4 +-
.../antagonists/clockcult/clock_scripture.dm | 4 +-
.../clock_scriptures/scripture_scripts.dm | 4 +-
.../ark_of_the_clockwork_justicar.dm | 6 +-
.../clock_structures/eminence_spire.dm | 2 +-
.../ratvar_the_clockwork_justicar.dm | 4 +-
.../clockcult/clock_structures/reflector.dm | 2 +-
.../clock_structures/traps/brass_skewer.dm | 4 +-
.../antagonists/clockcult/clockcult.dm | 2 +-
code/modules/antagonists/cult/blood_magic.dm | 2 +-
code/modules/antagonists/cult/cult.dm | 8 +-
code/modules/antagonists/cult/cult_comms.dm | 14 ++--
code/modules/antagonists/cult/cult_items.dm | 14 ++--
.../antagonists/cult/cult_structures.dm | 6 +-
.../antagonists/cult/rune_spawn_action.dm | 4 +-
code/modules/antagonists/cult/runes.dm | 14 ++--
code/modules/antagonists/devil/devil.dm | 2 +-
.../antagonists/disease/disease_mob.dm | 6 +-
.../eldritch_cult/eldritch_antag.dm | 2 +-
.../eldritch_cult/eldritch_effects.dm | 8 +-
.../eldritch_cult/eldritch_knowledge.dm | 4 +-
.../eldritch_cult/eldritch_magic.dm | 14 ++--
.../eldritch_cult/knowledge/flesh_lore.dm | 4 +-
code/modules/antagonists/gang/gang.dm | 2 +-
code/modules/antagonists/gang/handler.dm | 2 +-
.../nukeop/equipment/borgchameleon.dm | 2 +-
.../nukeop/equipment/nuclearbomb.dm | 10 +--
code/modules/antagonists/nukeop/nukeop.dm | 6 +-
.../antagonists/overthrow/overthrow.dm | 4 +-
.../antagonists/overthrow/overthrow_team.dm | 4 +-
code/modules/antagonists/pirate/pirate.dm | 2 +-
code/modules/antagonists/revenant/revenant.dm | 8 +-
.../revenant/revenant_abilities.dm | 10 +--
.../antagonists/revenant/revenant_blight.dm | 2 +-
.../antagonists/revolution/revolution.dm | 14 ++--
.../antagonists/slaughter/slaughter.dm | 2 +-
.../antagonists/traitor/datum_traitor.dm | 2 +-
.../traitor/equipment/Malf_Modules.dm | 14 ++--
.../antagonists/traitor/syndicate_contract.dm | 4 +-
.../antagonists/wizard/equipment/artefact.dm | 2 +-
code/modules/antagonists/wizard/wizard.dm | 2 +-
code/modules/arousal/genitals.dm | 2 +-
code/modules/assembly/assembly.dm | 4 +-
code/modules/assembly/doorcontrol.dm | 12 +--
code/modules/assembly/flash.dm | 6 +-
code/modules/assembly/infrared.dm | 4 +-
code/modules/assembly/signaler.dm | 2 +-
code/modules/assembly/timer.dm | 2 +-
code/modules/assembly/voice.dm | 4 +-
.../asset_cache/transports/asset_transport.dm | 4 +-
.../atmospherics/gasmixtures/reactions.dm | 2 +-
.../atmospherics/machinery/airalarm.dm | 2 +-
.../components/binary_devices/valve.dm | 2 +-
.../components/unary_devices/cryo.dm | 2 +-
.../unary_devices/outlet_injector.dm | 4 +-
.../components/unary_devices/vent_scrubber.dm | 2 +-
code/modules/awaymissions/capture_the_flag.dm | 10 +--
code/modules/awaymissions/corpse.dm | 2 +-
code/modules/awaymissions/gateway.dm | 2 +-
.../awaymissions/mission_code/jungleresort.dm | 2 +-
.../awaymissions/mission_code/murderdome.dm | 2 +-
code/modules/balloon_alert/balloon_alert.dm | 4 +-
code/modules/buildmode/buildmode.dm | 2 +-
code/modules/cargo/centcom_podlauncher.dm | 2 +-
code/modules/cargo/gondolapod.dm | 2 +-
code/modules/cargo/packs/organic.dm | 2 +-
code/modules/cargo/supplypod.dm | 20 ++---
code/modules/cargo/supplypod_beacon.dm | 2 +-
code/modules/client/client_colour.dm | 2 +-
code/modules/client/client_procs.dm | 8 +-
code/modules/client/preferences.dm | 2 +-
code/modules/client/preferences_savefile.dm | 2 +-
code/modules/clothing/chameleon.dm | 2 +-
code/modules/clothing/clothing.dm | 4 +-
code/modules/clothing/glasses/phantomthief.dm | 2 +-
code/modules/clothing/gloves/_gloves.dm | 2 +-
code/modules/clothing/gloves/color.dm | 2 +-
code/modules/clothing/gloves/miscellaneous.dm | 2 +-
code/modules/clothing/head/jobs.dm | 2 +-
code/modules/clothing/head/misc.dm | 2 +-
code/modules/clothing/head/misc_special.dm | 2 +-
code/modules/clothing/masks/_masks.dm | 2 +-
code/modules/clothing/shoes/_shoes.dm | 12 +--
code/modules/clothing/shoes/magboots.dm | 4 +-
code/modules/clothing/shoes/miscellaneous.dm | 6 +-
.../modules/clothing/spacesuits/chronosuit.dm | 8 +-
code/modules/clothing/spacesuits/hardsuit.dm | 6 +-
.../clothing/spacesuits/miscellaneous.dm | 4 +-
code/modules/clothing/spacesuits/plasmamen.dm | 2 +-
code/modules/clothing/suits/wiz_robe.dm | 12 +--
code/modules/detectivework/scanner.dm | 2 +-
code/modules/events/fake_virus.dm | 2 +-
code/modules/events/fugitive_spawning.dm | 4 +-
code/modules/events/ghost_role.dm | 2 +-
code/modules/events/pirates.dm | 6 +-
code/modules/events/wizard/fakeexplosion.dm | 2 +-
code/modules/events/wizard/greentext.dm | 2 +-
code/modules/fields/fields.dm | 4 +-
code/modules/fields/infinite_void.dm | 6 +-
code/modules/fields/timestop.dm | 6 +-
code/modules/flufftext/Dreaming.dm | 2 +-
code/modules/flufftext/Hallucination.dm | 20 ++---
code/modules/food_and_drinks/drinks/drinks.dm | 2 +-
code/modules/food_and_drinks/food/snacks.dm | 2 +-
.../food_and_drinks/food/snacks_other.dm | 4 +-
.../food_and_drinks/food/snacks_pastry.dm | 2 +-
.../kitchen_machinery/gibber.dm | 2 +-
.../kitchen_machinery/microwave.dm | 2 +-
.../kitchen_machinery/monkeyrecycler.dm | 2 +-
code/modules/holiday/holidays.dm | 2 +-
code/modules/holodeck/computer.dm | 6 +-
code/modules/holodeck/turfs.dm | 2 +-
code/modules/hydroponics/fermenting_barrel.dm | 2 +-
code/modules/hydroponics/grown/citrus.dm | 2 +-
code/modules/hydroponics/grown/melon.dm | 2 +-
code/modules/hydroponics/grown/misc.dm | 4 +-
code/modules/hydroponics/plant_genes.dm | 2 +-
.../instrument_data/_instrument_data.dm | 2 +-
code/modules/instruments/instruments/item.dm | 2 +-
code/modules/instruments/songs/editor.dm | 2 +-
.../integrated_electronics/core/printer.dm | 2 +-
.../integrated_electronics/subtypes/input.dm | 2 +-
.../subtypes/manipulation.dm | 4 +-
.../integrated_electronics/subtypes/output.dm | 2 +-
.../integrated_electronics/subtypes/time.dm | 4 +-
.../subtypes/weaponized.dm | 2 +-
code/modules/jobs/job_types/_job.dm | 2 +-
code/modules/jobs/job_types/ai.dm | 2 +-
code/modules/jobs/job_types/captain.dm | 2 +-
code/modules/keybindings/setup.dm | 2 +-
code/modules/library/lib_codex_gigas.dm | 2 +-
code/modules/mafia/controller.dm | 24 +++---
code/modules/mafia/roles.dm | 58 +++++++-------
code/modules/mining/aux_base.dm | 2 +-
.../modules/mining/equipment/explorer_gear.dm | 4 +-
.../mining/equipment/kinetic_crusher.dm | 10 +--
.../mining/equipment/regenerative_core.dm | 2 +-
code/modules/mining/equipment/resonator.dm | 2 +-
.../mining/equipment/wormhole_jaunter.dm | 4 +-
code/modules/mining/laborcamp/laborstacker.dm | 2 +-
code/modules/mining/lavaland/ash_flora.dm | 2 +-
code/modules/mining/lavaland/ash_tree.dm | 2 +-
.../mining/lavaland/necropolis_chests.dm | 36 ++++-----
code/modules/mining/machine_processing.dm | 2 +-
code/modules/mining/ores_coins.dm | 4 +-
code/modules/mob/living/bloodcrawl.dm | 2 +-
code/modules/mob/living/brain/posibrain.dm | 2 +-
.../carbon/alien/humanoid/caste/hunter.dm | 2 +-
.../modules/mob/living/carbon/alien/organs.dm | 2 +-
.../carbon/alien/special/alien_embryo.dm | 2 +-
.../living/carbon/alien/special/facehugger.dm | 8 +-
code/modules/mob/living/carbon/carbon.dm | 2 +-
.../mob/living/carbon/carbon_defense.dm | 2 +-
.../mob/living/carbon/handle_corruption.dm | 20 ++---
code/modules/mob/living/carbon/human/death.dm | 2 +-
code/modules/mob/living/carbon/human/emote.dm | 2 +-
code/modules/mob/living/carbon/human/human.dm | 6 +-
.../living/carbon/human/human_update_icons.dm | 2 +-
.../carbon/human/innate_abilities/coiling.dm | 8 +-
.../mob/living/carbon/human/species.dm | 6 +-
.../carbon/human/species_types/arachnid.dm | 2 +-
.../carbon/human/species_types/dwarves.dm | 2 +-
.../carbon/human/species_types/ethereal.dm | 10 +--
.../carbon/human/species_types/golems.dm | 10 +--
.../carbon/human/species_types/jellypeople.dm | 4 +-
.../carbon/human/species_types/mushpeople.dm | 2 +-
.../carbon/human/species_types/synths.dm | 2 +-
.../mob/living/carbon/monkey/combat.dm | 14 ++--
code/modules/mob/living/death.dm | 2 +-
code/modules/mob/living/emote.dm | 2 +-
code/modules/mob/living/life.dm | 6 +-
code/modules/mob/living/living.dm | 2 +-
.../modules/mob/living/living_active_block.dm | 2 +-
.../modules/mob/living/living_active_parry.dm | 4 +-
code/modules/mob/living/living_block.dm | 2 +-
code/modules/mob/living/living_defense.dm | 6 +-
code/modules/mob/living/living_mobility.dm | 2 +-
code/modules/mob/living/living_signals.dm | 12 +--
code/modules/mob/living/living_sprint.dm | 2 +-
code/modules/mob/living/say.dm | 2 +-
code/modules/mob/living/silicon/ai/death.dm | 2 +-
.../mob/living/silicon/ai/freelook/chunk.dm | 2 +-
code/modules/mob/living/silicon/ai/life.dm | 2 +-
code/modules/mob/living/silicon/laws.dm | 2 +-
code/modules/mob/living/silicon/pai/pai.dm | 2 +-
.../modules/mob/living/silicon/robot/robot.dm | 8 +-
.../mob/living/silicon/robot/robot_defense.dm | 2 +-
.../mob/living/silicon/robot/robot_modules.dm | 14 ++--
.../mob/living/silicon/silicon_movement.dm | 2 +-
.../living/simple_animal/bot/SuperBeepsky.dm | 8 +-
.../mob/living/simple_animal/bot/bot.dm | 2 +-
.../mob/living/simple_animal/bot/ed209bot.dm | 16 ++--
.../mob/living/simple_animal/bot/honkbot.dm | 26 +++----
.../mob/living/simple_animal/bot/mulebot.dm | 10 +--
.../mob/living/simple_animal/bot/secbot.dm | 16 ++--
.../living/simple_animal/eldritch_demons.dm | 4 +-
.../mob/living/simple_animal/friendly/dog.dm | 2 +-
.../simple_animal/friendly/drone/_drone.dm | 2 +-
.../living/simple_animal/gremlin/gremlin.dm | 2 +-
.../simple_animal/guardian/types/charger.dm | 2 +-
.../simple_animal/guardian/types/explosive.dm | 2 +-
.../guardian/types/gravitokinetic.dm | 2 +-
.../mob/living/simple_animal/hostile/bees.dm | 2 +-
.../hostile/bosses/paperwizard.dm | 2 +-
.../simple_animal/hostile/floor_cluwne.dm | 14 ++--
.../simple_animal/hostile/giant_spider.dm | 2 +-
.../living/simple_animal/hostile/headcrab.dm | 2 +-
.../living/simple_animal/hostile/hostile.dm | 14 ++--
.../simple_animal/hostile/jungle/leaper.dm | 10 +--
.../simple_animal/hostile/jungle/mook.dm | 18 ++---
.../simple_animal/hostile/jungle/seedling.dm | 12 +--
.../simple_animal/hostile/mecha_pilot.dm | 6 +-
.../hostile/megafauna/blood_drunk_miner.dm | 6 +-
.../hostile/megafauna/bubblegum.dm | 6 +-
.../hostile/megafauna/colossus.dm | 8 +-
.../hostile/megafauna/demonic_frost_miner.dm | 6 +-
.../simple_animal/hostile/megafauna/drake.dm | 12 +--
.../hostile/megafauna/hierophant.dm | 34 ++++-----
.../simple_animal/hostile/megafauna/legion.dm | 10 +--
.../hostile/megafauna/swarmer.dm | 2 +-
.../hostile/megafauna/wendigo.dm | 2 +-
.../hostile/mining_mobs/elites/elite.dm | 18 ++---
.../mining_mobs/elites/goliath_broodmother.dm | 6 +-
.../hostile/mining_mobs/elites/herald.dm | 20 ++---
.../hostile/mining_mobs/elites/legionnaire.dm | 6 +-
.../hostile/mining_mobs/elites/pandora.dm | 10 +--
.../hostile/mining_mobs/goldgrub.dm | 2 +-
.../hostile/mining_mobs/goliath.dm | 6 +-
.../hostile/mining_mobs/hivelord.dm | 2 +-
.../living/simple_animal/hostile/mushroom.dm | 4 +-
.../living/simple_animal/hostile/plaguerat.dm | 2 +-
.../living/simple_animal/hostile/regalrat.dm | 2 +-
.../simple_animal/hostile/space_dragon.dm | 8 +-
.../simple_animal/hostile/venus_human_trap.dm | 4 +-
.../living/simple_animal/hostile/wizard.dm | 2 +-
.../mob/living/simple_animal/parrot.dm | 2 +-
.../mob/living/simple_animal/slime/life.dm | 2 +-
code/modules/mob/mob.dm | 10 +--
code/modules/mob/transform_procs.dm | 2 +-
code/modules/mob/typing_indicator.dm | 2 +-
code/modules/mod/mod_ai.dm | 2 +-
code/modules/mod/mod_control.dm | 8 +-
code/modules/mod/mod_paint.dm | 2 +-
code/modules/mod/modules/_module.dm | 10 +--
.../mod/modules/modules_engineering.dm | 2 +-
code/modules/mod/modules/modules_general.dm | 10 +--
code/modules/mod/modules/modules_maint.dm | 6 +-
code/modules/mod/modules/modules_medical.dm | 2 +-
code/modules/mod/modules/modules_science.dm | 2 +-
code/modules/mod/modules/modules_security.dm | 14 ++--
code/modules/mod/modules/modules_supply.dm | 4 +-
.../programs/antagonist/revelation.dm | 2 +-
.../file_system/programs/signaler.dm | 2 +-
.../file_system/programs/sm_monitor.dm | 6 +-
.../modular_computers/laptop_vendor.dm | 2 +-
code/modules/newscaster/newscaster_machine.dm | 2 +-
.../ninja_adrenaline.dm | 2 +-
.../ninja_suit_initialisation.dm | 4 +-
code/modules/paperwork/clipboard.dm | 2 +-
code/modules/paperwork/contract.dm | 2 +-
code/modules/paperwork/photocopier.dm | 12 +--
code/modules/paperwork/ticketmachine.dm | 2 +-
code/modules/photography/camera/camera.dm | 4 +-
.../plumbing/plumbers/_plumb_machinery.dm | 2 +-
.../plumbing/plumbers/medipenrefill.dm | 2 +-
code/modules/pool/pool_structures.dm | 18 ++---
code/modules/pool/pool_wires.dm | 2 +-
code/modules/power/antimatter/control.dm | 6 +-
code/modules/power/antimatter/shielding.dm | 4 +-
code/modules/power/apc.dm | 16 ++--
code/modules/power/cable.dm | 2 +-
code/modules/power/multiz.dm | 6 +-
code/modules/power/reactor/rbmk.dm | 2 +-
code/modules/power/rtg.dm | 2 +-
.../power/singularity/containment_field.dm | 2 +-
code/modules/power/singularity/emitter.dm | 2 +-
code/modules/power/singularity/narsie.dm | 12 +--
.../particle_accelerator/particle.dm | 2 +-
code/modules/power/solar.dm | 4 +-
code/modules/power/supermatter/supermatter.dm | 2 +-
code/modules/power/tesla/coil.dm | 4 +-
code/modules/power/tesla/energy_ball.dm | 2 +-
code/modules/power/tracker.dm | 2 +-
.../procedural_mapping/mapGenerator.dm | 4 +-
.../projectiles/ammunition/_ammunition.dm | 4 +-
code/modules/projectiles/gun.dm | 6 +-
code/modules/projectiles/guns/ballistic.dm | 2 +-
.../guns/energy/kinetic_accelerator.dm | 4 +-
.../projectiles/guns/misc/beam_rifle.dm | 2 +-
.../projectiles/guns/misc/grenade_launcher.dm | 2 +-
code/modules/projectiles/guns/misc/medbeam.dm | 2 +-
code/modules/projectiles/projectile.dm | 2 +-
.../projectile/energy/net_snare.dm | 2 +-
.../projectiles/projectile/energy/stun.dm | 2 +-
code/modules/projectiles/projectile/magic.dm | 12 +--
.../projectile/special/hallucination.dm | 4 +-
code/modules/reagents/chemistry/holder.dm | 2 +-
.../chemistry/machinery/chem_dispenser.dm | 14 ++--
.../reagents/chemistry/machinery/pandemic.dm | 4 +-
.../chemistry/machinery/reagentgrinder.dm | 4 +-
.../chemistry/machinery/smoke_machine.dm | 2 +-
.../chemistry/reagents/alcohol_reagents.dm | 2 +-
.../chemistry/reagents/food_reagents.dm | 4 +-
.../chemistry/reagents/medicine_reagents.dm | 4 +-
.../chemistry/reagents/other_reagents.dm | 4 +-
.../chemistry/recipes/pyrotechnics.dm | 6 +-
.../chemistry/recipes/slime_extracts.dm | 26 +++----
.../reagents/chemistry/recipes/special.dm | 2 +-
code/modules/reagents/reagent_containers.dm | 2 +-
.../reagents/reagent_containers/hypospray.dm | 4 +-
.../reagents/reagent_containers/medspray.dm | 2 +-
.../reagents/reagent_containers/pill.dm | 4 +-
.../reagents/reagent_containers/syringes.dm | 2 +-
code/modules/recycling/conveyor2.dm | 2 +-
code/modules/recycling/conveyor_sorter.dm | 2 +-
.../recycling/disposal/construction.dm | 2 +-
code/modules/recycling/disposal/outlet.dm | 4 +-
code/modules/research/destructive_analyzer.dm | 4 +-
code/modules/research/experimentor.dm | 10 +--
.../modules/research/machinery/_production.dm | 6 +-
.../research/nanites/nanite_chamber.dm | 20 ++---
.../nanites/nanite_programs/healing.dm | 2 +-
.../nanites/nanite_programs/sensor.dm | 6 +-
.../nanites/nanite_programs/suppression.dm | 2 +-
.../nanites/nanite_programs/utility.dm | 6 +-
.../nanites/nanite_programs/weapon.dm | 4 +-
.../research/nanites/public_chamber.dm | 14 ++--
code/modules/research/server.dm | 2 +-
.../crossbreeding/_status_effects.dm | 4 +-
.../xenobiology/crossbreeding/burning.dm | 2 +-
.../xenobiology/crossbreeding/charged.dm | 4 +-
.../xenobiology/crossbreeding/chilling.dm | 2 +-
.../research/xenobiology/xenobio_camera.dm | 12 +--
.../research/xenobiology/xenobiology.dm | 4 +-
.../ruins/icemoonruin_code/hotsprings.dm | 2 +-
.../ruins/objects_and_mobs/ash_walker_den.dm | 2 +-
.../ruins/objects_and_mobs/necropolis_gate.dm | 2 +-
.../ruins/objects_and_mobs/sin_ruins.dm | 4 +-
.../ruins/spaceruin_code/hilbertshotel.dm | 2 +-
.../security_levels/keycard_authentication.dm | 6 +-
code/modules/shuttle/arrivals.dm | 2 +-
code/modules/shuttle/emergency.dm | 2 +-
code/modules/shuttle/on_move.dm | 2 +-
code/modules/shuttle/ripple.dm | 2 +-
code/modules/shuttle/special.dm | 2 +-
code/modules/smithing/anvil.dm | 2 +-
code/modules/spells/spell_types/aimed.dm | 2 +-
.../spells/spell_types/area_teleport.dm | 2 +-
.../modules/spells/spell_types/cone_spells.dm | 2 +-
.../spells/spell_types/construct_spells.dm | 2 +-
code/modules/spells/spell_types/devil.dm | 2 +-
.../spells/spell_types/ethereal_jaunt.dm | 2 +-
code/modules/spells/spell_types/genetic.dm | 2 +-
code/modules/spells/spell_types/knock.dm | 4 +-
code/modules/spells/spell_types/lichdom.dm | 4 +-
.../spell_types/spacetime_distortion.dm | 2 +-
code/modules/surgery/organs/augments_arms.dm | 4 +-
code/modules/surgery/organs/augments_chest.dm | 8 +-
.../surgery/organs/augments_internal.dm | 2 +-
code/modules/surgery/organs/eyes.dm | 2 +-
code/modules/surgery/organs/heart.dm | 6 +-
code/modules/surgery/organs/organ_internal.dm | 2 +-
code/modules/surgery/organs/stomach.dm | 4 +-
code/modules/surgery/organs/tongue.dm | 6 +-
code/modules/surgery/organs/vocal_cords.dm | 76 +++++++++----------
code/modules/tcg/cards.dm | 2 +-
code/modules/tgui/tgui.dm | 2 +-
code/modules/tgui_panel/tgui_panel.dm | 4 +-
code/modules/tooltip/tooltip.dm | 4 +-
code/modules/unit_tests/combat.dm | 6 +-
code/modules/unit_tests/emoting.dm | 2 +-
code/modules/unit_tests/unit_test.dm | 2 +-
code/modules/vehicles/cars/clowncar.dm | 14 ++--
code/modules/vehicles/mecha/_mecha.dm | 16 ++--
code/modules/vehicles/mecha/combat/durand.dm | 12 +--
code/modules/vehicles/mecha/combat/neovgre.dm | 2 +-
.../mecha/equipment/mecha_equipment.dm | 4 +-
.../mecha/equipment/tools/other_tools.dm | 2 +-
.../mecha/equipment/weapons/weapons.dm | 2 +-
.../modules/vehicles/mecha/mech_fabricator.dm | 2 +-
code/modules/vehicles/mecha/mecha_topic.dm | 2 +-
code/modules/vehicles/scooter.dm | 2 +-
code/modules/vehicles/vehicle_actions.dm | 2 +-
code/modules/vehicles/wheelchair.dm | 2 +-
code/modules/vending/_vending.dm | 2 +-
code/modules/vore/eating/belly_obj.dm | 4 +-
.../wiremod/components/abstract/module.dm | 6 +-
code/modules/wiremod/components/action/mmi.dm | 8 +-
.../wiremod/components/hud/counter_overlay.dm | 2 +-
.../wiremod/components/hud/object_overlay.dm | 2 +-
.../components/hud/target_intercept.dm | 2 +-
.../wiremod/components/ntnet/ntnet_receive.dm | 2 +-
.../wiremod/components/utility/delay.dm | 2 +-
.../wiremod/components/utility/getter.dm | 2 +-
.../modules/wiremod/core/component_printer.dm | 4 +-
.../wiremod/core/integrated_circuit.dm | 8 +-
code/modules/wiremod/core/marker.dm | 2 +-
code/modules/wiremod/core/port.dm | 10 +--
code/modules/wiremod/core/usb_cable.dm | 8 +-
code/modules/wiremod/shell/airlock.dm | 10 +--
code/modules/wiremod/shell/bot.dm | 2 +-
.../wiremod/shell/brain_computer_interface.dm | 18 ++---
code/modules/wiremod/shell/compact_remote.dm | 2 +-
code/modules/wiremod/shell/controller.dm | 6 +-
code/modules/wiremod/shell/moneybot.dm | 4 +-
code/modules/wiremod/shell/scanner.dm | 2 +-
code/modules/wiremod/shell/scanner_gate.dm | 6 +-
code/modules/zombie/organs.dm | 4 +-
.../code/datums/components/souldeath.dm | 6 +-
.../code/datums/status_effects/chems.dm | 8 +-
.../modules/client/preferences_savefile.dm | 2 +-
.../code/modules/festive/wheelchair.dm | 2 +-
.../code/modules/mentor/mentorhelp.dm | 2 +-
.../code/modules/reagents/objects/clothes.dm | 4 +-
.../container_item/container_item.dm | 2 +-
.../code/datums/components/glory_kill.dm | 8 +-
.../components/interaction_menu_granter.dm | 4 +-
modular_sand/code/datums/components/riding.dm | 2 +-
.../components/storage/concrete/dresser.dm | 4 +-
.../code/datums/elements/holder_micro.dm | 6 +-
.../code/datums/elements/skirt_peeking.dm | 6 +-
modular_sand/code/datums/traits/neutral.dm | 6 +-
modular_sand/code/datums/wires/firealarm.dm | 2 +-
.../game/objects/items/borg_shapeshifter.dm | 22 +++---
.../code/game/objects/items/fleshlight.dm | 4 +-
.../modules/clothing/spacesuits/chronosuit.dm | 8 +-
.../modules/clothing/spacesuits/hardsuit.dm | 4 +-
.../mining/equipment/kinetic_crusher.dm | 6 +-
.../mining/lavaland/necropolis_chests.dm | 8 +-
modular_sand/code/modules/mob/emote.dm | 2 +-
.../mob/living/silicon/robot/robot_modules.dm | 2 +-
.../hostile/megafauna/bubblegum.dm | 10 +--
.../hostile/megafauna/glaurung.dm | 2 +-
.../hostile/megafauna/rogueprocess.dm | 46 +++++------
.../hostile/mining_mobs/elites/candy.dm | 4 +-
.../hostile/mining_mobs/elites/drakeling.dm | 4 +-
modular_sand/code/modules/resize/resizing.dm | 6 +-
.../modules/ruins/lavalandruin_code/doom.dm | 4 +-
.../modules/ruins/lavalandruin_code/misc.dm | 2 +-
modular_splurt/code/__HELPERS/icons.dm | 2 +-
.../code/controllers/subsystem/shuttle.dm | 2 +-
.../code/controllers/subsystem/ticker.dm | 2 +-
.../code/datums/components/dullahan.dm | 6 +-
.../code/datums/components/organ_inflation.dm | 6 +-
.../code/datums/components/pregnancy.dm | 22 +++---
.../code/datums/components/pregnancy_inert.dm | 8 +-
.../code/datums/components/size_normalized.dm | 2 +-
.../code/datums/elements/crawl_under.dm | 8 +-
.../code/datums/elements/smalltalk.dm | 2 +-
modular_splurt/code/datums/traits/good.dm | 8 +-
modular_splurt/code/datums/traits/negative.dm | 6 +-
modular_splurt/code/datums/traits/neutral.dm | 8 +-
modular_splurt/code/game/atoms_movable.dm | 2 +-
.../code/game/machinery/computer/slavery.dm | 2 +-
.../code/game/machinery/research_table.dm | 2 +-
modular_splurt/code/game/objects/items/RCD.dm | 2 +-
modular_splurt/code/game/objects/items/RTL.dm | 6 +-
.../chastity/chastity_belt.dm | 2 +-
.../chastity/chastity_cage.dm | 4 +-
.../chastity/metal_chastity_cage.dm | 2 +-
.../genital_equipment/genital_equipment.dm | 8 +-
.../game/objects/items/lewd_items/leash.dm | 24 +++---
.../game/objects/items/lewd_items/rope.dm | 6 +-
.../game/objects/items/lewd_items/vibrator.dm | 4 +-
.../code/game/objects/items/oviposition.dm | 4 +-
.../game/objects/items/robot/robot_items.dm | 2 +-
.../game/objects/structures/cannons/cannon.dm | 2 +-
.../game/objects/structures/micro_bricks.dm | 4 +-
.../code/modules/admin/Transform.dm | 2 +-
.../code/modules/admin/playtimes.dm | 2 +-
.../code/modules/antagonists/qareen/qareen.dm | 8 +-
.../antagonists/qareen/qareen_abilities.dm | 10 +--
.../antagonists/qareen/qareen_bliss.dm | 2 +-
.../code/modules/antagonists/slaver/slaver.dm | 4 +-
.../code/modules/arousal/arousal.dm | 2 +-
.../code/modules/arousal/organs/breasts.dm | 2 +-
.../code/modules/arousal/organs/penis.dm | 2 +-
.../code/modules/arousal/organs/vagina.dm | 2 +-
.../unary_devices/outlet_injector.dm | 2 +-
.../components/unary_devices/vent_pump.dm | 2 +-
.../components/unary_devices/vent_scrubber.dm | 2 +-
.../lewd_clothing/eyes/hypnogoggles.dm | 2 +-
.../lewd_clothing/head/deprivation_helmet.dm | 2 +-
.../code/modules/clothing/misc/body_camera.dm | 4 +-
.../modules/events/crystalline_reentry.dm | 4 +-
.../code/modules/hydroponics/botany_flora.dm | 2 +-
.../modular_map_loader/modular_map_loader.dm | 2 +-
modular_splurt/code/modules/mob/femclaw.dm | 2 +-
.../mob/living/carbon/human/human_defines.dm | 2 +-
.../carbon/human/species_types/arachnid.dm | 2 +-
.../carbon/human/species_types/zombies2.dm | 4 +-
.../code/modules/mob/living/living_signals.dm | 2 +-
.../code/modules/mob/living/navigation.dm | 8 +-
.../living/silicon/robot/dogborg_equipment.dm | 2 +-
.../mob/living/silicon/robot/robot_modules.dm | 6 +-
.../hostile/clockworkmechanic.dm | 2 +-
.../living/simple_animal/hostile/dancer.dm | 4 +-
.../hostile/deathclaw/deathclaw.dm | 2 +-
.../hostile/deathclaw/funclaw.dm | 6 +-
.../hostile/werewolves/funwolf.dm | 24 +++---
.../hostile/werewolves/hellhound.dm | 2 +-
.../hostile/werewolves/icewolf.dm | 2 +-
.../hostile/werewolves/themosley.dm | 2 +-
.../hostile/werewolves/werewolf.dm | 2 +-
.../code/modules/research/xenoarch/tools.dm | 4 +-
.../code/modules/surgery/organs/eyes.dm | 2 +-
.../vehicles/mecha/combat/savannah_ivanov.dm | 16 ++--
954 files changed, 2442 insertions(+), 2433 deletions(-)
diff --git a/code/__DEFINES/callbacks.dm b/code/__DEFINES/callbacks.dm
index f25dfdf150..f66fd0775f 100644
--- a/code/__DEFINES/callbacks.dm
+++ b/code/__DEFINES/callbacks.dm
@@ -2,4 +2,4 @@
/// A shorthand for the callback datum, [documented here](datum/callback.html)
#define CALLBACK new /datum/callback
#define INVOKE_ASYNC world.ImmediateInvokeAsync
-#define CALLBACK_NEW(typepath, args) CALLBACK(GLOBAL_PROC, /proc/___callbacknew, typepath, args)
+#define CALLBACK_NEW(typepath, args) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbacknew), typepath, args)
diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm
index c5ad0d745d..dfb18c3a7f 100644
--- a/code/__DEFINES/cooldowns.dm
+++ b/code/__DEFINES/cooldowns.dm
@@ -51,7 +51,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)
@@ -64,7 +64,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/skills/helpers.dm b/code/__DEFINES/skills/helpers.dm
index dde412fd7d..fbf32ad511 100644
--- a/code/__DEFINES/skills/helpers.dm
+++ b/code/__DEFINES/skills/helpers.dm
@@ -27,7 +27,7 @@
if(body.mind){\
body.mind.add_skill_modifier(prototype.identifier)\
} else {\
- prototype.RegisterSignal(body, COMSIG_MOB_ON_NEW_MIND, /datum/skill_modifier.proc/on_mob_new_mind, TRUE)\
+ prototype.RegisterSignal(body, COMSIG_MOB_ON_NEW_MIND, TYPE_PROC_REF(/datum/skill_modifier, on_mob_new_mind), TRUE)\
}
/// Same as above but to remove the skill modifier.
diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm
index d7f689d7a6..25ca19117f 100644
--- a/code/__HELPERS/_lists.dm
+++ b/code/__HELPERS/_lists.dm
@@ -487,12 +487,12 @@
//for sorting clients or mobs by ckey
/proc/sortKey(list/L, order=1)
- return sortTim(L, order >= 0 ? /proc/cmp_ckey_asc : /proc/cmp_ckey_dsc)
+ return sortTim(L, order >= 0 ? GLOBAL_PROC_REF(cmp_ckey_asc) : GLOBAL_PROC_REF(cmp_ckey_dsc))
//Specifically for record datums in a list.
/proc/sortRecord(list/L, field = "name", order = 1)
GLOB.cmp_field = field
- return sortTim(L, order >= 0 ? /proc/cmp_records_asc : /proc/cmp_records_dsc)
+ return sortTim(L, order >= 0 ? GLOBAL_PROC_REF(cmp_records_asc) : GLOBAL_PROC_REF(cmp_records_dsc))
//any value in a list
/proc/sort_list(list/L, cmp=/proc/cmp_text_asc)
@@ -500,7 +500,7 @@
//uses sort_list() but uses the var's name specifically. This should probably be using mergeAtom() instead
/proc/sortNames(list/L, order=1)
- return sortTim(L.Copy(), order >= 0 ? /proc/cmp_name_asc : /proc/cmp_name_dsc)
+ return sortTim(L.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)
diff --git a/code/__HELPERS/_string_lists.dm b/code/__HELPERS/_string_lists.dm
index 43d45594e0..7d6415c1ef 100644
--- a/code/__HELPERS/_string_lists.dm
+++ b/code/__HELPERS/_string_lists.dm
@@ -13,7 +13,7 @@ GLOBAL_VAR(string_filename_current_key)
if((filename in GLOB.string_cache) && (key in GLOB.string_cache[filename]))
var/response = pick(GLOB.string_cache[filename][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: strings/[filename], index=[key]")
diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm
index 84740b2fc3..7a811312fa 100644
--- a/code/__HELPERS/areas.dm
+++ b/code/__HELPERS/areas.dm
@@ -12,11 +12,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 38b8bdfb24..717aea03ea 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -416,7 +416,7 @@
/proc/flick_overlay(image/I, list/show_to, duration)
for(var/client/C in show_to)
C.images += I
- addtimer(CALLBACK(GLOBAL_PROC, /proc/remove_images_from_clients, I, show_to), duration, TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_images_from_clients), I, show_to), duration, TIMER_CLIENT_TIME)
/proc/flick_overlay_view(image/I, atom/target, duration) //wrapper for the above, flicks to everyone who can see the target atom
var/list/viewing = list()
diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm
index 78e1899f53..a1d7705b09 100644
--- a/code/__HELPERS/global_lists.dm
+++ b/code/__HELPERS/global_lists.dm
@@ -99,7 +99,7 @@
init_subtypes(/datum/crafting_recipe, GLOB.crafting_recipes)
- INVOKE_ASYNC(GLOBAL_PROC, /proc/init_ref_coin_values) //so the current procedure doesn't sleep because of UNTIL()
+ INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(init_ref_coin_values)) //so the current procedure doesn't sleep because of UNTIL()
//creates every subtype of prototype (excluding prototype) and adds it to list L.
//if no list/L is provided, one is created.
diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm
index 2ccd9deaf2..d9f8343fb8 100644
--- a/code/__HELPERS/icons.dm
+++ b/code/__HELPERS/icons.dm
@@ -829,7 +829,7 @@ world
break
layers[current] = current_layer
- //sortTim(layers, /proc/cmp_image_layer_asc)
+ //sortTim(layers, GLOBAL_PROC_REF(cmp_image_layer_asc))
var/icon/add // Icon of overlay being added
diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm
index cfb52408aa..d53cfe2f1b 100644
--- a/code/__HELPERS/priority_announce.dm
+++ b/code/__HELPERS/priority_announce.dm
@@ -64,7 +64,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/scaled/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/qdel.dm b/code/__HELPERS/qdel.dm
index af7e7b99f0..54acece87c 100644
--- a/code/__HELPERS/qdel.dm
+++ b/code/__HELPERS/qdel.dm
@@ -3,10 +3,10 @@
#define QDEL_IN(item, time) ; \
addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), (time) > GC_FILTER_QUEUE ? WEAKREF(item) : item), time);
#define QDEL_IN_STOPPABLE(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, .proc/qdel, item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
+#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, 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, 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/roundend.dm b/code/__HELPERS/roundend.dm
index 325233b7be..3ff0b42031 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -621,7 +621,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/stat_tracking.dm b/code/__HELPERS/stat_tracking.dm
index 007cd2695d..525d1a8c84 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/unsorted.dm b/code/__HELPERS/unsorted.dm
index 08eea65c93..85588e96d2 100644
--- a/code/__HELPERS/unsorted.dm
+++ b/code/__HELPERS/unsorted.dm
@@ -1430,9 +1430,18 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
//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)
+/**
+ * NAMEOF that actually works in static definitions because src::type requires src to be defined
+ */
+#if DM_VERSION >= 515
+#define NAMEOF_STATIC(datum, X) (nameof(type::##X))
+#else
+#define NAMEOF_STATIC(datum, X) (#X || ##datum.##X)
+#endif
+
+#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))
@@ -1444,8 +1453,8 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
else
D.vars[var_name] = var_value
-#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/_onclick/ai.dm b/code/_onclick/ai.dm
index 239ef319d1..3bcaf80bf2 100644
--- a/code/_onclick/ai.dm
+++ b/code/_onclick/ai.dm
@@ -70,11 +70,11 @@
if(aicamera.in_camera_mode)
aicamera.camera_mode_off()
- INVOKE_ASYNC(aicamera, /obj/item/camera.proc/captureimage, pixel_turf, usr)
+ INVOKE_ASYNC(aicamera, TYPE_PROC_REF(/obj/item/camera, captureimage), pixel_turf, usr)
return
if(waypoint_mode)
waypoint_mode = FALSE
- INVOKE_ASYNC(src, .proc/set_waypoint, A)
+ INVOKE_ASYNC(src, PROC_REF(set_waypoint), A)
return
A.attack_ai(src)
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 1d1d517fb6..5c387dd59a 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -347,7 +347,7 @@
SEND_SIGNAL(src, COMSIG_CLICK_CTRL, user)
var/mob/living/ML = user
if(istype(ML))
- INVOKE_ASYNC(ML, /mob/living.verb/pulled, src)
+ INVOKE_ASYNC(ML, TYPE_VERB_REF(/mob/living, pulled), src)
/mob/living/carbon/human/CtrlClick(mob/user)
if(ishuman(user) && Adjacent(user) && !user.incapacitated())
diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm
index 743d75b557..c9453619af 100644
--- a/code/_onclick/cyborg.dm
+++ b/code/_onclick/cyborg.dm
@@ -40,7 +40,7 @@
*/
if(aicamera.in_camera_mode) //Cyborg picture taking
aicamera.camera_mode_off()
- INVOKE_ASYNC(aicamera, /obj/item/camera.proc/captureimage, A, usr)
+ INVOKE_ASYNC(aicamera, TYPE_PROC_REF(/obj/item/camera, captureimage), A, usr)
return
var/obj/item/W = get_active_held_item(TRUE)
@@ -48,7 +48,7 @@
if(!W && A.Adjacent(src) && (isobj(A) || ismob(A)))
var/atom/movable/C = A
if(C.can_buckle && C.has_buckled_mobs())
- INVOKE_ASYNC(C, /atom/movable.proc/precise_user_unbuckle_mob, src)
+ INVOKE_ASYNC(C, TYPE_PROC_REF(/atom/movable, precise_user_unbuckle_mob), src)
return
if(!W && (get_dist(src,A) <= interaction_range))
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index d3d0fb32b6..366dff3c85 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -63,7 +63,7 @@
animate(thealert, transform = matrix(), time = 2.5, easing = BACK_EASING)
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
@@ -344,7 +344,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)
. = ..()
@@ -371,7 +371,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
@@ -389,7 +389,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()
@@ -426,7 +426,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
//ALIENS
diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm
index 77f4ed5c84..e991ebc47b 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/new_player.dm b/code/_onclick/hud/new_player.dm
index c5d3cbca89..539b842375 100644
--- a/code/_onclick/hud/new_player.dm
+++ b/code/_onclick/hud/new_player.dm
@@ -144,10 +144,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)
@@ -155,13 +155,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)
. = ..()
@@ -190,10 +190,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)
@@ -234,13 +234,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
name = "Observe"
@@ -255,7 +255,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)
. = ..()
@@ -268,7 +268,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))
//Subtype the bottom buttons away so the collapse/expand shutter goes behind them
/atom/movable/screen/lobby/button/bottom
diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm
index a582c372e1..c8999814ed 100644
--- a/code/_onclick/hud/radial.dm
+++ b/code/_onclick/hud/radial.dm
@@ -20,7 +20,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 e74d7fad4a..8cc05b47c9 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -735,7 +735,7 @@
deltimer(timerid)
if (!streak)
return
- timerid = addtimer(CALLBACK(src, .proc/clear_streak), 20, TIMER_UNIQUE | TIMER_STOPPABLE)
+ timerid = addtimer(CALLBACK(src, PROC_REF(clear_streak)), 20, 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/_onclick/hud/screen_objects/storage.dm b/code/_onclick/hud/screen_objects/storage.dm
index bbd6941a36..d77e4e03ed 100644
--- a/code/_onclick/hud/screen_objects/storage.dm
+++ b/code/_onclick/hud/screen_objects/storage.dm
@@ -57,8 +57,8 @@
/atom/movable/screen/storage/volumetric_box/Initialize(mapload, new_master, obj/item/our_item)
src.our_item = our_item
- RegisterSignal(our_item, COMSIG_ITEM_MOUSE_ENTER, .proc/on_item_mouse_enter)
- RegisterSignal(our_item, COMSIG_ITEM_MOUSE_EXIT, .proc/on_item_mouse_exit)
+ RegisterSignal(our_item, COMSIG_ITEM_MOUSE_ENTER, PROC_REF(on_item_mouse_enter))
+ RegisterSignal(our_item, COMSIG_ITEM_MOUSE_EXIT, PROC_REF(on_item_mouse_exit))
return ..()
/atom/movable/screen/storage/volumetric_box/Destroy()
diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm
index 073f50d8c5..f86ee49eb9 100644
--- a/code/_onclick/other_mobs.dm
+++ b/code/_onclick/other_mobs.dm
@@ -47,7 +47,7 @@
return
if(interaction_flags_atom & INTERACT_ATOM_ATTACK_HAND)
. = _try_interact(user)
- INVOKE_ASYNC(src, .proc/on_attack_hand, user, act_intent, .)
+ INVOKE_ASYNC(src, PROC_REF(on_attack_hand), user, act_intent, .)
if(!(. & ATTACK_IGNORE_ACTION))
if(attack_hand_unwieldlyness)
user.DelayNextAction(attack_hand_unwieldlyness, considered_action = attack_hand_is_action)
diff --git a/code/_rendering/atom_huds/atom_hud.dm b/code/_rendering/atom_huds/atom_hud.dm
index 151ebc8a24..059283d8d1 100644
--- a/code/_rendering/atom_huds/atom_hud.dm
+++ b/code/_rendering/atom_huds/atom_hud.dm
@@ -88,10 +88,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/_rendering/fullscreen/fullscreen.dm b/code/_rendering/fullscreen/fullscreen.dm
index dd8f697891..c5edb29097 100644
--- a/code/_rendering/fullscreen/fullscreen.dm
+++ b/code/_rendering/fullscreen/fullscreen.dm
@@ -35,7 +35,7 @@
return
if(animated > 0)
animate(screen, alpha = 0, time = animated)
- addtimer(CALLBACK(src, .proc/_remove_fullscreen_direct, screen), animated, TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(src, PROC_REF(_remove_fullscreen_direct), screen), animated, TIMER_CLIENT_TIME)
else
if(client)
client.screen -= screen
diff --git a/code/_rendering/parallax/parallax_object.dm b/code/_rendering/parallax/parallax_object.dm
index 8307fc5f08..640e3bf18c 100644
--- a/code/_rendering/parallax/parallax_object.dm
+++ b/code/_rendering/parallax/parallax_object.dm
@@ -123,7 +123,7 @@
/atom/movable/screen/parallax_layer/proc/QueueLoop(delay, speed, matrix/translate_matrix, matrix/target_matrix)
if(queued_animation)
CancelAnimation()
- queued_animation = addtimer(CALLBACK(src, .proc/_loop, speed, translate_matrix, target_matrix), delay, TIMER_STOPPABLE)
+ queued_animation = addtimer(CALLBACK(src, PROC_REF(_loop), speed, translate_matrix, target_matrix), delay, TIMER_STOPPABLE)
/atom/movable/screen/parallax_layer/proc/_loop(speed, matrix/translate_matrix = matrix(1, 0, 0, 0, 1, 480), matrix/target_matrix = matrix())
transform = translate_matrix
diff --git a/code/controllers/admin.dm b/code/controllers/admin.dm
index 5c767ecb1b..6529c21aa4 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
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index dd50017d31..4f5d799338 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -465,4 +465,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 04b88eb3be..43127b1777 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 055271fd86..11318641be 100644
--- a/code/controllers/master.dm
+++ b/code/controllers/master.dm
@@ -93,7 +93,7 @@ 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/subsytem_types = subtypesof(/datum/controller/subsystem)
- sortTim(subsytem_types, /proc/cmp_subsystem_init)
+ sortTim(subsytem_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)
@@ -117,7 +117,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))
reverseRange(subsystems)
for(var/datum/controller/subsystem/ss in subsystems)
log_world("Shutting down [ss.name] subsystem...")
@@ -201,7 +201,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.
@@ -222,7 +222,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
@@ -307,9 +307,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(runlevel_sorted_subsystems, GLOBAL_PROC_REF(cmp_subsystem_priority))
I += tickersubsystems
var/cached_runlevel = current_runlevel
diff --git a/code/controllers/subsystem/activity.dm b/code/controllers/subsystem/activity.dm
index d10e67f210..12423cda39 100644
--- a/code/controllers/subsystem/activity.dm
+++ b/code/controllers/subsystem/activity.dm
@@ -9,8 +9,8 @@ SUBSYSTEM_DEF(activity)
var/list/threats = list()
/datum/controller/subsystem/activity/Initialize(timeofday)
- RegisterSignal(SSdcs,COMSIG_GLOB_EXPLOSION,.proc/on_explosion)
- RegisterSignal(SSdcs,COMSIG_GLOB_MOB_DEATH,.proc/on_death)
+ RegisterSignal(SSdcs,COMSIG_GLOB_EXPLOSION,PROC_REF(on_explosion))
+ RegisterSignal(SSdcs,COMSIG_GLOB_MOB_DEATH,PROC_REF(on_death))
return ..()
/datum/controller/subsystem/activity/fire(resumed = 0)
diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm
index e760ea12e6..26a51ec2c1 100644
--- a/code/controllers/subsystem/air.dm
+++ b/code/controllers/subsystem/air.dm
@@ -111,7 +111,7 @@ SUBSYSTEM_DEF(air)
/datum/controller/subsystem/air/proc/add_reaction(datum/gas_reaction/r)
gas_reactions += r
- sortTim(gas_reactions, /proc/cmp_gas_reaction)
+ sortTim(gas_reactions, GLOBAL_PROC_REF(cmp_gas_reaction))
auxtools_update_reactions()
/proc/reset_all_air()
diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm
index b6b750fbf4..52e50d3c53 100644
--- a/code/controllers/subsystem/dbcore.dm
+++ b/code/controllers/subsystem/dbcore.dm
@@ -190,9 +190,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/job.dm b/code/controllers/subsystem/job.dm
index 549da9a086..cf0a54ea6f 100644
--- a/code/controllers/subsystem/job.dm
+++ b/code/controllers/subsystem/job.dm
@@ -625,7 +625,7 @@ SUBSYSTEM_DEF(job)
var/oldjobs = SSjob.occupations
sleep(20)
for (var/datum/job/J in oldjobs)
- INVOKE_ASYNC(src, .proc/RecoverJob, J)
+ INVOKE_ASYNC(src, PROC_REF(RecoverJob), J)
/datum/controller/subsystem/job/proc/RecoverJob(datum/job/J)
var/datum/job/newjob = GetJob(J.title)
diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm
index f54e2766fe..3cdacd241a 100644
--- a/code/controllers/subsystem/mapping.dm
+++ b/code/controllers/subsystem/mapping.dm
@@ -178,7 +178,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
@@ -428,7 +428,7 @@ GLOBAL_LIST_EMPTY(the_station_areas)
banned += generateMapList("[global.config.directory]/iceruinblacklist.txt")
banned += generateMapList("[global.config.directory]/stationruinblacklist.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 f396f187c6..7f2ccdf5d2 100644
--- a/code/controllers/subsystem/materials.dm
+++ b/code/controllers/subsystem/materials.dm
@@ -59,7 +59,7 @@ SUBSYSTEM_DEF(materials)
var/datum/material/mat = x
var/path_name = ispath(mat) ? "[mat]" : "[mat.type]"
combo_params += "[path_name]=[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/npcpool.dm b/code/controllers/subsystem/npcpool.dm
index c20820c092..492e657df4 100644
--- a/code/controllers/subsystem/npcpool.dm
+++ b/code/controllers/subsystem/npcpool.dm
@@ -29,7 +29,7 @@ SUBSYSTEM_DEF(npcpool)
invoking = TRUE
invoke_start = world.time
- INVOKE_ASYNC(src, .proc/invoke_process, SA)
+ INVOKE_ASYNC(src, PROC_REF(invoke_process), SA)
if(invoking)
stack_trace("WARNING: [SA] ([SA.type]) slept during NPCPool processing.")
invoking = FALSE
diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm
index 8a6ded4865..710e23f703 100644
--- a/code/controllers/subsystem/pai.dm
+++ b/code/controllers/subsystem/pai.dm
@@ -161,7 +161,7 @@ SUBSYSTEM_DEF(pai)
if(!G.can_reenter_round()) // this should use notify_ghosts() instead one day.
return FALSE
to_chat(G, "[user] is requesting a pAI personality! Use the pAI button to submit yourself as one.")
- addtimer(CALLBACK(src, .proc/spam_again), spam_delay)
+ addtimer(CALLBACK(src, PROC_REF(spam_again)), spam_delay)
var/list/available = list()
for(var/datum/paiCandidate/c in SSpai.candidates)
available.Add(check_ready(c))
diff --git a/code/controllers/subsystem/pathfinder.dm b/code/controllers/subsystem/pathfinder.dm
index ccbea79306..21ee7ea60b 100644
--- a/code/controllers/subsystem/pathfinder.dm
+++ b/code/controllers/subsystem/pathfinder.dm
@@ -31,7 +31,7 @@ SUBSYSTEM_DEF(pathfinder)
while(flow[free])
CHECK_TICK
free = (free % lcount) + 1
- var/t = addtimer(CALLBACK(src, /datum/flowcache.proc/toolong, free), 150, TIMER_STOPPABLE)
+ var/t = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/flowcache, toolong), free), 150, TIMER_STOPPABLE)
flow[free] = t
flow[t] = M
return free
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index 14c6c8aa26..dc01134038 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -22,7 +22,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/V in quirk_list)
var/datum/quirk/T = V
diff --git a/code/controllers/subsystem/processing/weather.dm b/code/controllers/subsystem/processing/weather.dm
index 4035149ef2..fb94856070 100644
--- a/code/controllers/subsystem/processing/weather.dm
+++ b/code/controllers/subsystem/processing/weather.dm
@@ -22,7 +22,7 @@ PROCESSING_SUBSYSTEM_DEF(weather)
run_weather(W, list(text2num(z)))
eligible_zlevels -= z
var/randTime = rand(3000, 6000)
- addtimer(CALLBACK(src, .proc/make_eligible, z, possible_weather), randTime + initial(W.weather_duration_upper), TIMER_UNIQUE) //Around 5-10 minutes between weathers
+ addtimer(CALLBACK(src, PROC_REF(make_eligible), z, possible_weather), randTime + initial(W.weather_duration_upper), TIMER_UNIQUE) //Around 5-10 minutes between weathers
next_hit_by_zlevel["[z]"] = world.time + randTime + initial(W.telegraph_duration)
/datum/controller/subsystem/processing/weather/Initialize(start_timeofday)
diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm
index 706cdab388..38bd6696fb 100644
--- a/code/controllers/subsystem/shuttle.dm
+++ b/code/controllers/subsystem/shuttle.dm
@@ -186,7 +186,7 @@ SUBSYSTEM_DEF(shuttle)
/datum/controller/subsystem/shuttle/proc/block_recall(lockout_timer)
emergencyNoRecall = 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()
emergencyNoRecall = FALSE
diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm
index 3231cd31bc..f2488502a4 100644
--- a/code/controllers/subsystem/statpanel.dm
+++ b/code/controllers/subsystem/statpanel.dm
@@ -144,7 +144,7 @@ SUBSYSTEM_DEF(statpanels)
if(length(turfitems) < 30) // only create images for the first 30 items on the turf, for performance reasons
if(!(REF(turf_content) in cached_images))
cached_images += REF(turf_content)
- 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]", REF(turf_content), costly_icon2html(turf_content, target, sourceonly=TRUE))
else
diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm
index 8c873d07c4..14bd34d9e9 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 d7b4069cd5..c6f8395dbb 100644
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -443,7 +443,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)
@@ -502,7 +502,7 @@ SUBSYSTEM_DEF(ticker)
if (!prob((world.time/600)*CONFIG_GET(number/maprotatechancedelta)) && CONFIG_GET(flag/tgstyle_maprotation))
return
if(CONFIG_GET(flag/tgstyle_maprotation))
- INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate)
+ INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping, maprotate))
else
var/vote_type = CONFIG_GET(string/map_vote_type)
SSvote.initiate_vote("map","server", display = SHOW_RESULTS, votesystem = vote_type)
diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm
index 48165be960..571bf344d8 100644
--- a/code/controllers/subsystem/timer.dm
+++ b/code/controllers/subsystem/timer.dm
@@ -257,7 +257,7 @@ SUBSYSTEM_DEF(timer)
return
// Sort all timers by time to run
- sortTim(alltimers, .proc/cmp_timer)
+ sortTim(alltimers, 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/vote.dm b/code/controllers/subsystem/vote.dm
index 629032a04e..de2d2d53af 100644
--- a/code/controllers/subsystem/vote.dm
+++ b/code/controllers/subsystem/vote.dm
@@ -163,7 +163,7 @@ SUBSYSTEM_DEF(vote)
var/list/pretty_vote = list()
for(var/choice in choices)
if(("[choice]" in this_vote) && ("[choice]" in scores_by_choice))
- sorted_insert(scores_by_choice["[choice]"],this_vote["[choice]"],/proc/cmp_numeric_asc)
+ sorted_insert(scores_by_choice["[choice]"],this_vote["[choice]"],GLOBAL_PROC_REF(cmp_numeric_asc))
// START BALLOT GATHERING
pretty_vote += "[choice]"
if(this_vote["[choice]"] in GLOB.vote_score_options)
diff --git a/code/datums/action.dm b/code/datums/action.dm
index 2cb7c749ab..07404d79bd 100644
--- a/code/datums/action.dm
+++ b/code/datums/action.dm
@@ -37,7 +37,7 @@
/datum/action/proc/link_to(Target)
target = Target
- RegisterSignal(Target, COMSIG_ATOM_UPDATED_ICON, .proc/OnUpdatedIcon)
+ RegisterSignal(Target, COMSIG_ATOM_UPDATED_ICON, PROC_REF(OnUpdatedIcon))
/datum/action/Destroy()
if(owner)
@@ -184,7 +184,7 @@
M.ghostize(can_reenter_corpse = TRUE, voluntary = TRUE)
/datum/action/proc/OnUpdatedIcon()
- addtimer(CALLBACK(src, .proc/UpdateButtonIcon), 1) //Hopefully runs after new icon overlays have been compiled.
+ addtimer(CALLBACK(src, PROC_REF(UpdateButtonIcon)), 1) //Hopefully runs after new icon overlays have been compiled.
//Presets for item actions
/datum/action/item_action
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index 6a9878e086..b4c24286e6 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -30,7 +30,7 @@
icon_state = beam_icon_state
beam_type = btype
if(time < INFINITY)
- addtimer(CALLBACK(src,.proc/End), time)
+ addtimer(CALLBACK(src,PROC_REF(End)), time)
/datum/beam/proc/Start()
Draw()
@@ -66,13 +66,13 @@
if(timing_id)
deltimer(timing_id)
if(!finished)
- timing_id = addtimer(CALLBACK(src, .proc/recalculate), time, TIMER_STOPPABLE)
+ timing_id = addtimer(CALLBACK(src, PROC_REF(recalculate)), time, TIMER_STOPPABLE)
/datum/beam/proc/after_calculate()
if((sleep_time == null) || finished) //Does not automatically recalculate.
return
if(isnull(timing_id))
- timing_id = addtimer(CALLBACK(src, .proc/recalculate), sleep_time, TIMER_STOPPABLE)
+ timing_id = addtimer(CALLBACK(src, PROC_REF(recalculate)), sleep_time, TIMER_STOPPABLE)
/datum/beam/proc/End(destroy_self = TRUE)
finished = TRUE
@@ -167,5 +167,5 @@
/atom/proc/Beam(atom/BeamTarget,icon_state="b_beam",icon='icons/effects/beam.dmi',time=50, maxdistance=10,beam_type=/obj/effect/ebeam,beam_sleep_time = 3)
var/datum/beam/newbeam = new(src,BeamTarget,icon,icon_state,time,maxdistance,beam_type,beam_sleep_time)
- INVOKE_ASYNC(newbeam, /datum/beam/.proc/Start)
+ INVOKE_ASYNC(newbeam, TYPE_PROC_REF(/datum/beam, Start))
return newbeam
diff --git a/code/datums/brain_damage/brain_trauma.dm b/code/datums/brain_damage/brain_trauma.dm
index 65ae23556e..87d6720f46 100644
--- a/code/datums/brain_damage/brain_trauma.dm
+++ b/code/datums/brain_damage/brain_trauma.dm
@@ -41,8 +41,8 @@
/datum/brain_trauma/proc/on_gain()
if(gain_text)
to_chat(owner, gain_text)
- RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
- RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
+ RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing))
//Called when removed from a mob
/datum/brain_trauma/proc/on_lose(silent)
diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm
index 3d8eedbcb5..17ffbd557d 100644
--- a/code/datums/brain_damage/imaginary_friend.dm
+++ b/code/datums/brain_damage/imaginary_friend.dm
@@ -23,7 +23,7 @@
qdel(src)
return
if(!friend.client && friend_initialized)
- addtimer(CALLBACK(src, .proc/reroll_friend), 600)
+ addtimer(CALLBACK(src, PROC_REF(reroll_friend)), 600)
/datum/brain_trauma/special/imaginary_friend/on_death()
..()
@@ -94,7 +94,7 @@
trauma = _trauma
owner = trauma.owner
- INVOKE_ASYNC(src, .proc/setup_friend)
+ INVOKE_ASYNC(src, PROC_REF(setup_friend))
join = new
join.Grant(src)
@@ -173,7 +173,7 @@
if(owner.client)
var/mutable_appearance/MA = mutable_appearance('icons/mob/talk.dmi', src, "default[say_test(message)]", FLY_LAYER)
MA.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
- INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, MA, list(owner.client), 30)
+ INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), MA, list(owner.client), 30)
for(var/mob/M in GLOB.dead_mob_list)
var/link = FOLLOW_LINK(M, owner)
diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm
index eb5e3c0735..4f15e8eb49 100644
--- a/code/datums/brain_damage/mild.dm
+++ b/code/datums/brain_damage/mild.dm
@@ -178,8 +178,8 @@
to_chat(owner, "[pick("You have a coughing fit!", "You can't stop coughing!")]")
owner.Stun(20)
owner.emote("cough")
- addtimer(CALLBACK(owner, /mob/.proc/emote, "cough"), 6)
- addtimer(CALLBACK(owner, /mob/.proc/emote, "cough"), 12)
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, emote), "cough"), 6)
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, emote), "cough"), 12)
owner.emote("cough")
..()
diff --git a/code/datums/brain_damage/phobia.dm b/code/datums/brain_damage/phobia.dm
index 8010f5dc6f..10c217c6a9 100644
--- a/code/datums/brain_damage/phobia.dm
+++ b/code/datums/brain_damage/phobia.dm
@@ -95,7 +95,7 @@
mainsource = word
if(matches)
- addtimer(CALLBACK(src, .proc/freak_out, null, mainsource), 10) //to react AFTER the chat message
+ addtimer(CALLBACK(src, PROC_REF(freak_out), null, mainsource), 10) //to react AFTER the chat message
/datum/brain_trauma/mild/phobia/handle_speech(datum/source, list/speech_args)
if(HAS_TRAIT(owner, TRAIT_FEARLESS))
diff --git a/code/datums/brain_damage/severe.dm b/code/datums/brain_damage/severe.dm
index 19247c486a..71c9656a88 100644
--- a/code/datums/brain_damage/severe.dm
+++ b/code/datums/brain_damage/severe.dm
@@ -196,7 +196,7 @@
to_chat(owner, "You feel sick...")
else
to_chat(owner, "You feel really sick at the thought of being alone!")
- addtimer(CALLBACK(owner, /mob/living/carbon.proc/vomit, high_stress), 50) //blood vomit if high stress
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living/carbon, vomit), high_stress), 50) //blood vomit if high stress
if(2)
if(!high_stress)
to_chat(owner, "You can't stop shaking...")
@@ -319,7 +319,7 @@
var/regex/reg = new("(\\b[REGEX_QUOTE(trigger_phrase)]\\b)","ig")
if(findtext(hearing_args[HEARING_RAW_MESSAGE], reg))
- addtimer(CALLBACK(src, .proc/hypnotrigger), 10) //to react AFTER the chat message
+ addtimer(CALLBACK(src, PROC_REF(hypnotrigger)), 10) //to react AFTER the chat message
hearing_args[HEARING_RAW_MESSAGE] = reg.Replace(hearing_args[HEARING_RAW_MESSAGE], "*********")
/datum/brain_trauma/severe/hypnotic_trigger/proc/hypnotrigger()
diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm
index d4631f2558..ac506f0689 100644
--- a/code/datums/brain_damage/special.dm
+++ b/code/datums/brain_damage/special.dm
@@ -181,7 +181,7 @@
/datum/brain_trauma/special/death_whispers/proc/whispering()
ADD_TRAIT(owner, TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
active = TRUE
- addtimer(CALLBACK(src, .proc/cease_whispering), rand(50, 300))
+ addtimer(CALLBACK(src, PROC_REF(cease_whispering)), rand(50, 300))
/datum/brain_trauma/special/death_whispers/proc/cease_whispering()
REMOVE_TRAIT(owner, TRAIT_SIXTHSENSE, TRAUMA_TRAIT)
@@ -225,7 +225,7 @@
var/atom/movable/AM = thing
SEND_SIGNAL(AM, COMSIG_MOVABLE_SECLUDED_LOCATION)
next_crisis = world.time + 600
- addtimer(CALLBACK(src, .proc/fade_in), duration)
+ addtimer(CALLBACK(src, PROC_REF(fade_in)), duration)
/datum/brain_trauma/special/existential_crisis/proc/fade_in()
QDEL_NULL(veil)
diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm
index 44a1a76b08..3dbdf1f3ac 100644
--- a/code/datums/brain_damage/split_personality.dm
+++ b/code/datums/brain_damage/split_personality.dm
@@ -20,7 +20,7 @@
..()
make_backseats()
get_ghost()
- RegisterSignal(M, COMSIG_MOB_DEATH, .proc/revert_to_normal)
+ RegisterSignal(M, COMSIG_MOB_DEATH, PROC_REF(revert_to_normal))
/datum/brain_trauma/severe/split_personality/proc/make_backseats()
stranger_backseat = new(owner, src)
@@ -198,7 +198,7 @@
var/message = hearing_args[HEARING_RAW_MESSAGE]
if(findtext(message, codeword))
hearing_args[HEARING_RAW_MESSAGE] = replacetext(message, codeword, "[codeword]")
- addtimer(CALLBACK(src, /datum/brain_trauma/severe/split_personality.proc/switch_personalities), 10)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/brain_trauma/severe/split_personality, switch_personalities)), 10)
/datum/brain_trauma/severe/split_personality/brainwashing/handle_speech(datum/source, list/speech_args)
if(findtext(speech_args[SPEECH_MESSAGE], codeword))
diff --git a/code/datums/browser.dm b/code/datums/browser.dm
index e8c7615ecb..951c38f8c3 100644
--- a/code/datums/browser.dm
+++ b/code/datums/browser.dm
@@ -17,7 +17,7 @@
/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null)
user = nuser
- RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/user_deleted)
+ RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(user_deleted))
window_id = nwindow_id
if (ntitle)
title = format_text(ntitle)
@@ -250,7 +250,7 @@
winset(user, "mapwindow", "focus=true")
break
if (timeout)
- addtimer(CALLBACK(src, .proc/close), timeout)
+ addtimer(CALLBACK(src, PROC_REF(close)), timeout)
/datum/browser/modal/proc/wait()
while (opentime && selectedbutton <= 0 && (!timeout || opentime+timeout > world.time))
diff --git a/code/datums/callback.dm b/code/datums/callback.dm
index b5baea28f1..96702a4d7f 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, GLOBAL_PROC_REF(type/path|"procstring"), 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, GLOBAL_PROC_REF(type/path|procstring), arg1, arg2, ... argn), time, timertype)
* ```
*
* Note: proc strings can only be given for datum proc calls, global procs must be proc paths
@@ -37,14 +37,14 @@
* `CALLBACK(src, .some_proc_here)`
*
* ### when the above doesn't apply:
- *.proc/procname
+ * PROC_REF(procname)
*
- * `CALLBACK(src, .proc/some_proc_here)`
+ * `CALLBACK(src, PROC_REF(some_proc_here))`
*
*
* proc defined on a parent of a some type
*
- * `/some/type/.proc/some_proc_here`
+ * `TYPE_PROC_REF(/some/type, some_proc_here)`
*
* Otherwise you must always provide the full typepath of the proc (/type/of/thing/proc/procname)
*/
diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm
index 026ad190f7..dae42d7e8c 100644
--- a/code/datums/chatmessage.dm
+++ b/code/datums/chatmessage.dm
@@ -65,7 +65,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)
@@ -103,7 +103,7 @@
owned_by = owner.client
if(!owned_by)
return
- RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, .proc/on_parent_qdel)
+ RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_qdel))
// Clip message
var/maxlen = owned_by.prefs.max_chat_length
diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm
index 6052b84364..cf9d1b70b9 100644
--- a/code/datums/cinematic.dm
+++ b/code/datums/cinematic.dm
@@ -66,7 +66,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
@@ -78,7 +78,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/acid.dm b/code/datums/components/acid.dm
index 686d47cb1e..9ab1f56a5a 100644
--- a/code/datums/components/acid.dm
+++ b/code/datums/components/acid.dm
@@ -9,9 +9,9 @@
var/acid_cap = acidpwr * 300
level = min(acidpwr * acid_volume, acid_cap)
START_PROCESSING(SSprocessing, src)
- RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/add_acid_overlay)
+ RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(add_acid_overlay))
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
O.update_icon()
/datum/component/acid/proc/on_attack_hand(datum/source, mob/user)
diff --git a/code/datums/components/activity.dm b/code/datums/components/activity.dm
index 7c4c758d49..b3e87afce4 100644
--- a/code/datums/components/activity.dm
+++ b/code/datums/components/activity.dm
@@ -8,12 +8,12 @@
return COMPONENT_INCOMPATIBLE
var/mob/living/L = parent
- RegisterSignal(L, COMSIG_LIVING_SET_AS_ATTACKER, .proc/on_set_as_attacker)
- RegisterSignal(L, COMSIG_LIVING_ATTACKER_SET, .proc/on_attacker_set)
- RegisterSignal(L, COMSIG_MOB_DEATH, .proc/on_death)
- RegisterSignal(L, COMSIG_EXIT_AREA, .proc/on_exit_area)
- RegisterSignal(L, COMSIG_LIVING_LIFE, .proc/on_life)
- RegisterSignal(L, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE, COMSIG_MOB_APPLY_DAMAGE), .proc/minor_activity)
+ RegisterSignal(L, COMSIG_LIVING_SET_AS_ATTACKER, PROC_REF(on_set_as_attacker))
+ RegisterSignal(L, COMSIG_LIVING_ATTACKER_SET, PROC_REF(on_attacker_set))
+ RegisterSignal(L, COMSIG_MOB_DEATH, PROC_REF(on_death))
+ RegisterSignal(L, COMSIG_EXIT_AREA, PROC_REF(on_exit_area))
+ RegisterSignal(L, COMSIG_LIVING_LIFE, PROC_REF(on_life))
+ RegisterSignal(L, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_MOB_ATTACK_RANGED, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_THROW, COMSIG_MOVABLE_TELEPORTED, COMSIG_LIVING_GUN_PROCESS_FIRE, COMSIG_MOB_APPLY_DAMAGE), PROC_REF(minor_activity))
/datum/component/activity/proc/log_activity()
historical_activity_levels["[world.time]"] = activity_level
diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm
index 840c202bfc..242bdfb505 100644
--- a/code/datums/components/anti_magic.dm
+++ b/code/datums/components/anti_magic.dm
@@ -10,10 +10,10 @@
/datum/component/anti_magic/Initialize(_magic = FALSE, _holy = FALSE, _psychic = FALSE, _allowed_slots, _charges, _blocks_self = TRUE, datum/callback/_reaction, datum/callback/_expire)
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
else if(ismob(parent))
- RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, .proc/protect)
+ RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, PROC_REF(protect))
else
return COMPONENT_INCOMPATIBLE
@@ -32,7 +32,7 @@
if(!(allowed_slots & 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)
UnregisterSignal(user, COMSIG_MOB_RECEIVE_MAGIC)
diff --git a/code/datums/components/area_sound_manager.dm b/code/datums/components/area_sound_manager.dm
index 50bb77772f..cb6b7bef74 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/armor_plate.dm b/code/datums/components/armor_plate.dm
index db22e2277b..52a8e7443b 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/bane.dm b/code/datums/components/bane.dm
index bdfcfed517..cd6e9d5b35 100644
--- a/code/datums/components/bane.dm
+++ b/code/datums/components/bane.dm
@@ -21,9 +21,9 @@
/datum/component/bane/RegisterWithParent()
. = ..()
if(speciestype)
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/speciesCheck)
+ RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(speciesCheck))
else
- RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/mobCheck)
+ RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(mobCheck))
/datum/component/bane/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/bouncy.dm b/code/datums/components/bouncy.dm
index 3c4e228b59..afb4948058 100644
--- a/code/datums/components/bouncy.dm
+++ b/code/datums/components/bouncy.dm
@@ -18,11 +18,11 @@
var/list/diff_bounces = difflist(bounce_signals, _bounce_signals, TRUE)
for(var/bounce in diff_bounces)
bounce_signals += bounce
- RegisterSignal(parent, bounce, .proc/bounce_up)
+ RegisterSignal(parent, bounce, PROC_REF(bounce_up))
/datum/component/bouncy/RegisterWithParent()
. = ..()
- RegisterSignal(parent, bounce_signals, .proc/bounce_up)
+ RegisterSignal(parent, bounce_signals, PROC_REF(bounce_up))
/datum/component/bouncy/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm
index 770efe9cad..feeae722d0 100644
--- a/code/datums/components/butchering.dm
+++ b/code/datums/components/butchering.dm
@@ -20,14 +20,14 @@
if(_can_be_blunt)
can_be_blunt = _can_be_blunt
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)
if(user.a_intent != INTENT_HARM)
return
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_ITEM_NO_ATTACK
if(ishuman(M) && source.force && source.get_sharpness())
@@ -37,7 +37,7 @@
user.show_message("[H]'s neck has already been already cut, you can't make the bleeding any worse!", 1, \
"Their neck has already been already cut, you can't make the bleeding any worse!")
return COMPONENT_ITEM_NO_ATTACK
- INVOKE_ASYNC(src, .proc/startNeckSlice, source, H, user)
+ INVOKE_ASYNC(src, PROC_REF(startNeckSlice), source, H, user)
return COMPONENT_ITEM_NO_ATTACK
/datum/component/butchering/proc/startButcher(obj/item/source, mob/living/M, mob/living/user)
@@ -123,7 +123,7 @@
. = ..()
if(. == COMPONENT_INCOMPATIBLE)
return
- RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/onCrossed)
+ RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, PROC_REF(onCrossed))
/datum/component/butchering/recycler/proc/onCrossed(datum/source, mob/living/L)
if(!istype(L))
diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm
index 408d65638a..69cb6ef75d 100644
--- a/code/datums/components/caltrop.dm
+++ b/code/datums/components/caltrop.dm
@@ -12,7 +12,7 @@
probability = _probability
flags = _flags
- RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED), .proc/Crossed)
+ RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED), PROC_REF(Crossed))
/datum/component/caltrop/proc/Crossed(datum/source, atom/movable/AM)
var/atom/A = parent
diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm
index f5a34bfca2..fedbe93ed8 100644
--- a/code/datums/components/chasm.dm
+++ b/code/datums/components/chasm.dm
@@ -24,7 +24,7 @@
))
/datum/component/chasm/Initialize(turf/target)
- RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), .proc/Entered)
+ RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED), PROC_REF(Entered))
target_turf = target
START_PROCESSING(SSobj, src) // process on create, in case stuff is still there
@@ -57,7 +57,7 @@
for (var/thing in to_check)
if (droppable(thing))
. = 1
- INVOKE_ASYNC(src, .proc/drop, thing)
+ INVOKE_ASYNC(src, PROC_REF(drop), thing)
/datum/component/chasm/proc/droppable(atom/movable/AM)
// avoid an infinite loop, but allow falling a large distance
diff --git a/code/datums/components/combat_mode.dm b/code/datums/components/combat_mode.dm
index dae0743088..17c67e9662 100644
--- a/code/datums/components/combat_mode.dm
+++ b/code/datums/components/combat_mode.dm
@@ -17,14 +17,14 @@
src.hud_loc = hud_loc
- RegisterSignal(L, SIGNAL_TRAIT(TRAIT_COMBAT_MODE_LOCKED), .proc/update_combat_lock)
- RegisterSignal(L, COMSIG_TOGGLE_COMBAT_MODE, .proc/user_toggle_intentional_combat_mode)
- RegisterSignal(L, COMSIG_DISABLE_COMBAT_MODE, .proc/safe_disable_combat_mode)
- RegisterSignal(L, COMSIG_ENABLE_COMBAT_MODE, .proc/safe_enable_combat_mode)
- RegisterSignal(L, COMSIG_MOB_DEATH, .proc/on_death)
- RegisterSignal(L, COMSIG_MOB_CLIENT_LOGOUT, .proc/on_logout)
- RegisterSignal(L, COMSIG_MOB_HUD_CREATED, .proc/on_mob_hud_created)
- RegisterSignal(L, COMSIG_COMBAT_MODE_CHECK, .proc/check_flags)
+ RegisterSignal(L, SIGNAL_TRAIT(TRAIT_COMBAT_MODE_LOCKED), PROC_REF(update_combat_lock))
+ RegisterSignal(L, COMSIG_TOGGLE_COMBAT_MODE, PROC_REF(user_toggle_intentional_combat_mode))
+ RegisterSignal(L, COMSIG_DISABLE_COMBAT_MODE, PROC_REF(safe_disable_combat_mode))
+ RegisterSignal(L, COMSIG_ENABLE_COMBAT_MODE, PROC_REF(safe_enable_combat_mode))
+ RegisterSignal(L, COMSIG_MOB_DEATH, PROC_REF(on_death))
+ RegisterSignal(L, COMSIG_MOB_CLIENT_LOGOUT, PROC_REF(on_logout))
+ RegisterSignal(L, COMSIG_MOB_HUD_CREATED, PROC_REF(on_mob_hud_created))
+ RegisterSignal(L, COMSIG_COMBAT_MODE_CHECK, PROC_REF(check_flags))
update_combat_lock()
@@ -89,8 +89,8 @@
if(playsound)
playsound(source, 'sound/machines/chime.ogg', 10) //sandstorm stuff - combat mode indicator
flick_emote_popup_on_mob(source, "combat", 10) //sandstorm stuff - combat mode indicator
- RegisterSignal(source, COMSIG_MOB_CLIENT_MOUSEMOVE, .proc/onMouseMove)
- RegisterSignal(source, COMSIG_MOVABLE_MOVED, .proc/on_move)
+ RegisterSignal(source, COMSIG_MOB_CLIENT_MOUSEMOVE, PROC_REF(onMouseMove))
+ RegisterSignal(source, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
if(hud_icon)
hud_icon.combat_on = TRUE
hud_icon.update_icon()
diff --git a/code/datums/components/construction.dm b/code/datums/components/construction.dm
index 01df44752c..45ef560297 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)
diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
index e4ca8317d5..257e6cc4ca 100644
--- a/code/datums/components/crafting/crafting.dm
+++ b/code/datums/components/crafting/crafting.dm
@@ -1,6 +1,6 @@
/datum/component/personal_crafting/Initialize()
if(ismob(parent))
- RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/create_mob_button)
+ RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, PROC_REF(create_mob_button))
/datum/component/personal_crafting/proc/create_mob_button(mob/user)
var/datum/hud/H = user.hud_used
@@ -8,7 +8,7 @@
C.icon = H.ui_style
H.static_inventory += C
user.client.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
diff --git a/code/datums/components/dejavu.dm b/code/datums/components/dejavu.dm
index 1bad589c97..88e6301b05 100644
--- a/code/datums/components/dejavu.dm
+++ b/code/datums/components/dejavu.dm
@@ -42,22 +42,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.obj_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/dullahan.dm b/code/datums/components/dullahan.dm
index 94733636c7..6a5ccde7c7 100644
--- a/code/datums/components/dullahan.dm
+++ b/code/datums/components/dullahan.dm
@@ -17,7 +17,7 @@
update_name()
dullahan_head.owner = H
- RegisterSignal(H, COMSIG_LIVING_REGENERATE_LIMBS, .proc/unlist_head)
+ RegisterSignal(H, COMSIG_LIVING_REGENERATE_LIMBS, PROC_REF(unlist_head))
// make sure the brain can't decay or fall out
var/obj/item/organ/brain/B = H.getorganslot(ORGAN_SLOT_BRAIN)
@@ -57,7 +57,7 @@
H.flags_1 &= ~(HEAR_1)
- RegisterSignal(dullahan_head, COMSIG_ATOM_HEARER_IN_VIEW, .proc/include_owner)
+ RegisterSignal(dullahan_head, COMSIG_ATOM_HEARER_IN_VIEW, PROC_REF(include_owner))
dullahan_head.update_appearance()
@@ -69,7 +69,7 @@
dullahan_head.name = "[H.name]'s head"
dullahan_head.desc = "the decapitated head of [H.name]"
return TRUE
- addtimer(CALLBACK(src, .proc/update_name, retries + 1), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(update_name), retries + 1), 2 SECONDS)
/datum/component/dullahan/proc/include_owner(datum/source, list/processing_list, list/hearers)
if(!QDELETED(parent))
diff --git a/code/datums/components/earprotection.dm b/code/datums/components/earprotection.dm
index 9256c4310a..6439e49b83 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/edible.dm b/code/datums/components/edible.dm
index dc2e490fe4..3b4d8d7611 100644
--- a/code/datums/components/edible.dm
+++ b/code/datums/components/edible.dm
@@ -34,12 +34,12 @@ 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_PARENT_EXAMINE, PROC_REF(examine))
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(UseByAnimal))
if(isitem(parent))
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/UseFromHand)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(UseFromHand))
else if(isturf(parent))
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/TryToEatTurf)
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(TryToEatTurf))
src.bite_consumption = bite_consumption
src.food_flags = food_flags
diff --git a/code/datums/components/edit_complainer.dm b/code/datums/components/edit_complainer.dm
index e2cca2eb50..038cd3e5e7 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)
var/atom/movable/master = parent
diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm
index 9bdb009962..b00a07f953 100644
--- a/code/datums/components/embedded.dm
+++ b/code/datums/components/embedded.dm
@@ -100,12 +100,12 @@
/datum/component/embedded/RegisterWithParent()
if(iscarbon(parent))
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/jostleCheck)
- RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, .proc/ripOutCarbon)
- RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, .proc/safeRemoveCarbon)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(jostleCheck))
+ RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, PROC_REF(ripOutCarbon))
+ RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, PROC_REF(safeRemoveCarbon))
else if(isclosedturf(parent))
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examineTurf)
- RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/itemMoved)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examineTurf))
+ RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(itemMoved))
/datum/component/embedded/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL, COMSIG_PARENT_EXAMINE))
@@ -137,7 +137,7 @@
limb.embedded_objects |= weapon // on the inside... on the inside...
weapon.forceMove(victim)
- RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), .proc/byeItemCarbon)
+ RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), PROC_REF(byeItemCarbon))
var/damage = 0
if(harmful)
victim.visible_message("[weapon] embeds itself in [victim]'s [limb.name]!",ignored_mobs=victim)
@@ -304,7 +304,7 @@
// we can't store the item IN the turf (cause turfs are just kinda... there), so we fake it by making the item invisible and bailing if it moves due to a blast
weapon.forceMove(hit)
weapon.invisibility = INVISIBILITY_ABSTRACT
- RegisterSignal(weapon, COMSIG_MOVABLE_MOVED, .proc/itemMoved)
+ RegisterSignal(weapon, COMSIG_MOVABLE_MOVED, PROC_REF(itemMoved))
var/pixelX = rand(-2, 2)
var/pixelY = rand(-1, 3) // bias this upwards since in-hands are usually on the lower end of the sprite
@@ -327,7 +327,7 @@
var/matrix/M = matrix()
M.Translate(pixelX, pixelY)
overlay.transform = M
- RegisterSignal(hit,COMSIG_ATOM_UPDATE_OVERLAYS,.proc/apply_overlay)
+ RegisterSignal(hit,COMSIG_ATOM_UPDATE_OVERLAYS,PROC_REF(apply_overlay))
hit.update_icon()
if(harmful)
diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm
index 1e63f2d051..ac6d0294f6 100644
--- a/code/datums/components/explodable.dm
+++ b/code/datums/components/explodable.dm
@@ -10,16 +10,16 @@
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_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))
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))
@@ -56,7 +56,7 @@
detonate()
/datum/component/explodable/proc/on_equip(datum/source, mob/equipper, slot)
- 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)
UnregisterSignal(user, COMSIG_MOB_APPLY_DAMAGE)
diff --git a/code/datums/components/field_of_vision.dm b/code/datums/components/field_of_vision.dm
index 4c03346639..903d0f01c7 100644
--- a/code/datums/components/field_of_vision.dm
+++ b/code/datums/components/field_of_vision.dm
@@ -82,14 +82,14 @@
var/mob/M = parent
if(M.client)
generate_fov_holder(M, angle)
- RegisterSignal(M, COMSIG_MOB_CLIENT_LOGIN, .proc/on_mob_login)
- RegisterSignal(M, COMSIG_MOB_CLIENT_LOGOUT, .proc/on_mob_logout)
- RegisterSignal(M, COMSIG_MOB_GET_VISIBLE_MESSAGE, .proc/on_visible_message)
- RegisterSignal(M, COMSIG_MOB_EXAMINATE, .proc/on_examinate)
- RegisterSignal(M, COMSIG_MOB_FOV_VIEW, .proc/on_fov_view)
- RegisterSignal(M, COMSIG_MOB_CLIENT_CHANGE_VIEW, .proc/on_change_view)
- RegisterSignal(M, COMSIG_MOB_RESET_PERSPECTIVE, .proc/on_reset_perspective)
- RegisterSignal(M, COMSIG_MOB_FOV_VIEWER, .proc/is_viewer)
+ RegisterSignal(M, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(on_mob_login))
+ RegisterSignal(M, COMSIG_MOB_CLIENT_LOGOUT, PROC_REF(on_mob_logout))
+ RegisterSignal(M, COMSIG_MOB_GET_VISIBLE_MESSAGE, PROC_REF(on_visible_message))
+ RegisterSignal(M, COMSIG_MOB_EXAMINATE, PROC_REF(on_examinate))
+ RegisterSignal(M, COMSIG_MOB_FOV_VIEW, PROC_REF(on_fov_view))
+ RegisterSignal(M, COMSIG_MOB_CLIENT_CHANGE_VIEW, PROC_REF(on_change_view))
+ RegisterSignal(M, COMSIG_MOB_RESET_PERSPECTIVE, PROC_REF(on_reset_perspective))
+ RegisterSignal(M, COMSIG_MOB_FOV_VIEWER, PROC_REF(is_viewer))
/datum/component/field_of_vision/UnregisterFromParent()
. = ..()
@@ -134,14 +134,14 @@
if(_angle)
rotate_shadow_cone(_angle)
fov.alpha = M.stat == DEAD ? 0 : 255
- RegisterSignal(M, COMSIG_MOB_DEATH, .proc/hide_fov)
- RegisterSignal(M, COMSIG_LIVING_REVIVE, .proc/show_fov)
- RegisterSignal(M, COMSIG_ATOM_DIR_CHANGE, .proc/on_dir_change)
- RegisterSignal(M, COMSIG_MOVABLE_MOVED, .proc/on_mob_moved)
- RegisterSignal(M, COMSIG_ROBOT_UPDATE_ICONS, .proc/manual_centered_render_source)
+ RegisterSignal(M, COMSIG_MOB_DEATH, PROC_REF(hide_fov))
+ RegisterSignal(M, COMSIG_LIVING_REVIVE, PROC_REF(show_fov))
+ RegisterSignal(M, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change))
+ RegisterSignal(M, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_moved))
+ RegisterSignal(M, COMSIG_ROBOT_UPDATE_ICONS, PROC_REF(manual_centered_render_source))
var/atom/A = M
if(M.loc && !isturf(M.loc))
- REGISTER_NESTED_LOCS(M, nested_locs, COMSIG_MOVABLE_MOVED, .proc/on_loc_moved)
+ REGISTER_NESTED_LOCS(M, nested_locs, COMSIG_MOVABLE_MOVED, PROC_REF(on_loc_moved))
A = nested_locs[nested_locs.len]
CENTERED_RENDER_SOURCE(owner_mask, A, src)
M.client.images += shadow_mask
@@ -213,7 +213,7 @@
var/turf/T
if(!isturf(source.loc)) //Recalculate all nested locations.
UNREGISTER_NESTED_LOCS( nested_locs, COMSIG_MOVABLE_MOVED, 1)
- REGISTER_NESTED_LOCS(source, nested_locs, COMSIG_MOVABLE_MOVED, .proc/on_loc_moved)
+ REGISTER_NESTED_LOCS(source, nested_locs, COMSIG_MOVABLE_MOVED, PROC_REF(on_loc_moved))
var/atom/movable/topmost = nested_locs[nested_locs.len]
T = topmost.loc
CENTERED_RENDER_SOURCE(owner_mask, topmost, src)
@@ -233,7 +233,7 @@
var/atom/movable/prev_topmost = nested_locs[nested_locs.len]
if(prev_topmost != source)
UNREGISTER_NESTED_LOCS(nested_locs, COMSIG_MOVABLE_MOVED, nested_locs.Find(source) + 1)
- REGISTER_NESTED_LOCS(source, nested_locs, COMSIG_MOVABLE_MOVED, .proc/on_loc_moved)
+ REGISTER_NESTED_LOCS(source, nested_locs, COMSIG_MOVABLE_MOVED, PROC_REF(on_loc_moved))
var/atom/movable/topmost = nested_locs[nested_locs.len]
if(topmost != prev_topmost)
CENTERED_RENDER_SOURCE(owner_mask, topmost, src)
diff --git a/code/datums/components/footstep.dm b/code/datums/components/footstep.dm
index 8b326ac424..da7e4a58d9 100644
--- a/code/datums/components/footstep.dm
+++ b/code/datums/components/footstep.dm
@@ -21,7 +21,7 @@
if(FOOTSTEP_MOB_HUMAN)
if(!ishuman(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/play_humanstep)
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(play_humanstep))
return
if(FOOTSTEP_MOB_CLAW)
footstep_sounds = GLOB.clawfootstep
@@ -35,7 +35,7 @@
footstep_sounds = 'sound/effects/footstep/slime1.ogg'
if(FOOTSTEP_MOB_CRAWL)
footstep_sounds = 'sound/effects/footstep/crawl1.ogg'
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/play_simplestep) //Note that this doesn't get called for humans.
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep)) //Note that this doesn't get called for humans.
///Prepares a footstep. Determines if it should get played. Returns the turf it should get played on. Note that it is always a /turf/open
/datum/component/footstep/proc/prepare_step()
diff --git a/code/datums/components/fried.dm b/code/datums/components/fried.dm
index 4e21962778..d86ee6cee9 100644
--- a/code/datums/components/fried.dm
+++ b/code/datums/components/fried.dm
@@ -12,8 +12,8 @@
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
- RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/restore) //basically, unfry people who are being cleaned (badmemes fried someone)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
+ RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(restore)) //basically, unfry people who are being cleaned (badmemes fried someone)
fry_power = frying_power
owner = parent
diff --git a/code/datums/components/fullauto.dm b/code/datums/components/fullauto.dm
index f508f056c3..fbf51c7f41 100644
--- a/code/datums/components/fullauto.dm
+++ b/code/datums/components/fullauto.dm
@@ -18,9 +18,9 @@
if(!isgun(parent))
return COMPONENT_INCOMPATIBLE
var/obj/item/gun = parent
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/wake_up)
- RegisterSignal(parent, COMSIG_GUN_AUTOFIRE_SELECTED, .proc/wake_up)
- RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_ITEM_DROPPED, COMSIG_GUN_AUTOFIRE_DESELECTED), .proc/autofire_off)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(wake_up))
+ RegisterSignal(parent, COMSIG_GUN_AUTOFIRE_SELECTED, PROC_REF(wake_up))
+ RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_ITEM_DROPPED, COMSIG_GUN_AUTOFIRE_DESELECTED), PROC_REF(autofire_off))
if(_autofire_shot_delay)
autofire_shot_delay = _autofire_shot_delay
if(ismob(gun.loc))
@@ -69,12 +69,12 @@
autofire_stat = AUTOFIRE_STAT_ALERT
clicker = usercli
shooter = clicker.mob
- RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, .proc/on_mouse_down)
- RegisterSignal(shooter, COMSIG_MOB_CLIENT_LOGOUT, .proc/autofire_off)
+ RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, PROC_REF(on_mouse_down))
+ RegisterSignal(shooter, COMSIG_MOB_CLIENT_LOGOUT, PROC_REF(autofire_off))
if(!QDELETED(shooter))
UnregisterSignal(shooter, COMSIG_MOB_CLIENT_LOGIN)
- 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)
+ 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)
@@ -90,7 +90,7 @@
UnregisterSignal(clicker, list(COMSIG_CLIENT_MOUSEDOWN, COMSIG_CLIENT_MOUSEUP, COMSIG_CLIENT_MOUSEDRAG))
mouse_status = AUTOFIRE_MOUSEUP //In regards to the component there's no click anymore to care about.
clicker = null
- RegisterSignal(shooter, COMSIG_MOB_CLIENT_LOGIN, .proc/on_client_login)
+ RegisterSignal(shooter, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(on_client_login))
if(!QDELETED(shooter))
UnregisterSignal(shooter, COMSIG_MOB_CLIENT_LOGOUT)
shooter = null
@@ -157,10 +157,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
@@ -174,7 +174,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)
@@ -270,7 +270,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)
return COMPONENT_AUTOFIRE_SHOT_SUCCESS //All is well, we can continue shooting.
diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm
index d78bd799a2..acc965d522 100644
--- a/code/datums/components/gps.dm
+++ b/code/datums/components/gps.dm
@@ -39,12 +39,12 @@ GLOBAL_LIST_EMPTY(GPS_list)
else
tracking = FALSE
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_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item)
+ 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))
+ RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
///Called on COMSIG_ITEM_ATTACK_SELF
/datum/component/gps/item/proc/interact(datum/source, mob/user)
@@ -72,7 +72,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/honkspam.dm b/code/datums/components/honkspam.dm
index 73b5e3335a..ee457b4d96 100644
--- a/code/datums/components/honkspam.dm
+++ b/code/datums/components/honkspam.dm
@@ -9,7 +9,7 @@
/datum/component/honkspam/Initialize()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact))
/datum/component/honkspam/proc/reset_spamflag()
spam_flag = FALSE
@@ -19,4 +19,4 @@
spam_flag = TRUE
var/obj/item/parent_item = parent
playsound(parent_item.loc, 'sound/items/bikehorn.ogg', 50, TRUE)
- addtimer(CALLBACK(src, .proc/reset_spamflag), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reset_spamflag)), 2 SECONDS)
diff --git a/code/datums/components/identification.dm b/code/datums/components/identification.dm
index cd47cfcbeb..18fbeb46bc 100644
--- a/code/datums/components/identification.dm
+++ b/code/datums/components/identification.dm
@@ -24,12 +24,12 @@
identification_method_flags = id_method_flags
/datum/component/identification/RegisterWithParent()
- RegisterSignal(parent, COMSIG_IDENTIFICATION_KNOWLEDGE_CHECK, .proc/check_knowledge)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine)
+ RegisterSignal(parent, COMSIG_IDENTIFICATION_KNOWLEDGE_CHECK, PROC_REF(check_knowledge))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
if(identification_effect_flags & ID_COMPONENT_EFFECT_NO_ACTIONS)
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
if(identification_method_flags & ID_COMPONENT_IDENTIFY_WITH_DECONSTRUCTOR)
- RegisterSignal(parent, COMSIG_ITEM_DECONSTRUCTOR_DEEPSCAN, .proc/on_deconstructor_deepscan)
+ RegisterSignal(parent, COMSIG_ITEM_DECONSTRUCTOR_DEEPSCAN, PROC_REF(on_deconstructor_deepscan))
/datum/component/identification/UnregisterFromParent()
var/list/unregister = list(COMSIG_PARENT_EXAMINE)
diff --git a/code/datums/components/igniter.dm b/code/datums/components/igniter.dm
index 2f311db166..cec8e2f972 100644
--- a/code/datums/components/igniter.dm
+++ b/code/datums/components/igniter.dm
@@ -11,11 +11,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_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+ RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
/datum/component/igniter/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm
index 8d3c6ab81f..67a0e4e5ab 100644
--- a/code/datums/components/infective.dm
+++ b/code/datums/components/infective.dm
@@ -15,19 +15,19 @@
if(!ismovable(parent))
return COMPONENT_INCOMPATIBLE
- 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_CROSSED, .proc/try_infect_crossed)
- 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_CROSSED, PROC_REF(try_infect_crossed))
+ 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_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))
if(istype(parent, /obj/item/reagent_containers/food/snacks))
- RegisterSignal(parent, COMSIG_FOOD_EATEN, .proc/try_infect_eat)
+ RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(try_infect_eat))
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)
for(var/V in diseases)
diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm
index 2a865d6658..5f16e147af 100644
--- a/code/datums/components/jousting.dm
+++ b/code/datums/components/jousting.dm
@@ -18,12 +18,12 @@
/datum/component/jousting/Initialize()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack))
/datum/component/jousting/proc/on_equip(datum/source, mob/user, slot)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/mob_move, TRUE)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(mob_move), TRUE)
current_holder = user
/datum/component/jousting/proc/on_drop(datum/source, mob/user)
@@ -68,7 +68,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/killerqueen.dm b/code/datums/components/killerqueen.dm
index 0f7d3f0346..072db869b6 100644
--- a/code/datums/components/killerqueen.dm
+++ b/code/datums/components/killerqueen.dm
@@ -51,10 +51,10 @@
/datum/component/killerqueen/RegisterWithParent()
. = ..()
- RegisterSignal(parent, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW, COMSIG_ATOM_ATTACK_ANIMAL), .proc/touch_detonate)
- RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/bump_detonate)
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby_detonate)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine)
+ RegisterSignal(parent, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW, COMSIG_ATOM_ATTACK_ANIMAL), PROC_REF(touch_detonate))
+ RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(bump_detonate))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_detonate))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
/datum/component/killerqueen/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/knockback.dm b/code/datums/components/knockback.dm
index bd0d5ae352..c7c576342b 100644
--- a/code/datums/components/knockback.dm
+++ b/code/datums/components/knockback.dm
@@ -17,11 +17,11 @@
/datum/component/knockback/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_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+ RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
/datum/component/knockback/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/knockoff.dm b/code/datums/components/knockoff.dm
index b9cdb7754c..9e3ebc5a6c 100644
--- a/code/datums/components/knockoff.dm
+++ b/code/datums/components/knockoff.dm
@@ -7,8 +7,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
@@ -38,7 +38,7 @@
if(slots_knockoffable && !(slot in slots_knockoffable))
UnregisterSignal(H, COMSIG_HUMAN_DISARM_HIT)
return
- RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, .proc/Knockoff, TRUE)
+ RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, PROC_REF(Knockoff), TRUE)
/datum/component/knockoff/proc/OnDropped(datum/source, mob/living/M)
UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT)
diff --git a/code/datums/components/label.dm b/code/datums/components/label.dm
index c6d0c595eb..0a8c50cdf7 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/lifesteal.dm b/code/datums/components/lifesteal.dm
index 9d62d32866..0427394c20 100644
--- a/code/datums/components/lifesteal.dm
+++ b/code/datums/components/lifesteal.dm
@@ -12,11 +12,11 @@
/datum/component/lifesteal/RegisterWithParent()
. = ..()
if(isgun(parent))
- 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_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+ RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
/datum/component/lifesteal/UnregisterFromParent()
. = ..()
diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm
index 4acdece7e5..f6f3ae7e37 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)
@@ -47,7 +47,7 @@
if(icon_state)
lock_icon_state = icon_state
generate_lock_visuals()
- RegisterSignal(parent, COMSIG_MOB_CLIENT_MOUSEMOVE, .proc/onMouseMove)
+ RegisterSignal(parent, COMSIG_MOB_CLIENT_MOUSEMOVE, PROC_REF(onMouseMove))
START_PROCESSING(SSfastprocess, src)
/datum/component/lockon_aiming/Destroy()
diff --git a/code/datums/components/magnetic_catch.dm b/code/datums/components/magnetic_catch.dm
index 20cd8e1d78..52c417981d 100644
--- a/code/datums/components/magnetic_catch.dm
+++ b/code/datums/components/magnetic_catch.dm
@@ -1,31 +1,31 @@
/datum/component/magnetic_catch/Initialize()
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
if(ismovable(parent))
- RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/crossed_react)
- RegisterSignal(parent, COMSIG_MOVABLE_UNCROSSED, .proc/uncrossed_react)
+ RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, PROC_REF(crossed_react))
+ RegisterSignal(parent, COMSIG_MOVABLE_UNCROSSED, PROC_REF(uncrossed_react))
for(var/i in get_turf(parent))
if(i == parent)
continue
- RegisterSignal(i, COMSIG_MOVABLE_PRE_THROW, .proc/throw_react)
+ RegisterSignal(i, COMSIG_MOVABLE_PRE_THROW, PROC_REF(throw_react))
else
- RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/entered_react)
- RegisterSignal(parent, COMSIG_ATOM_EXITED, .proc/exited_react)
+ RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(entered_react))
+ RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(exited_react))
for(var/i in parent)
- RegisterSignal(i, COMSIG_MOVABLE_PRE_THROW, .proc/throw_react)
+ RegisterSignal(i, COMSIG_MOVABLE_PRE_THROW, PROC_REF(throw_react))
/datum/component/magnetic_catch/proc/examine(datum/source, mob/user, list/examine_list)
examine_list += "It has been installed with inertia dampening to prevent coffee spills."
/datum/component/magnetic_catch/proc/crossed_react(datum/source, atom/movable/thing)
- RegisterSignal(thing, COMSIG_MOVABLE_PRE_THROW, .proc/throw_react, TRUE)
+ RegisterSignal(thing, COMSIG_MOVABLE_PRE_THROW, PROC_REF(throw_react), TRUE)
/datum/component/magnetic_catch/proc/uncrossed_react(datum/source, atom/movable/thing)
UnregisterSignal(thing, COMSIG_MOVABLE_PRE_THROW)
/datum/component/magnetic_catch/proc/entered_react(datum/source, atom/movable/thing, atom/oldloc)
- RegisterSignal(thing, COMSIG_MOVABLE_PRE_THROW, .proc/throw_react, TRUE)
+ RegisterSignal(thing, COMSIG_MOVABLE_PRE_THROW, PROC_REF(throw_react), TRUE)
/datum/component/magnetic_catch/proc/exited_react(datum/source, atom/movable/thing, atom/newloc)
UnregisterSignal(thing, COMSIG_MOVABLE_PRE_THROW)
diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm
index cc988544b8..fbd0aa12d7 100644
--- a/code/datums/components/material_container.dm
+++ b/code/datums/components/material_container.dm
@@ -50,8 +50,8 @@
precondition = _precondition
after_insert = _after_insert
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
for(var/mat in mat_list) //Make the assoc list material reference -> amount
var/mat_ref = SSmaterials.GetMaterialRef(mat)
diff --git a/code/datums/components/mirv.dm b/code/datums/components/mirv.dm
index 77c47bcb1d..ce579d0bf2 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()
. = ..()
diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm
index dcb6837c3d..e82a49dc9f 100644
--- a/code/datums/components/mood.dm
+++ b/code/datums/components/mood.dm
@@ -27,14 +27,14 @@
if(owner.stat != DEAD)
START_PROCESSING(SSobj, src)
- RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/add_event)
- RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
- RegisterSignal(parent, COMSIG_MODIFY_SANITY, .proc/modify_sanity)
- RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/on_revive)
- RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud)
- RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/stop_processing)
- RegisterSignal(parent, COMSIG_VOID_MASK_ACT, .proc/direct_sanity_drain)
- RegisterSignal(parent, COMSIG_ENTER_AREA, .proc/update_beauty)
+ RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, PROC_REF(add_event))
+ RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, PROC_REF(clear_event))
+ RegisterSignal(parent, COMSIG_MODIFY_SANITY, PROC_REF(modify_sanity))
+ RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(on_revive))
+ RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, PROC_REF(modify_hud))
+ RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(stop_processing))
+ RegisterSignal(parent, COMSIG_VOID_MASK_ACT, PROC_REF(direct_sanity_drain))
+ RegisterSignal(parent, COMSIG_ENTER_AREA, PROC_REF(update_beauty))
if(owner.hud_used)
@@ -233,7 +233,7 @@
if(master.mind)
master.mind.add_skill_modifier(malus.identifier)
else
- malus.RegisterSignal(master, COMSIG_MOB_ON_NEW_MIND, /datum/skill_modifier.proc/on_mob_new_mind, TRUE)
+ malus.RegisterSignal(master, COMSIG_MOB_ON_NEW_MIND, TYPE_PROC_REF(/datum/skill_modifier, on_mob_new_mind), TRUE)
malus.value_mod = malus.level_mod = 1 - (sanity_level - 3) * MOOD_INSANITY_MALUS
else if(malus)
if(master.mind)
@@ -269,7 +269,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 0 //Don't have to update the event.
the_event = new type(src, param)//This causes a runtime for some reason, was this me? No - there's an event floating around missing a definition.
@@ -277,7 +277,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)
var/datum/mood_event/event = mood_events[category]
@@ -304,8 +304,8 @@
screen_obj_sanity = new // Sandstorm sanity
hud.infodisplay += screen_obj
hud.infodisplay += screen_obj_sanity // Sandstorm sanity
- 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)
if(!screen_obj || !parent)
diff --git a/code/datums/components/multiple_lives.dm b/code/datums/components/multiple_lives.dm
index 3f4418a9d1..e65f04e249 100644
--- a/code/datums/components/multiple_lives.dm
+++ b/code/datums/components/multiple_lives.dm
@@ -15,8 +15,8 @@
src.lives_left = lives_left
/datum/component/multiple_lives/RegisterWithParent()
- RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/respawn)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine)
+ RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(respawn))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
/datum/component/multiple_lives/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_MOB_DEATH, COMSIG_PARENT_EXAMINE))
diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm
index 50ac5e5cc5..5ddd082fa8 100644
--- a/code/datums/components/nanites.dm
+++ b/code/datums/components/nanites.dm
@@ -78,34 +78,34 @@
cloud_sync()
/datum/component/nanites/RegisterWithParent()
- RegisterSignal(parent, COMSIG_HAS_NANITES, .proc/confirm_nanites)
- RegisterSignal(parent, COMSIG_NANITE_IS_STEALTHY, .proc/check_stealth)
- RegisterSignal(parent, COMSIG_NANITE_DELETE, .proc/delete_nanites)
- RegisterSignal(parent, COMSIG_NANITE_UI_DATA, .proc/nanite_ui_data)
- RegisterSignal(parent, COMSIG_NANITE_GET_PROGRAMS, .proc/get_programs)
- RegisterSignal(parent, COMSIG_NANITE_SET_VOLUME, .proc/set_volume)
- RegisterSignal(parent, COMSIG_NANITE_ADJUST_VOLUME, .proc/adjust_nanites)
- RegisterSignal(parent, COMSIG_NANITE_SET_MAX_VOLUME, .proc/set_max_volume)
- RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD, .proc/set_cloud)
- RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD_SYNC, .proc/set_cloud_sync)
- RegisterSignal(parent, COMSIG_NANITE_SET_SAFETY, .proc/set_safety)
- RegisterSignal(parent, COMSIG_NANITE_SET_REGEN, .proc/set_regen)
- RegisterSignal(parent, COMSIG_NANITE_ADD_PROGRAM, .proc/add_program)
- RegisterSignal(parent, COMSIG_NANITE_SCAN, .proc/nanite_scan)
- RegisterSignal(parent, COMSIG_NANITE_SYNC, .proc/sync)
- RegisterSignal(parent, COMSIG_NANITE_CHECK_CONSOLE_LOCK, .proc/check_console_locking)
- RegisterSignal(parent, COMSIG_NANITE_CHECK_HOST_LOCK, .proc/check_host_lockout)
- RegisterSignal(parent, COMSIG_NANITE_CHECK_VIRAL_PREVENTION, .proc/check_viral_prevention)
+ RegisterSignal(parent, COMSIG_HAS_NANITES, PROC_REF(confirm_nanites))
+ RegisterSignal(parent, COMSIG_NANITE_IS_STEALTHY, PROC_REF(check_stealth))
+ RegisterSignal(parent, COMSIG_NANITE_DELETE, PROC_REF(delete_nanites))
+ RegisterSignal(parent, COMSIG_NANITE_UI_DATA, PROC_REF(nanite_ui_data))
+ RegisterSignal(parent, COMSIG_NANITE_GET_PROGRAMS, PROC_REF(get_programs))
+ RegisterSignal(parent, COMSIG_NANITE_SET_VOLUME, PROC_REF(set_volume))
+ RegisterSignal(parent, COMSIG_NANITE_ADJUST_VOLUME, PROC_REF(adjust_nanites))
+ RegisterSignal(parent, COMSIG_NANITE_SET_MAX_VOLUME, PROC_REF(set_max_volume))
+ RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD, PROC_REF(set_cloud))
+ RegisterSignal(parent, COMSIG_NANITE_SET_CLOUD_SYNC, PROC_REF(set_cloud_sync))
+ RegisterSignal(parent, COMSIG_NANITE_SET_SAFETY, PROC_REF(set_safety))
+ RegisterSignal(parent, COMSIG_NANITE_SET_REGEN, PROC_REF(set_regen))
+ RegisterSignal(parent, COMSIG_NANITE_ADD_PROGRAM, PROC_REF(add_program))
+ RegisterSignal(parent, COMSIG_NANITE_SCAN, PROC_REF(nanite_scan))
+ RegisterSignal(parent, COMSIG_NANITE_SYNC, PROC_REF(sync))
+ RegisterSignal(parent, COMSIG_NANITE_CHECK_CONSOLE_LOCK, PROC_REF(check_console_locking))
+ RegisterSignal(parent, COMSIG_NANITE_CHECK_HOST_LOCK, PROC_REF(check_host_lockout))
+ RegisterSignal(parent, COMSIG_NANITE_CHECK_VIRAL_PREVENTION, PROC_REF(check_viral_prevention))
if(isliving(parent))
- RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp)
- RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/on_death)
- RegisterSignal(parent, COMSIG_MOB_ALLOWED, .proc/check_access)
- RegisterSignal(parent, COMSIG_LIVING_ELECTROCUTE_ACT, .proc/on_shock)
- RegisterSignal(parent, COMSIG_LIVING_MINOR_SHOCK, .proc/on_minor_shock)
- RegisterSignal(parent, COMSIG_SPECIES_GAIN, .proc/check_viable_biotype)
- RegisterSignal(parent, COMSIG_NANITE_SIGNAL, .proc/receive_signal)
- RegisterSignal(parent, COMSIG_NANITE_COMM_SIGNAL, .proc/receive_comm_signal)
+ RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp))
+ RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(on_death))
+ RegisterSignal(parent, COMSIG_MOB_ALLOWED, PROC_REF(check_access))
+ RegisterSignal(parent, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_shock))
+ RegisterSignal(parent, COMSIG_LIVING_MINOR_SHOCK, PROC_REF(on_minor_shock))
+ RegisterSignal(parent, COMSIG_SPECIES_GAIN, PROC_REF(check_viable_biotype))
+ RegisterSignal(parent, COMSIG_NANITE_SIGNAL, PROC_REF(receive_signal))
+ RegisterSignal(parent, COMSIG_NANITE_COMM_SIGNAL, PROC_REF(receive_comm_signal))
/datum/component/nanites/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_HAS_NANITES,
diff --git a/code/datums/components/omen.dm b/code/datums/components/omen.dm
index 3ea7677710..6773a92a27 100644
--- a/code/datums/components/omen.dm
+++ b/code/datums/components/omen.dm
@@ -27,9 +27,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))
diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm
index c34d56982a..3726f07190 100644
--- a/code/datums/components/orbiter.dm
+++ b/code/datums/components/orbiter.dm
@@ -23,7 +23,7 @@
. = ..()
var/atom/target = parent
while(ismovable(target))
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
target = target.loc
/datum/component/orbiter/UnregisterFromParent()
@@ -62,7 +62,7 @@
orbiter.orbiting.end_orbit(orbiter)
orbiters[orbiter] = TRUE
orbiter.orbiting = src
- RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, .proc/orbiter_move_react)
+ RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react))
var/matrix/initial_transform = matrix(orbiter.transform)
orbiters[orbiter] = initial_transform
@@ -121,7 +121,7 @@
if(orbited?.loc && orbited.loc != newturf) // We want to know when anything holding us moves too
var/atom/target = orbited.loc
while(ismovable(target))
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react, TRUE)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(move_react), TRUE)
target = target.loc
var/atom/curloc = master.loc
diff --git a/code/datums/components/paintable.dm b/code/datums/components/paintable.dm
index 756c42aa9d..f982306431 100644
--- a/code/datums/components/paintable.dm
+++ b/code/datums/components/paintable.dm
@@ -2,7 +2,7 @@
var/current_paint
/datum/component/spraycan_paintable/Initialize()
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/Repaint)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(Repaint))
/datum/component/spraycan_paintable/Destroy()
RemoveCurrentCoat()
diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm
index b214b8b282..afbef51fa5 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_PRIME, .proc/create_blast_pellets)
+ RegisterSignal(parent, COMSIG_GRENADE_ARMED, PROC_REF(grenade_armed))
+ RegisterSignal(parent, COMSIG_GRENADE_PRIME, 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_PRIME, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_UNCROSSED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED, COMSIG_SUPPLYPOD_LANDED))
@@ -112,8 +112,8 @@
else //Smart spread
spread = round((i / num_pellets - 0.5) * distro)
- RegisterSignal(shell.BB, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit)
- RegisterSignal(shell.BB, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range)
+ RegisterSignal(shell.BB, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit))
+ RegisterSignal(shell.BB, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range))
pellets += shell.BB
if(!shell.throw_proj(target, targloc, shooter, params, spread))
return
@@ -189,7 +189,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)
@@ -220,7 +220,7 @@
targets_hit[target]++
if(targets_hit[target] == 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()
@@ -245,8 +245,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()
@@ -290,9 +290,9 @@
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_MOVABLE_UNCROSSED, .proc/grenade_uncrossed)
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(grenade_dropped))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(grenade_moved))
+ RegisterSignal(parent, COMSIG_MOVABLE_UNCROSSED, PROC_REF(grenade_uncrossed))
/// Someone dropped the grenade, so set them to the shooter in case they're on top of it when it goes off
/datum/component/pellet_cloud/proc/grenade_dropped(obj/item/nade, mob/living/slick_willy)
@@ -303,7 +303,7 @@
/datum/component/pellet_cloud/proc/grenade_moved()
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/phantomthief.dm b/code/datums/components/phantomthief.dm
index a73754d04a..5f99edd5dc 100644
--- a/code/datums/components/phantomthief.dm
+++ b/code/datums/components/phantomthief.dm
@@ -3,7 +3,7 @@
/datum/component/wearertargeting/phantomthief
dupe_mode = COMPONENT_DUPE_ALLOWED
signals = list(COMSIG_LIVING_COMBAT_ENABLED, COMSIG_LIVING_COMBAT_DISABLED)
- proctype = .proc/handlefilterstuff
+ proctype = PROC_REF(handlefilterstuff)
var/filter_x
var/filter_y
var/filter_size
diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm
index 6592e41103..cebd7d4b0e 100644
--- a/code/datums/components/plumbing/_plumbing.dm
+++ b/code/datums/components/plumbing/_plumbing.dm
@@ -25,8 +25,8 @@
reagents = AM.reagents
turn_connects = _turn_connects
- 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_MOVABLE_MOVED,COMSIG_PARENT_PREQDELETED), PROC_REF(disable))
+ RegisterSignal(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), PROC_REF(toggle_active))
if(start)
enable()
diff --git a/code/datums/components/pricetag.dm b/code/datums/components/pricetag.dm
index 2ad63c6464..af3dfe05d1 100644
--- a/code/datums/components/pricetag.dm
+++ b/code/datums/components/pricetag.dm
@@ -12,10 +12,10 @@
payees[_owner] = _profit_ratio
else
payees[_owner] = default_profit_ratio
- RegisterSignal(parent, COMSIG_ITEM_SOLD, .proc/split_profit)
- RegisterSignal(parent, COMSIG_STRUCTURE_UNWRAPPED, .proc/Unwrapped)
- RegisterSignal(parent, COMSIG_ITEM_UNWRAPPED, .proc/Unwrapped)
- RegisterSignal(parent, COMSIG_ITEM_SPLIT_PROFIT, .proc/return_ratio)
+ RegisterSignal(parent, COMSIG_ITEM_SOLD, PROC_REF(split_profit))
+ RegisterSignal(parent, COMSIG_STRUCTURE_UNWRAPPED, PROC_REF(Unwrapped))
+ RegisterSignal(parent, COMSIG_ITEM_UNWRAPPED, PROC_REF(Unwrapped))
+ RegisterSignal(parent, COMSIG_ITEM_SPLIT_PROFIT, PROC_REF(return_ratio))
/datum/component/pricetag/proc/Unwrapped()
qdel(src) //Once it leaves it's wrapped container, the object in question should lose it's pricetag component.
diff --git a/code/datums/components/rad_insulation.dm b/code/datums/components/rad_insulation.dm
index 73d8c29440..546cfe8dc4 100644
--- a/code/datums/components/rad_insulation.dm
+++ b/code/datums/components/rad_insulation.dm
@@ -6,11 +6,11 @@
return COMPONENT_INCOMPATIBLE
if(protects) // Does this protect things in its contents from being affected?
- RegisterSignal(parent, COMSIG_ATOM_RAD_PROBE, .proc/rad_probe_react)
+ RegisterSignal(parent, COMSIG_ATOM_RAD_PROBE, PROC_REF(rad_probe_react))
if(contamination_proof) // Can this object be contaminated?
- RegisterSignal(parent, COMSIG_ATOM_RAD_CONTAMINATING, .proc/rad_contaminating)
+ RegisterSignal(parent, COMSIG_ATOM_RAD_CONTAMINATING, PROC_REF(rad_contaminating))
if(_amount != 1) // If it's 1 it wont have any impact on radiation passing through anyway
- RegisterSignal(parent, COMSIG_ATOM_RAD_WAVE_PASSING, .proc/rad_pass)
+ RegisterSignal(parent, COMSIG_ATOM_RAD_WAVE_PASSING, PROC_REF(rad_pass))
amount = _amount
diff --git a/code/datums/components/radioactive.dm b/code/datums/components/radioactive.dm
index f41396ad67..7670b5cffd 100644
--- a/code/datums/components/radioactive.dm
+++ b/code/datums/components/radioactive.dm
@@ -19,10 +19,10 @@
can_contaminate = _can_contaminate
if(istype(parent, /atom))
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/rad_examine)
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(rad_examine))
if(istype(parent, /obj/item))
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/rad_attack)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, .proc/rad_attack)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(rad_attack))
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(rad_attack))
else
CRASH("Something that wasn't an atom was given /datum/component/radioactive")
@@ -33,7 +33,7 @@
//This relies on parent not being a turf or something. IF YOU CHANGE THAT, CHANGE THIS
var/atom/movable/master = parent
master.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#39ff1430", "size" = 2))
- addtimer(CALLBACK(src, .proc/glow_loop, master), rand(1,19))//Things should look uneven
+ addtimer(CALLBACK(src, PROC_REF(glow_loop), master), rand(1,19))//Things should look uneven
START_PROCESSING(SSradiation, src)
@@ -52,7 +52,7 @@
return
strength -= strength / hl3_release_date
if(strength <= RAD_BACKGROUND_RADIATION)
- addtimer(CALLBACK(src, .proc/check_dissipate), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(check_dissipate)), 5 SECONDS)
return PROCESS_KILL
/datum/component/radioactive/proc/check_dissipate()
diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm
index b1d23ea3a8..8cfd8e45e0 100644
--- a/code/datums/components/remote_materials.dm
+++ b/code/datums/components/remote_materials.dm
@@ -25,11 +25,11 @@ handles linking back and forth.
src.allow_standalone = allow_standalone
after_insert = _after_insert
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy))
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.dm b/code/datums/components/riding.dm
index 49b8f7f7f0..d99258a2c7 100644
--- a/code/datums/components/riding.dm
+++ b/code/datums/components/riding.dm
@@ -25,9 +25,9 @@
/datum/component/riding/Initialize()
if(!ismovable(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/vehicle_mob_buckle)
- RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, .proc/vehicle_mob_unbuckle)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/vehicle_moved)
+ RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(vehicle_mob_buckle))
+ RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, PROC_REF(vehicle_mob_unbuckle))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(vehicle_moved))
/datum/component/riding/proc/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE)
var/atom/movable/AM = parent
@@ -188,7 +188,7 @@
to_chat(user, "You'll need the keys in one of your hands to [drive_verb] [AM].")
/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
@@ -210,7 +210,7 @@
/datum/component/riding/human/Initialize()
. = ..()
directional_vehicle_layers = list(TEXT_NORTH = MOB_LOWER_LAYER, TEXT_SOUTH = MOB_UPPER_LAYER, TEXT_EAST = MOB_UPPER_LAYER, TEXT_WEST = MOB_UPPER_LAYER)
- RegisterSignal(parent, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/on_host_unarmed_melee)
+ RegisterSignal(parent, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, PROC_REF(on_host_unarmed_melee))
/datum/component/riding/human/vehicle_mob_unbuckle(datum/source, mob/living/M, force = FALSE)
var/mob/living/carbon/human/H = parent
diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm
index 4b0e58df18..8eb37eabdf 100644
--- a/code/datums/components/rotation.dm
+++ b/code/datums/components/rotation.dm
@@ -40,11 +40,11 @@
/datum/component/simple_rotation/proc/add_signals()
if(rotation_flags & ROTATION_ALTCLICK)
- RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/HandRot)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/ExamineMessage)
+ RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(HandRot))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(ExamineMessage))
if(rotation_flags & ROTATION_WRENCH)
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/WrenchRot)
- RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(WrenchRot))
+ RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
/datum/component/simple_rotation/proc/add_verbs()
if(rotation_flags & ROTATION_VERBS)
diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm
index 79a84427f4..e7701f3db3 100644
--- a/code/datums/components/shielded.dm
+++ b/code/datums/components/shielded.dm
@@ -40,11 +40,11 @@
/datum/component/shielded/RegisterWithParent()
. = ..()
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 //it's a mob
var/mob/living/L = parent
- RegisterSignal(L, COMSIG_LIVING_RUN_BLOCK, .proc/living_block)
+ RegisterSignal(L, COMSIG_LIVING_RUN_BLOCK, PROC_REF(living_block))
holder = L
var/to_add = charges >= 1 ? shield_state : broken_state
if(to_add)
@@ -111,9 +111,9 @@
if(!(accepted_slots & slot))
return
holder = equipper
- RegisterSignal(parent, COMSIG_ITEM_RUN_BLOCK, .proc/on_run_block)
- RegisterSignal(parent, COMSIG_ITEM_CHECK_BLOCK, .proc/on_check_block)
- RegisterSignal(equipper, COMSIG_LIVING_GET_BLOCKING_ITEMS, .proc/include_shield)
+ RegisterSignal(parent, COMSIG_ITEM_RUN_BLOCK, PROC_REF(on_run_block))
+ RegisterSignal(parent, COMSIG_ITEM_CHECK_BLOCK, PROC_REF(on_check_block))
+ RegisterSignal(equipper, COMSIG_LIVING_GET_BLOCKING_ITEMS, PROC_REF(include_shield))
var/to_add = charges >= 1 ? shield_state : broken_state
if(to_add)
var/layer = (holder.layer > MOB_LAYER ? holder.layer : MOB_LAYER) + 0.01
diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm
index 7e263c4f30..9ab8f72502 100644
--- a/code/datums/components/slippery.dm
+++ b/code/datums/components/slippery.dm
@@ -7,7 +7,7 @@
intensity = max(_intensity, 0)
lube_flags = _lube_flags
callback = _callback
- RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED, COMSIG_ITEM_WEARERCROSSED), .proc/Slip)
+ RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ATOM_ENTERED, COMSIG_ITEM_WEARERCROSSED), PROC_REF(Slip))
/datum/component/slippery/proc/Slip(datum/source, atom/movable/AM)
var/mob/victim = AM
diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm
index 44fbf313cf..78b7f64677 100644
--- a/code/datums/components/spawner.dm
+++ b/code/datums/components/spawner.dm
@@ -21,8 +21,8 @@
if(_max_mobs)
max_mobs=_max_mobs
- RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/stop_spawning)
- RegisterSignal(parent, COMSIG_OBJ_ATTACK_GENERIC, .proc/on_attack_generic)
+ RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(stop_spawning))
+ RegisterSignal(parent, COMSIG_OBJ_ATTACK_GENERIC, PROC_REF(on_attack_generic))
START_PROCESSING(SSprocessing, src)
/datum/component/spawner/process()
diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm
index b74f71aaa5..90e1330209 100644
--- a/code/datums/components/spooky.dm
+++ b/code/datums/components/spooky.dm
@@ -2,7 +2,7 @@
var/too_spooky = TRUE //will it spawn a new instrument?
/datum/component/spooky/Initialize()
- RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/spectral_attack)
+ RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(spectral_attack))
/datum/component/spooky/proc/spectral_attack(datum/source, mob/living/carbon/C, mob/user)
if(ishuman(user)) //this weapon wasn't meant for mortals.
diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm
index 5462b35d53..289e171d5f 100644
--- a/code/datums/components/squeak.dm
+++ b/code/datums/components/squeak.dm
@@ -29,21 +29,21 @@
/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), .proc/play_squeak)
- RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ITEM_WEARERCROSSED), .proc/play_squeak_crossed)
- RegisterSignal(parent, COMSIG_CROSS_SQUEAKED, .proc/delay_squeak)
- RegisterSignal(parent, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react)
+ RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT), PROC_REF(play_squeak))
+ RegisterSignal(parent, list(COMSIG_MOVABLE_CROSSED, COMSIG_ITEM_WEARERCROSSED), PROC_REF(play_squeak_crossed))
+ RegisterSignal(parent, COMSIG_CROSS_SQUEAKED, PROC_REF(delay_squeak))
+ 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))
override_squeak_sounds = custom_sounds
if(chance_override)
@@ -127,7 +127,7 @@
last_squeak = world.time
/datum/component/squeak/proc/on_equip(datum/source, mob/equipper, slot)
- RegisterSignal(equipper, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react, TRUE)
+ RegisterSignal(equipper, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposing_react), TRUE)
/datum/component/squeak/proc/on_drop(datum/source, mob/user)
UnregisterSignal(user, COMSIG_MOVABLE_DISPOSING)
@@ -135,7 +135,7 @@
// Disposal pipes related shit
/datum/component/squeak/proc/disposing_react(datum/source, obj/structure/disposalholder/holder, obj/machinery/disposal/source)
//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 fbf6b65893..3337cf8217 100644
--- a/code/datums/components/stationloving.dm
+++ b/code/datums/components/stationloving.dm
@@ -7,10 +7,10 @@
/datum/component/stationloving/Initialize(inform_admins = FALSE, allow_death = FALSE)
if(!ismovable(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, list(COMSIG_MOVABLE_Z_CHANGED), .proc/check_in_bounds)
- RegisterSignal(parent, list(COMSIG_MOVABLE_SECLUDED_LOCATION), .proc/relocate)
- RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED), .proc/check_deletion)
- RegisterSignal(parent, list(COMSIG_ITEM_IMBUE_SOUL), .proc/check_soul_imbue)
+ RegisterSignal(parent, list(COMSIG_MOVABLE_Z_CHANGED), PROC_REF(check_in_bounds))
+ RegisterSignal(parent, list(COMSIG_MOVABLE_SECLUDED_LOCATION), PROC_REF(relocate))
+ RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED), PROC_REF(check_deletion))
+ RegisterSignal(parent, list(COMSIG_ITEM_IMBUE_SOUL), PROC_REF(check_soul_imbue))
src.inform_admins = inform_admins
src.allow_death = allow_death
check_in_bounds() // Just in case something is being created outside of station/centcom
diff --git a/code/datums/components/storage/concrete/_concrete.dm b/code/datums/components/storage/concrete/_concrete.dm
index 6f08959dd2..e81c701e37 100644
--- a/code/datums/components/storage/concrete/_concrete.dm
+++ b/code/datums/components/storage/concrete/_concrete.dm
@@ -17,9 +17,9 @@
/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_OBJ_BREAK, .proc/on_break)
+ RegisterSignal(parent, COMSIG_ATOM_CONTENTS_DEL, PROC_REF(on_contents_del))
+ RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_deconstruct))
+ RegisterSignal(parent, COMSIG_OBJ_BREAK, PROC_REF(on_break))
/datum/component/storage/concrete/Destroy()
var/atom/real_location = real_location()
diff --git a/code/datums/components/storage/concrete/emergency.dm b/code/datums/components/storage/concrete/emergency.dm
index faaeada13d..1aa152a69c 100644
--- a/code/datums/components/storage/concrete/emergency.dm
+++ b/code/datums/components/storage/concrete/emergency.dm
@@ -5,7 +5,7 @@
/datum/component/storage/concrete/emergency/Initialize()
. = ..()
- RegisterSignal(parent, COMSIG_ATOM_EMAG_ACT, .proc/unlock_me)
+ RegisterSignal(parent, COMSIG_ATOM_EMAG_ACT, PROC_REF(unlock_me))
/datum/component/storage/concrete/emergency/on_attack_hand(datum/source, mob/user)
var/atom/A = parent
diff --git a/code/datums/components/storage/concrete/rped.dm b/code/datums/components/storage/concrete/rped.dm
index bf96ae436f..47549be565 100644
--- a/code/datums/components/storage/concrete/rped.dm
+++ b/code/datums/components/storage/concrete/rped.dm
@@ -37,7 +37,7 @@
to_chat(M, "You start dumping out tier/cell rating [lowest_rating] parts from [parent].")
var/turf/T = get_turf(A)
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, TRUE, M)))
+ while (do_after(M, 1 SECONDS, T, NONE, FALSE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things, progress, TRUE, M)))
stoplag(1)
progress.end_progress()
A.do_squish(0.8, 1.2)
@@ -81,7 +81,7 @@
to_chat(M, "You start dumping out tier/cell rating [lowest_rating] parts from [parent].")
var/turf/T = get_turf(A)
var/datum/progressbar/progress = new(M, length(things), T)
- while (do_after(M, 10, T, NONE, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress, TRUE, M)))
+ while (do_after(M, 10, T, NONE, FALSE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things, progress, TRUE, M)))
stoplag(1)
progress.end_progress()
A.do_squish(0.8, 1.2)
diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm
index 76c5830765..7e66ad071d 100644
--- a/code/datums/components/storage/storage.dm
+++ b/code/datums/components/storage/storage.dm
@@ -76,40 +76,40 @@
if(master)
change_master(master)
- 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_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_PARENT_ATTACKBY, .proc/attackby)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(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_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/preattack_intercept)
- RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/attack_self)
- RegisterSignal(parent, COMSIG_ITEM_PICKUP, .proc/signal_on_pickup)
+ 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))
- RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/close_all)
- RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/check_views)
+ RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(close_all))
+ RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(check_views))
- RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_alt_click)
- RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, .proc/mousedrop_onto)
- RegisterSignal(parent, COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_receive)
+ RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_alt_click))
+ RegisterSignal(parent, COMSIG_MOUSEDROP_ONTO, PROC_REF(mousedrop_onto))
+ RegisterSignal(parent, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive))
update_actions()
@@ -134,7 +134,7 @@
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.obj_flags & IN_INVENTORY)
var/mob/M = I.loc
if(!istype(M))
@@ -213,7 +213,7 @@
return
var/datum/progressbar/progress = new(M, len, I.loc)
var/list/rejections = list()
- while(do_after(M, 1 SECONDS, parent, NONE, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, I.loc, rejections, progress)))
+ while(do_after(M, 1 SECONDS, parent, NONE, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), things, I.loc, rejections, progress)))
stoplag(1)
progress.end_progress()
to_chat(M, "You put everything you could [insert_preposition] [parent].")
@@ -271,7 +271,7 @@
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, TRUE, M)))
+ while(do_after(M, 1 SECONDS, T, NONE, FALSE, CALLBACK(src, PROC_REF(mass_remove_from_storage), T, things, progress, TRUE, M)))
stoplag(1)
progress.end_progress()
A.do_squish(0.8, 1.2)
@@ -436,7 +436,7 @@
if(over_object == M)
user_show_to_mob(M, trigger_on_found = TRUE)
if(isrevenant(M))
- INVOKE_ASYNC(GLOBAL_PROC, .proc/RevenantThrow, over_object, M, source)
+ INVOKE_ASYNC(GLOBAL_PROC, PROC_REF(RevenantThrow), over_object, M, source)
return
if(check_locked(null, M) || !M.CanReach(A))
return
@@ -444,7 +444,7 @@
A.do_jiggle()
A.add_fingerprint(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
diff --git a/code/datums/components/storage/ui.dm b/code/datums/components/storage/ui.dm
index 4d61d569c3..c0cc03965c 100644
--- a/code/datums/components/storage/ui.dm
+++ b/code/datums/components/storage/ui.dm
@@ -11,7 +11,7 @@
else
var/datum/numbered_display/ND = .[I.type]
ND.number++
- . = sortTim(., /proc/cmp_numbered_displays_name_asc, associative = TRUE)
+ . = sortTim(., GLOBAL_PROC_REF(cmp_numbered_displays_name_asc), associative = TRUE)
/**
* Orients all objects in legacy mode, and returns the objects to show to the user.
@@ -194,8 +194,8 @@
// in tiles
var/maxallowedscreensize = cview[1]-8
// we got screen size, register signal
- RegisterSignal(M, COMSIG_MOB_CLIENT_LOGOUT, .proc/on_logout, override = TRUE)
- RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/on_logout, override = TRUE)
+ RegisterSignal(M, COMSIG_MOB_CLIENT_LOGOUT, PROC_REF(on_logout), override = TRUE)
+ RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(on_logout), override = TRUE)
if(M.active_storage != src)
if(M.active_storage)
M.active_storage.ui_hide(M)
diff --git a/code/datums/components/summoning.dm b/code/datums/components/summoning.dm
index ffb4309c1c..0394a1abaf 100644
--- a/code/datums/components/summoning.dm
+++ b/code/datums/components/summoning.dm
@@ -26,11 +26,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_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+ RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget))
/datum/component/summoning/UnregisterFromParent()
. = ..()
@@ -63,7 +63,7 @@
spawned_mobs += L
if(faction != null)
L.faction = faction
- RegisterSignal(L, COMSIG_MOB_DEATH, .proc/on_spawned_death) // so we can remove them from the list, etc (for mobs with corpses)
+ RegisterSignal(L, COMSIG_MOB_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, 1)
spawn_location.visible_message("[L] [spawn_text].")
diff --git a/code/datums/components/swarming.dm b/code/datums/components/swarming.dm
index 76179a82e8..21e61b9445 100644
--- a/code/datums/components/swarming.dm
+++ b/code/datums/components/swarming.dm
@@ -8,8 +8,8 @@
offset_x = rand(-max_x, max_x)
offset_y = rand(-max_y, max_y)
- RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, .proc/join_swarm)
- RegisterSignal(parent, COMSIG_MOVABLE_UNCROSSED, .proc/leave_swarm)
+ RegisterSignal(parent, COMSIG_MOVABLE_CROSSED, PROC_REF(join_swarm))
+ RegisterSignal(parent, COMSIG_MOVABLE_UNCROSSED, PROC_REF(leave_swarm))
/datum/component/swarming/Destroy()
if(is_swarming)
diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm
index eef4e3c409..1c3a10a2dd 100644
--- a/code/datums/components/tackle.dm
+++ b/code/datums/components/tackle.dm
@@ -43,7 +43,7 @@
var/mob/living/carbon/P = parent
to_chat(P, "You are now able to launch tackles! You can do so by activating throw intent, and clicking on your target with an empty hand.")
P.tackling = TRUE
- 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/living/carbon/P = parent
@@ -52,9 +52,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))
@@ -105,7 +105,7 @@
return
user.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 = iscatperson(user) ? "pounce" : "leap" ///If cat, "pounce" instead of "leap".
@@ -121,7 +121,7 @@
user.adjustStaminaLoss(stamina_cost)
user.throw_at(A, range, speed, user, FALSE)
user.toggle_throw_mode()
- addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE)
+ addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE)
return(COMSIG_MOB_CANCEL_CLICKON)
/**
diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm
index 251272ac2e..ae44050443 100644
--- a/code/datums/components/thermite.dm
+++ b/code/datums/components/thermite.dm
@@ -34,9 +34,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/Destroy()
var/turf/master = parent
diff --git a/code/datums/components/twitch_plays.dm b/code/datums/components/twitch_plays.dm
index a04592e1af..8577fc2a7a 100644
--- a/code/datums/components/twitch_plays.dm
+++ b/code/datums/components/twitch_plays.dm
@@ -9,8 +9,8 @@
. = ..()
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, .proc/on_start_orbit)
- RegisterSignal(parent, COMSIG_ATOM_ORBIT_END, .proc/on_end_orbit)
+ RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, PROC_REF(on_start_orbit))
+ RegisterSignal(parent, COMSIG_ATOM_ORBIT_END, PROC_REF(on_end_orbit))
/datum/component/twitch_plays/Destroy(force, silent)
for(var/i in players)
@@ -29,7 +29,7 @@
/datum/component/twitch_plays/proc/AttachPlayer(mob/dead/observer)
players |= observer
- RegisterSignal(observer, COMSIG_PARENT_QDELETING, .proc/on_end_orbit)
+ RegisterSignal(observer, COMSIG_PARENT_QDELETING, PROC_REF(on_end_orbit))
/datum/component/twitch_plays/proc/DetachPlayer(mob/dead/observer)
players -= observer
@@ -46,11 +46,11 @@
. = ..()
if(. & COMPONENT_INCOMPATIBLE)
return
- RegisterSignal(parent, COMSIG_TWITCH_PLAYS_MOVEMENT_DATA, .proc/fetch_data)
+ RegisterSignal(parent, COMSIG_TWITCH_PLAYS_MOVEMENT_DATA, PROC_REF(fetch_data))
/datum/component/twitch_plays/simple_movement/AttachPlayer(mob/dead/observer)
. = ..()
- RegisterSignal(observer, COMSIG_MOVABLE_PRE_MOVE, .proc/pre_move)
+ RegisterSignal(observer, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move))
/datum/component/twitch_plays/simple_movement/DetachPlayer(mob/dead/observer)
. = ..()
diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm
index f451241fb4..d7f76e7b3f 100644
--- a/code/datums/components/twohanded.dm
+++ b/code/datums/components/twohanded.dm
@@ -69,13 +69,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()
@@ -141,7 +141,7 @@
if(SEND_SIGNAL(parent, COMSIG_TWOHANDED_WIELD, user) & COMPONENT_TWOHANDED_BLOCK_WIELD)
return // blocked wield from item
wielded = TRUE
- 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
@@ -168,7 +168,7 @@
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_ITEM_DROPPED, PROC_REF(on_drop))
user.put_in_inactive_hand(offhand_item)
/**
diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm
index c0ec25dfc2..6ae10d149b 100644
--- a/code/datums/components/uplink.dm
+++ b/code/datums/components/uplink.dm
@@ -36,20 +36,20 @@ GLOBAL_LIST_EMPTY(uplinks)
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))
GLOB.uplinks |= src
@@ -145,7 +145,7 @@ GLOBAL_LIST_EMPTY(uplinks)
active = TRUE
update_items()
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_NO_INTERACT
diff --git a/code/datums/components/virtual_reality.dm b/code/datums/components/virtual_reality.dm
index c0e6e9dba6..b111c6dbee 100644
--- a/code/datums/components/virtual_reality.dm
+++ b/code/datums/components/virtual_reality.dm
@@ -50,12 +50,12 @@
if(!quit_action)
quit_action = new
quit_action.Grant(M)
- RegisterSignal(quit_action, COMSIG_ACTION_TRIGGER, .proc/action_trigger)
- RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), .proc/game_over)
- RegisterSignal(M, COMSIG_MOB_GHOSTIZE, .proc/be_a_quitter)
- RegisterSignal(M, COMSIG_MOB_KEY_CHANGE, .proc/on_player_transfer)
- RegisterSignal(current_mind, COMSIG_MIND_TRANSFER, .proc/on_player_transfer)
- RegisterSignal(current_mind, COMSIG_PRE_MIND_TRANSFER, .proc/pre_player_transfer)
+ RegisterSignal(quit_action, COMSIG_ACTION_TRIGGER, PROC_REF(action_trigger))
+ RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), PROC_REF(game_over))
+ RegisterSignal(M, COMSIG_MOB_GHOSTIZE, PROC_REF(be_a_quitter))
+ RegisterSignal(M, COMSIG_MOB_KEY_CHANGE, PROC_REF(on_player_transfer))
+ RegisterSignal(current_mind, COMSIG_MIND_TRANSFER, PROC_REF(on_player_transfer))
+ RegisterSignal(current_mind, COMSIG_PRE_MIND_TRANSFER, PROC_REF(pre_player_transfer))
if(mastermind?.current)
mastermind.current.audiovisual_redirect = M
ADD_TRAIT(M, TRAIT_NO_MIDROUND_ANTAG, VIRTUAL_REALITY_TRAIT)
@@ -87,9 +87,9 @@
mastermind = M.mind
mastermind.current.audiovisual_redirect = parent
M.transfer_ckey(vr_M, FALSE)
- RegisterSignal(mastermind, COMSIG_PRE_MIND_TRANSFER, .proc/switch_player)
- RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), .proc/game_over)
- RegisterSignal(M, COMSIG_MOB_PRE_PLAYER_CHANGE, .proc/player_hijacked)
+ RegisterSignal(mastermind, COMSIG_PRE_MIND_TRANSFER, PROC_REF(switch_player))
+ RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), PROC_REF(game_over))
+ RegisterSignal(M, COMSIG_MOB_PRE_PLAYER_CHANGE, PROC_REF(player_hijacked))
SStgui.close_user_uis(vr_M, src)
session_paused = FALSE
return TRUE
@@ -114,8 +114,8 @@
quit()
return COMPONENT_STOP_MIND_TRANSFER
UnregisterSignal(old_mob, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING, COMSIG_MOB_PRE_PLAYER_CHANGE))
- RegisterSignal(new_mob, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), .proc/game_over)
- RegisterSignal(new_mob, COMSIG_MOB_PRE_PLAYER_CHANGE, .proc/player_hijacked)
+ RegisterSignal(new_mob, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING), PROC_REF(game_over))
+ RegisterSignal(new_mob, COMSIG_MOB_PRE_PLAYER_CHANGE, PROC_REF(player_hijacked))
old_mob.audiovisual_redirect = null
new_mob.audiovisual_redirect = parent
diff --git a/code/datums/components/waddling.dm b/code/datums/components/waddling.dm
index 7b94a14285..64833aeb70 100644
--- a/code/datums/components/waddling.dm
+++ b/code/datums/components/waddling.dm
@@ -4,7 +4,7 @@
/datum/component/waddling/Initialize()
if(!isliving(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), .proc/Waddle)
+ RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED), PROC_REF(Waddle))
/datum/component/waddling/proc/Waddle()
var/mob/living/L = parent
diff --git a/code/datums/components/wearertargeting.dm b/code/datums/components/wearertargeting.dm
index 4760757701..dbf06ea22f 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)
if((slot in valid_slots) && istype(equipper, mobtype))
diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm
index e2c3cbff86..0521fc8443 100644
--- a/code/datums/components/wet_floor.dm
+++ b/code/datums/components/wet_floor.dm
@@ -29,13 +29,13 @@
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()
. = ..()
@@ -96,7 +96,7 @@
qdel(parent.GetComponent(/datum/component/slippery))
return
- var/datum/component/slippery/S = parent.LoadComponent(/datum/component/slippery, NONE, CALLBACK(src, .proc/AfterSlip))
+ var/datum/component/slippery/S = parent.LoadComponent(/datum/component/slippery, NONE, CALLBACK(src, PROC_REF(AfterSlip)))
S.intensity = intensity
S.lube_flags = lube_flags
diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm
index 627216aace..5aabf1e427 100644
--- a/code/datums/dash_weapon.dm
+++ b/code/datums/dash_weapon.dm
@@ -43,7 +43,7 @@
spot1.Beam(spot2,beam_effect,time=20)
current_charges--
holder.update_action_buttons_icon()
- addtimer(CALLBACK(src, .proc/charge), charge_rate)
+ addtimer(CALLBACK(src, PROC_REF(charge)), charge_rate)
/datum/action/innate/dash/proc/charge()
current_charges = clamp(current_charges + 1, 0, max_charges)
diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm
index 1ca07bf502..0ff1e8229b 100644
--- a/code/datums/diseases/advance/advance.dm
+++ b/code/datums/diseases/advance/advance.dm
@@ -98,7 +98,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())
diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm
index cf15ec407a..e79e89ce15 100644
--- a/code/datums/diseases/advance/symptoms/cough.dm
+++ b/code/datums/diseases/advance/symptoms/cough.dm
@@ -68,9 +68,9 @@ BONUS
to_chat(M, "[pick("You have a coughing fit!", "You can't stop coughing!")]")
M.Stun(20)
M.emote("cough")
- 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)
if(infective && M.CanSpreadAirborneDisease())
A.spread(1)
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index 0b4b3ef2dd..22af76c1f9 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -266,7 +266,7 @@
if(M.getBruteLoss() + M.getFireLoss() >= 70 && !active_coma)
to_chat(M, "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)
if(HAS_TRAIT(M, TRAIT_DEATHCOMA))
return power
else if(M.stat == SOFT_CRIT)
@@ -282,7 +282,7 @@
M.fakedeath("regenerative_coma", TRUE)
M.update_stat()
M.update_mobility()
- addtimer(CALLBACK(src, .proc/uncoma, M), 300)
+ addtimer(CALLBACK(src, PROC_REF(uncoma), M), 300)
/datum/symptom/heal/coma/proc/uncoma(mob/living/M)
if(!active_coma)
diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm
index 58357f04e2..f2944549aa 100644
--- a/code/datums/diseases/advance/symptoms/shedding.dm
+++ b/code/datums/diseases/advance/symptoms/shedding.dm
@@ -40,11 +40,11 @@ BONUS
if(3, 4)
if(!(H.hair_style == "Bald") && !(H.hair_style == "Balding Hair"))
to_chat(H, "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_hair_style == "Shaved") || !(H.hair_style == "Bald"))
to_chat(H, "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 b323399906..15901dad4f 100644
--- a/code/datums/diseases/pierrot_throat.dm
+++ b/code/datums/diseases/pierrot_throat.dm
@@ -28,7 +28,7 @@
affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) , forced = "pierrot's throat")
/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)
var/message = speech_args[SPEECH_MESSAGE]
diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm
index 38ae5b3a99..a77a519909 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/Detach, override = TRUE)
+ RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(Detach), override = TRUE)
/// Deactivates the functionality defines by the element on the given datum
/datum/element/proc/Detach(datum/source, force)
diff --git a/code/datums/elements/art.dm b/code/datums/elements/art.dm
index 47908a2e2d..189c495ab2 100644
--- a/code/datums/elements/art.dm
+++ b/code/datums/elements/art.dm
@@ -14,13 +14,13 @@
return ELEMENT_INCOMPATIBLE
impressiveness = impress
if(isobj(target))
- RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_obj_examine)
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_obj_examine))
if(isstructure(target))
- RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand)
+ RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand))
if(isitem(target))
- RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, .proc/apply_moodlet)
+ RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(apply_moodlet))
else
- RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_other_examine)
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_other_examine))
/datum/element/art/Detach(datum/target)
UnregisterSignal(target, list(COMSIG_PARENT_EXAMINE, COMSIG_ATOM_ATTACK_HAND, COMSIG_ITEM_ATTACK_SELF))
diff --git a/code/datums/elements/beauty.dm b/code/datums/elements/beauty.dm
index 8895026967..fde54465fa 100644
--- a/code/datums/elements/beauty.dm
+++ b/code/datums/elements/beauty.dm
@@ -10,8 +10,8 @@
beauty = beautyamount
if(ismovable(target))
- RegisterSignal(target, COMSIG_ENTER_AREA, .proc/enter_area)
- RegisterSignal(target, COMSIG_EXIT_AREA, .proc/exit_area)
+ RegisterSignal(target, COMSIG_ENTER_AREA, PROC_REF(enter_area))
+ RegisterSignal(target, COMSIG_EXIT_AREA, PROC_REF(exit_area))
var/area/A = get_area(target)
if(A)
diff --git a/code/datums/elements/bed_tucking.dm b/code/datums/elements/bed_tucking.dm
index 4a498b2ed8..500528fbef 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/bsa_blocker.dm b/code/datums/elements/bsa_blocker.dm
index 61140ad0ed..e33338650b 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/cleaning.dm b/code/datums/elements/cleaning.dm
index d7d8e66179..fd48f582dd 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/connect_loc.dm b/code/datums/elements/connect_loc.dm
index fee9072f75..12fa35ea3f 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/decal.dm b/code/datums/elements/decal.dm
index a20d46c813..c3f9f1bd17 100644
--- a/code/datums/elements/decal.dm
+++ b/code/datums/elements/decal.dm
@@ -27,12 +27,12 @@
if(!num_decals_per_atom[A])
if(first_dir)
- RegisterSignal(A, COMSIG_ATOM_DIR_CHANGE, .proc/rotate_react)
+ RegisterSignal(A, COMSIG_ATOM_DIR_CHANGE, PROC_REF(rotate_react))
if(cleanable)
- RegisterSignal(A, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react)
+ RegisterSignal(A, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react))
if(description)
- RegisterSignal(A, COMSIG_PARENT_EXAMINE, .proc/examine)
- RegisterSignal(A, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_overlay, TRUE)
+ RegisterSignal(A, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
+ RegisterSignal(A, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlay), TRUE)
num_decals_per_atom[A]++
apply(A)
@@ -51,9 +51,9 @@
if(target.flags_1 & INITIALIZED_1)
target.update_icon() //could use some queuing here now maybe.
else if(!QDELETED(target) && num_decals_per_atom[target] == 1)
- RegisterSignal(target, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE, .proc/late_update_icon)
+ RegisterSignal(target, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE, PROC_REF(late_update_icon))
if(isitem(target))
- addtimer(CALLBACK(target, /obj/item/.proc/update_slot_icon), 0, TIMER_UNIQUE)
+ addtimer(CALLBACK(target, TYPE_PROC_REF(/obj/item, update_slot_icon)), 0, TIMER_UNIQUE)
/datum/element/decal/proc/late_update_icon(atom/source)
source.update_icon()
diff --git a/code/datums/elements/dusts_on_leaving_area.dm b/code/datums/elements/dusts_on_leaving_area.dm
index 7b1807a15c..2e2aba2506 100644
--- a/code/datums/elements/dusts_on_leaving_area.dm
+++ b/code/datums/elements/dusts_on_leaving_area.dm
@@ -8,7 +8,7 @@
if(!ismob(target))
return ELEMENT_INCOMPATIBLE
area_types = types
- RegisterSignal(target,COMSIG_ENTER_AREA,.proc/check_dust)
+ RegisterSignal(target,COMSIG_ENTER_AREA,PROC_REF(check_dust))
/datum/element/dusts_on_leaving_area/Detach(mob/M)
. = ..()
diff --git a/code/datums/elements/dwarfism.dm b/code/datums/elements/dwarfism.dm
index f07481cc5e..c39990f284 100644
--- a/code/datums/elements/dwarfism.dm
+++ b/code/datums/elements/dwarfism.dm
@@ -23,7 +23,7 @@
L.transform = L.transform.Scale(1, SHORT)
L.transform = L.transform.Translate(0, 16*(SHORT-1)) //Makes sure you stand on the tile no matter the size - sand
attached_targets[target] = comsig_target
- RegisterSignal(target, comsig, .proc/check_loss) //Second arg of the signal will be checked against the comsig_target.
+ RegisterSignal(target, comsig, PROC_REF(check_loss)) //Second arg of the signal will be checked against the comsig_target.
/datum/element/dwarfism/proc/check_loss(mob/living/L, comsig_target)
if(attached_targets[L] == comsig_target)
diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm
index 04f51e6e28..0436834f6d 100644
--- a/code/datums/elements/earhealing.dm
+++ b/code/datums/elements/earhealing.dm
@@ -11,7 +11,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/embed.dm b/code/datums/elements/embed.dm
index 66c11e3668..c827ee05e3 100644
--- a/code/datums/elements/embed.dm
+++ b/code/datums/elements/embed.dm
@@ -37,13 +37,13 @@
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/checkEmbedMob)
- RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/checkEmbedOther)
- 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(checkEmbedMob))
+ RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(checkEmbedOther))
+ 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
@@ -60,7 +60,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 c24914decb..bf36d6d432 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/firestacker.dm b/code/datums/elements/firestacker.dm
index 771812242f..8124a4a34b 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, force)
. = ..()
diff --git a/code/datums/elements/flavor_text.dm b/code/datums/elements/flavor_text.dm
index 43b7766ad7..56903c60ac 100644
--- a/code/datums/elements/flavor_text.dm
+++ b/code/datums/elements/flavor_text.dm
@@ -36,7 +36,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
save_key = _save_key
examine_no_preview = _examine_no_preview
- RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/show_flavor)
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(show_flavor))
if(can_edit && ismob(target)) //but only mobs receive the proc/verb for the time being
var/mob/M = target
@@ -46,10 +46,10 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
if(!save_key)
return
if(ishuman(target))
- RegisterSignal(target, COMSIG_HUMAN_PREFS_COPIED_TO, .proc/update_prefs_flavor_text)
+ RegisterSignal(target, COMSIG_HUMAN_PREFS_COPIED_TO, PROC_REF(update_prefs_flavor_text))
else if(iscyborg(target))
- RegisterSignal(target, COMSIG_MOB_ON_NEW_MIND, .proc/borged_update_flavor_text)
- RegisterSignal(target, COMSIG_MOB_CLIENT_JOINED_FROM_LOBBY, .proc/borged_update_flavor_text)
+ RegisterSignal(target, COMSIG_MOB_ON_NEW_MIND, PROC_REF(borged_update_flavor_text))
+ RegisterSignal(target, COMSIG_MOB_CLIENT_JOINED_FROM_LOBBY, PROC_REF(borged_update_flavor_text))
/datum/element/flavor_text/Detach(atom/A)
. = ..()
@@ -246,11 +246,11 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
. = ..()
if(. == ELEMENT_INCOMPATIBLE)
return
- RegisterSignal(target, COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, .proc/update_dna_flavor_text)
- RegisterSignal(target, COMSIG_MOB_ANTAG_ON_GAIN, .proc/on_antag_gain)
+ RegisterSignal(target, COMSIG_CARBON_IDENTITY_TRANSFERRED_TO, PROC_REF(update_dna_flavor_text))
+ RegisterSignal(target, COMSIG_MOB_ANTAG_ON_GAIN, PROC_REF(on_antag_gain))
if(ishuman(target))
- RegisterSignal(target, COMSIG_HUMAN_HARDSET_DNA, .proc/update_dna_flavor_text)
- RegisterSignal(target, COMSIG_HUMAN_ON_RANDOMIZE, .proc/unset_flavor)
+ RegisterSignal(target, COMSIG_HUMAN_HARDSET_DNA, PROC_REF(update_dna_flavor_text))
+ RegisterSignal(target, COMSIG_HUMAN_ON_RANDOMIZE, PROC_REF(unset_flavor))
/datum/element/flavor_text/carbon/Detach(mob/living/carbon/C)
. = ..()
diff --git a/code/datums/elements/forced_gravity.dm b/code/datums/elements/forced_gravity.dm
index 0b50df5b21..23dd79f443 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, force)
. = ..()
diff --git a/code/datums/elements/ghost_role_eligibility.dm b/code/datums/elements/ghost_role_eligibility.dm
index 4e7884efe4..50c75c0b61 100644
--- a/code/datums/elements/ghost_role_eligibility.dm
+++ b/code/datums/elements/ghost_role_eligibility.dm
@@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(client_ghost_timeouts)
var/mob/M = target
if(!(M in GLOB.ghost_eligible_mobs))
GLOB.ghost_eligible_mobs += M
- RegisterSignal(M, COMSIG_MOB_GHOSTIZE, .proc/get_ghost_flags)
+ RegisterSignal(M, COMSIG_MOB_GHOSTIZE, PROC_REF(get_ghost_flags))
/datum/element/ghost_role_eligibility/Detach(mob/M)
. = ..()
diff --git a/code/datums/elements/mob_holder.dm b/code/datums/elements/mob_holder.dm
index 341e6ca6a0..2e45cb9656 100644
--- a/code/datums/elements/mob_holder.dm
+++ b/code/datums/elements/mob_holder.dm
@@ -23,10 +23,10 @@
src.proctype = proctype
src.escape_on_find = escape_on_find
- RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item)
- RegisterSignal(target, COMSIG_CLICK_ALT, .proc/mob_try_pickup)
- RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine)
- RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item, TRUE)
+ RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
+ RegisterSignal(target, COMSIG_CLICK_ALT, PROC_REF(mob_try_pickup))
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item), TRUE)
/datum/element/mob_holder/Detach(datum/source, force)
. = ..()
diff --git a/code/datums/elements/object_reskinning.dm b/code/datums/elements/object_reskinning.dm
index 2d994a04d0..468e681e5f 100644
--- a/code/datums/elements/object_reskinning.dm
+++ b/code/datums/elements/object_reskinning.dm
@@ -26,9 +26,9 @@
message_admins("[src] was given to an object without any unique reskins, if you really need to, give it a couple skins first.")
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine)
- RegisterSignal(target, target.reskin_binding, .proc/reskin)
- RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item)
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(target, target.reskin_binding, PROC_REF(reskin))
+ RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item))
/datum/element/object_reskinning/Detach(obj/source, force)
UnregisterSignal(source, list(COMSIG_PARENT_EXAMINE, source.reskin_binding, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM))
@@ -68,7 +68,7 @@
items = sort_list(items)
// Display to the user
- var/pick = show_radial_menu(user, to_reskin, items, custom_check = CALLBACK(src, .proc/check_reskin_menu, user, to_reskin), radius = 38, require_near = TRUE)
+ var/pick = show_radial_menu(user, to_reskin, items, custom_check = CALLBACK(src, PROC_REF(check_reskin_menu), user, to_reskin), radius = 38, require_near = TRUE)
if(!pick)
return FALSE
diff --git a/code/datums/elements/polychromic.dm b/code/datums/elements/polychromic.dm
index 2649a8ee6f..2027aa658b 100644
--- a/code/datums/elements/polychromic.dm
+++ b/code/datums/elements/polychromic.dm
@@ -38,11 +38,11 @@
L += make_appearances ? mutable_appearance(mut_icon, overlays_states[I], color = col) : col
colors_by_atom[A] = L
- RegisterSignal(A, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_overlays)
+ RegisterSignal(A, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlays))
if(_flags & POLYCHROMIC_ALTCLICK)
- RegisterSignal(A, COMSIG_PARENT_EXAMINE, .proc/on_examine)
- RegisterSignal(A, COMSIG_CLICK_ALT, .proc/set_color)
+ RegisterSignal(A, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(A, COMSIG_CLICK_ALT, PROC_REF(set_color))
if(!overlays_names && names) //generate
overlays_names = names
@@ -55,16 +55,16 @@
if(isitem(A))
if(_flags & POLYCHROMIC_ACTION)
- RegisterSignal(A, COMSIG_ITEM_EQUIPPED, .proc/grant_user_action)
- RegisterSignal(A, COMSIG_ITEM_DROPPED, .proc/remove_user_action)
+ RegisterSignal(A, COMSIG_ITEM_EQUIPPED, PROC_REF(grant_user_action))
+ RegisterSignal(A, COMSIG_ITEM_DROPPED, PROC_REF(remove_user_action))
if(!(_flags & POLYCHROMIC_NO_WORN) || !(_flags & POLYCHROMIC_NO_HELD))
A.AddElement(/datum/element/update_icon_updates_onmob)
- RegisterSignal(A, COMSIG_ITEM_WORN_OVERLAYS, .proc/apply_worn_overlays)
+ RegisterSignal(A, COMSIG_ITEM_WORN_OVERLAYS, PROC_REF(apply_worn_overlays))
if(suits_with_helmet_typecache[A.type])
- RegisterSignal(A, COMSIG_SUIT_MADE_HELMET, .proc/register_helmet) //you better work now you slut
+ RegisterSignal(A, COMSIG_SUIT_MADE_HELMET, PROC_REF(register_helmet)) //you better work now you slut
else if(_flags & POLYCHROMIC_ACTION && ismob(A)) //in the event mob update icon procs are ever standarized.
var/datum/action/polychromic/P = new(A)
- RegisterSignal(P, COMSIG_ACTION_TRIGGER, .proc/activate_action)
+ RegisterSignal(P, COMSIG_ACTION_TRIGGER, PROC_REF(activate_action))
actions_by_atom[A] = P
P.Grant(A)
@@ -152,7 +152,7 @@
P.name = "Modify [source]'\s Colors"
actions_by_atom[source] = P
P.check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUN|AB_CHECK_CONSCIOUS
- RegisterSignal(P, COMSIG_ACTION_TRIGGER, .proc/activate_action)
+ RegisterSignal(P, COMSIG_ACTION_TRIGGER, PROC_REF(activate_action))
P.Grant(user)
/datum/element/polychromic/proc/remove_user_action(atom/source, mob/user)
@@ -187,9 +187,9 @@
suit_by_helmet[H] = source
helmet_by_suit[source] = H
colors_by_atom[H] = colors_by_atom[source]
- RegisterSignal(H, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_overlays)
- RegisterSignal(H, COMSIG_ITEM_WORN_OVERLAYS, .proc/apply_worn_overlays)
- RegisterSignal(H, COMSIG_PARENT_QDELETING, .proc/unregister_helmet)
+ RegisterSignal(H, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlays))
+ RegisterSignal(H, COMSIG_ITEM_WORN_OVERLAYS, PROC_REF(apply_worn_overlays))
+ RegisterSignal(H, COMSIG_PARENT_QDELETING, PROC_REF(unregister_helmet))
/datum/element/polychromic/proc/unregister_helmet(atom/source)
var/obj/item/clothing/suit/S = suit_by_helmet[source]
diff --git a/code/datums/elements/scavenging.dm b/code/datums/elements/scavenging.dm
index e6e3279a6b..1963036b1e 100644
--- a/code/datums/elements/scavenging.dm
+++ b/code/datums/elements/scavenging.dm
@@ -47,10 +47,10 @@
loot_restriction = restriction
maximum_loot_per_player = max_per_player
if(can_use_hands)
- RegisterSignal(target, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW), .proc/scavenge_barehanded)
+ RegisterSignal(target, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW), PROC_REF(scavenge_barehanded))
if(tool_types)
- RegisterSignal(target, COMSIG_PARENT_ATTACKBY, .proc/scavenge_tool)
- RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine)
+ RegisterSignal(target, COMSIG_PARENT_ATTACKBY, PROC_REF(scavenge_tool))
+ RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
/datum/element/scavenging/Detach(atom/target)
. = ..()
@@ -98,7 +98,7 @@
if(len_messages >= 3)
msg_blind = "[search_texts[3]]"
user.visible_message("[user] [search_texts[1]] [source].", msg_first_person, msg_blind)
- if(do_after(user, scavenge_time * speed_multi, source, NONE, TRUE, CALLBACK(src, .proc/set_progress, source, world.time), resume_time = progress_done * speed_multi))
+ if(do_after(user, scavenge_time * speed_multi, source, NONE, TRUE, CALLBACK(src, PROC_REF(set_progress), source, world.time), resume_time = progress_done * speed_multi))
spawn_loot(source, user)
players_busy_scavenging -= user
diff --git a/code/datums/elements/screentips/contextual_screentip_bare_hands.dm b/code/datums/elements/screentips/contextual_screentip_bare_hands.dm
index 98ef45af3f..dd12372e11 100644
--- a/code/datums/elements/screentips/contextual_screentip_bare_hands.dm
+++ b/code/datums/elements/screentips/contextual_screentip_bare_hands.dm
@@ -51,7 +51,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 44ff1f3190..10d5ac6b82 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_sharpness.dm b/code/datums/elements/screentips/contextual_screentip_sharpness.dm
index 0ee89f2fd7..27738376f8 100644
--- a/code/datums/elements/screentips/contextual_screentip_sharpness.dm
+++ b/code/datums/elements/screentips/contextual_screentip_sharpness.dm
@@ -21,7 +21,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_sharpness/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 a0850f8742..a6c358ef2f 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/snail_crawl.dm b/code/datums/elements/snail_crawl.dm
index 0e322c7c9d..91ed2e31dc 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/spellcasting.dm b/code/datums/elements/spellcasting.dm
index c789972d60..7b41925dcf 100644
--- a/code/datums/elements/spellcasting.dm
+++ b/code/datums/elements/spellcasting.dm
@@ -9,10 +9,10 @@
/datum/element/spellcasting/Attach(datum/target, _flags, _slots)
. = ..()
if(isitem(target))
- 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))
else if(ismob(target))
- RegisterSignal(target, COMSIG_MOB_SPELL_CAN_CAST, .proc/on_cast)
+ RegisterSignal(target, COMSIG_MOB_SPELL_CAN_CAST, PROC_REF(on_cast))
stacked_spellcasting_by_user[target]++
else
return ELEMENT_INCOMPATIBLE
@@ -39,7 +39,7 @@
return
users_by_item[source] = equipper
if(!stacked_spellcasting_by_user[equipper])
- RegisterSignal(equipper, COMSIG_MOB_SPELL_CAN_CAST, .proc/on_cast)
+ RegisterSignal(equipper, COMSIG_MOB_SPELL_CAN_CAST, PROC_REF(on_cast))
stacked_spellcasting_by_user[equipper]++
/datum/element/spellcasting/proc/on_drop(datum/source, mob/user)
diff --git a/code/datums/elements/squish.dm b/code/datums/elements/squish.dm
index 823d391e14..5ac31fa76e 100644
--- a/code/datums/elements/squish.dm
+++ b/code/datums/elements/squish.dm
@@ -11,7 +11,7 @@
var/mob/living/carbon/C = target
var/was_lying = (C.lying != 0)
- addtimer(CALLBACK(src, .proc/Detach, C, was_lying), duration)
+ addtimer(CALLBACK(src, PROC_REF(Detach), C, was_lying), duration)
C.transform = C.transform.Scale(TALL, SHORT)
diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm
index 5b2480a5bc..4238bc7a87 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/swimming.dm b/code/datums/elements/swimming.dm
index d16ef6625f..f77435c78d 100644
--- a/code/datums/elements/swimming.dm
+++ b/code/datums/elements/swimming.dm
@@ -7,7 +7,7 @@
return
if(!isliving(target))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/check_valid)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(check_valid))
ADD_TRAIT(target, TRAIT_SWIMMING, TRAIT_SWIMMING) //seriously there's only one way to get this
/datum/element/swimming/Detach(datum/target)
diff --git a/code/datums/elements/sword_point.dm b/code/datums/elements/sword_point.dm
index d691e22a6a..c41a2a30f4 100644
--- a/code/datums/elements/sword_point.dm
+++ b/code/datums/elements/sword_point.dm
@@ -7,7 +7,7 @@
return
if(!istype(target))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_ITEM_ALT_AFTERATTACK, .proc/point)
+ RegisterSignal(target, COMSIG_ITEM_ALT_AFTERATTACK, PROC_REF(point))
/datum/element/sword_point/Detach(datum/source)
. = ..()
diff --git a/code/datums/elements/tactical.dm b/code/datums/elements/tactical.dm
index 4b49552fbe..913686062f 100644
--- a/code/datums/elements/tactical.dm
+++ b/code/datums/elements/tactical.dm
@@ -9,8 +9,8 @@
return ELEMENT_INCOMPATIBLE
src.allowed_slot = allowed_slot
- RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/modify)
- RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/unmodify)
+ RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(modify))
+ RegisterSignal(target, COMSIG_ITEM_DROPPED, PROC_REF(unmodify))
/datum/element/tactical/Detach(datum/target)
UnregisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
diff --git a/code/datums/elements/trash.dm b/code/datums/elements/trash.dm
index 97864cd5f2..06f1c6fe32 100644
--- a/code/datums/elements/trash.dm
+++ b/code/datums/elements/trash.dm
@@ -3,7 +3,7 @@
/datum/element/trash/Attach(datum/target)
. = ..()
- RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/UseFromHand)
+ RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(UseFromHand))
/datum/element/trash/proc/UseFromHand(obj/item/source, mob/living/M, mob/living/user)
if((M == user || user.vore_flags & TRASH_FORCEFEED) && ishuman(user))
diff --git a/code/datums/elements/turf_transparency.dm b/code/datums/elements/turf_transparency.dm
index fa0919d61a..ff55bca3b3 100644
--- a/code/datums/elements/turf_transparency.dm
+++ b/code/datums/elements/turf_transparency.dm
@@ -14,8 +14,8 @@
our_turf.plane = OPENSPACE_PLANE
our_turf.layer = OPENSPACE_LAYER
- 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, TURF_TRAIT)
diff --git a/code/datums/elements/update_icon_blocker.dm b/code/datums/elements/update_icon_blocker.dm
index f52a712ebb..f584f2194d 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()
return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS
diff --git a/code/datums/elements/update_icon_updates_onmob.dm b/code/datums/elements/update_icon_updates_onmob.dm
index 5c71547f62..b60f88e601 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, override = TRUE)
+ RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_onmob), override = TRUE)
/datum/element/update_icon_updates_onmob/proc/update_onmob(obj/item/target)
if(ismob(target.loc))
diff --git a/code/datums/elements/ventcrawling.dm b/code/datums/elements/ventcrawling.dm
index 254345a97f..9dc07f2d2e 100644
--- a/code/datums/elements/ventcrawling.dm
+++ b/code/datums/elements/ventcrawling.dm
@@ -12,12 +12,12 @@
src.tier = given_tier
- RegisterSignal(target, COMSIG_HANDLE_VENTCRAWL, .proc/handle_ventcrawl)
- RegisterSignal(target, COMSIG_CHECK_VENTCRAWL, .proc/check_ventcrawl)
+ RegisterSignal(target, COMSIG_HANDLE_VENTCRAWL, PROC_REF(handle_ventcrawl))
+ RegisterSignal(target, COMSIG_CHECK_VENTCRAWL, PROC_REF(check_ventcrawl))
to_chat(target, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.")
if(duration!=0)
- addtimer(CALLBACK(src, .proc/Detach, target), duration)
+ addtimer(CALLBACK(src, PROC_REF(Detach), target), duration)
/datum/element/ventcrawling/Detach(datum/target)
UnregisterSignal(target, list(COMSIG_HANDLE_VENTCRAWL, COMSIG_CHECK_VENTCRAWL))
diff --git a/code/datums/elements/weather_listener.dm b/code/datums/elements/weather_listener.dm
index 7cea61b640..e82ce06aac 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_CLIENT_LOGOUT, .proc/handle_logout, override = TRUE)
+ RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(handle_z_level_change), override = TRUE)
+ RegisterSignal(target, COMSIG_MOB_CLIENT_LOGOUT, PROC_REF(handle_logout), override = TRUE)
/datum/element/weather_listener/Detach(datum/source)
. = ..()
diff --git a/code/datums/elements/wuv.dm b/code/datums/elements/wuv.dm
index 854bfdf8dd..96cc29da5a 100644
--- a/code/datums/elements/wuv.dm
+++ b/code/datums/elements/wuv.dm
@@ -28,7 +28,7 @@
pet_moodlet = pet_mood
punt_moodlet = punt_mood
- RegisterSignal(target, COMSIG_MOB_ATTACK_HAND, .proc/on_attack_hand)
+ RegisterSignal(target, COMSIG_MOB_ATTACK_HAND, PROC_REF(on_attack_hand))
/datum/element/wuv/Detach(datum/source, force)
. = ..()
@@ -42,9 +42,9 @@
//we want to delay the effect to be displayed after the mob is petted, not before.
switch(act_intent)
if(INTENT_HARM)
- addtimer(CALLBACK(src, .proc/kick_the_dog, source, user), 1)
+ addtimer(CALLBACK(src, PROC_REF(kick_the_dog), source, user), 1)
if(INTENT_HELP)
- addtimer(CALLBACK(src, .proc/pet_the_dog, source, user), 1)
+ addtimer(CALLBACK(src, PROC_REF(pet_the_dog), source, user), 1)
/datum/element/wuv/proc/pet_the_dog(mob/target, mob/user)
if(QDELETED(target) || QDELETED(user) || target.stat != CONSCIOUS)
diff --git a/code/datums/explosion.dm b/code/datums/explosion.dm
index ed1056640a..57f138f085 100644
--- a/code/datums/explosion.dm
+++ b/code/datums/explosion.dm
@@ -446,7 +446,7 @@ GLOBAL_LIST_EMPTY(explosions)
else
continue
- addtimer(CALLBACK(GLOBAL_PROC, .proc/wipe_color_and_text, wipe_colours), 100)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(wipe_color_and_text), wipe_colours), 100)
/proc/wipe_color_and_text(list/atom/wiping)
for(var/i in wiping)
diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm
index ab7cdcfe20..476249bc74 100644
--- a/code/datums/holocall.dm
+++ b/code/datums/holocall.dm
@@ -238,7 +238,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/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm
index e8c6bc4d22..4d03729098 100644
--- a/code/datums/looping_sounds/_looping_sound.dm
+++ b/code/datums/looping_sounds/_looping_sound.dm
@@ -73,7 +73,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)
@@ -101,7 +101,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(end_sound && loop_started)
@@ -112,7 +112,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/handle_parent_del(datum/source)
SIGNAL_HANDLER
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
index 547a24de0a..d23db6f055 100644
--- a/code/datums/martial/sleeping_carp.dm
+++ b/code/datums/martial/sleeping_carp.dm
@@ -226,8 +226,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 466bf5c778..b56c891820 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -209,7 +209,7 @@
if (T && isturf(T))
if (!D.stat)
D.emote("scream")
- D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living/carbon/human.proc/DefaultCombatKnockdown, 20))
+ D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, TYPE_PROC_REF(/mob/living/carbon/human, DefaultCombatKnockdown), 20))
log_combat(A, D, "has thrown with wrestling")
return FALSE
@@ -350,7 +350,7 @@
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)
A.visible_message("[A] headbutts [D]!")
D.apply_damage(damage + 15, BRUTE)
diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm
index b94246a2c5..435ca0dc5b 100644
--- a/code/datums/materials/_material.dm
+++ b/code/datums/materials/_material.dm
@@ -82,7 +82,7 @@ Simple datum which is instanced once per type and is used for every object of sa
source.name = "[name] [source.name]"
// if(beauty_modifier) returnign in hardsync2 if i ever port ebeauty cmp
- // addtimer(CALLBACK(source, /datum.proc/_AddElement, list(/datum/element/beauty, beauty_modifier * amount)), 0)
+ // addtimer(CALLBACK(source, TYPE_PROC_REF(/datum, _AddElement), list(/datum/element/beauty, beauty_modifier * amount)), 0)
if(istype(source, /obj)) //objs
on_applied_obj(source, amount, material_flags)
@@ -151,7 +151,7 @@ Simple datum which is instanced once per type and is used for every object of sa
source.name = initial(source.name)
// if(beauty_modifier) //component/beauty/InheritComponent() will handle the removal.
- // addtimer(CALLBACK(source, /datum.proc/_AddElement, list(/datum/element/beauty, -beauty_modifier * amount)), 0)
+ // addtimer(CALLBACK(source, TYPE_PROC_REF(/datum, _AddElement), list(/datum/element/beauty, -beauty_modifier * amount)), 0)
if(istype(source, /obj)) //objs
on_removed_obj(source, amount, material_flags)
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 2abf605ea1..1885a4498e 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -176,7 +176,7 @@
SEND_SIGNAL(src, COMSIG_MIND_TRANSFER, new_character, old_character)
SEND_SIGNAL(new_character, COMSIG_MOB_ON_NEW_MIND)
//splurt change
- INVOKE_ASYNC(GLOBAL_PROC, .proc/_paci_check, new_character, old_character)
+ INVOKE_ASYNC(GLOBAL_PROC, PROC_REF(_paci_check), new_character, old_character)
//end change
/datum/mind/proc/store_memory(new_text)
@@ -845,7 +845,7 @@ GLOBAL_LIST(objective_choices)
do_edit_objectives_ambitions()
return
S_TIMER_COOLDOWN_START(src, COOLDOWN_OBJ_ADMIN_PING, ADMIN_PING_COOLDOWN_TIME)
- RegisterSignal(src, list(COMSIG_CD_STOP(COOLDOWN_OBJ_ADMIN_PING), COMSIG_CD_RESET(COOLDOWN_OBJ_ADMIN_PING)), .proc/on_objectives_request_cd_end)
+ RegisterSignal(src, list(COMSIG_CD_STOP(COOLDOWN_OBJ_ADMIN_PING), COMSIG_CD_RESET(COOLDOWN_OBJ_ADMIN_PING)), PROC_REF(on_objectives_request_cd_end))
log_admin("Objectives review request - [key_name(usr)] has requested a review of their objective changes, pinging the admins.")
for(var/a in GLOB.admins)
var/client/admin_client = a
@@ -1682,7 +1682,7 @@ GLOBAL_LIST(objective_choices)
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)
for(var/mob/dead/observer/G in 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 d22bae9221..66264b7814 100644
--- a/code/datums/mood_events/generic_negative_events.dm
+++ b/code/datums/mood_events/generic_negative_events.dm
@@ -89,7 +89,7 @@
var/mob/living/carbon/human/H = owner
if(iscatperson(H))
H.dna.species.start_wagging_tail(H)
- addtimer(CALLBACK(H.dna.species, /datum/species.proc/stop_wagging_tail, H), 30)
+ addtimer(CALLBACK(H.dna.species, TYPE_PROC_REF(/datum/species, stop_wagging_tail), H), 30)
description = span_nicegreen("They want to play on the table!\n")
mood_change = 2
diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm
index 33a082372e..80bb252f87 100644
--- a/code/datums/mutations/_mutations.dm
+++ b/code/datums/mutations/_mutations.dm
@@ -48,7 +48,7 @@
. = ..()
class = class_
if(timer)
- addtimer(CALLBACK(src, .proc/remove), timer)
+ addtimer(CALLBACK(src, PROC_REF(remove)), timer)
timed = TRUE
if(copymut && istype(copymut, /datum/mutation/human))
copy_mutation(copymut)
@@ -86,7 +86,7 @@
grant_spell()
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 dad5237aa5..0787c10874 100644
--- a/code/datums/mutations/actions.dm
+++ b/code/datums/mutations/actions.dm
@@ -429,7 +429,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 9a416d1eac..6cb328ee76 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(mob/living/carbon/human/owner)
if(owner)
diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm
index 5d363124d9..8685c40d9c 100644
--- a/code/datums/mutations/hulk.dm
+++ b/code/datums/mutations/hulk.dm
@@ -17,7 +17,7 @@
ADD_TRAIT(owner, TRAIT_CHUNKYFINGERS, TRAIT_HULK)
owner.update_body_parts()
SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk)
- RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/mutation/human/hulk/on_attack_hand(atom/target, proximity, act_intent, unarmed_attack_flags)
if(proximity && (act_intent == INTENT_HARM)) //no telekinetic hulk attack
diff --git a/code/datums/mutations/space_adaptation.dm b/code/datums/mutations/space_adaptation.dm
index 6defd05ee5..a418433fe1 100644
--- a/code/datums/mutations/space_adaptation.dm
+++ b/code/datums/mutations/space_adaptation.dm
@@ -15,7 +15,7 @@
ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "cold_resistance")
ADD_TRAIT(owner, TRAIT_LOWPRESSURECOOLING, "cold_resistance")
owner.add_filter("space_glow", 2, list("type" = "outline", "color" = "#ffe46bd8", "size" = 1))
- addtimer(CALLBACK(src, .proc/glow_loop, owner), rand(1,19))
+ addtimer(CALLBACK(src, PROC_REF(glow_loop), owner), rand(1,19))
/datum/mutation/human/space_adaptation/proc/glow_loop(mob/living/carbon/human/owner)
var/filter = owner.get_filter("space_glow")
diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm
index 531837e583..0eeb387a77 100644
--- a/code/datums/mutations/speech.dm
+++ b/code/datums/mutations/speech.dm
@@ -23,7 +23,7 @@
. = ..()
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)
. = ..()
@@ -65,7 +65,7 @@
. = ..()
if(.)
return
- RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/mutation/human/smile/on_losing(mob/living/carbon/human/owner)
. = ..()
@@ -152,7 +152,7 @@
. = ..()
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)
. = ..()
@@ -184,7 +184,7 @@
. = ..()
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)
. = ..()
@@ -243,7 +243,7 @@
. = ..()
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)
. = ..()
diff --git a/code/datums/profiling.dm b/code/datums/profiling.dm
index 49a80d0ede..1eec878711 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 b3d7d2d633..984c90967f 100644
--- a/code/datums/progressbar.dm
+++ b/code/datums/progressbar.dm
@@ -45,9 +45,9 @@
user_client = user.client
add_prog_bar_image_to_client()
- RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/on_user_delete)
- RegisterSignal(user, COMSIG_MOB_CLIENT_LOGOUT, .proc/clean_user_client)
- RegisterSignal(user, COMSIG_MOB_CLIENT_LOGIN, .proc/on_user_login)
+ RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(on_user_delete))
+ RegisterSignal(user, COMSIG_MOB_CLIENT_LOGOUT, PROC_REF(clean_user_client))
+ RegisterSignal(user, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(on_user_login))
/datum/progressbar/Destroy()
if(user)
diff --git a/code/datums/screentips/atom_context.dm b/code/datums/screentips/atom_context.dm
index ebab6b155a..de2266b8b6 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, override = TRUE)
+ RegisterSignal(src, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(add_context), override = TRUE)
/// 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 239cd18683..8afa99ddcf 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/skills/_skill.dm b/code/datums/skills/_skill.dm
index a7d7df72e4..c55cc70585 100644
--- a/code/datums/skills/_skill.dm
+++ b/code/datums/skills/_skill.dm
@@ -8,7 +8,7 @@ GLOBAL_LIST_INIT_TYPED(skill_datums, /datum/skill, init_skill_datums())
continue
S = new path
.[S.type] = S
- . = sortTim(., /proc/cmp_skill_categories, TRUE)
+ . = sortTim(., GLOBAL_PROC_REF(cmp_skill_categories), TRUE)
/**
* Skill datums
diff --git a/code/datums/skills/_skill_modifier.dm b/code/datums/skills/_skill_modifier.dm
index fd8de29f28..c863ae7c46 100644
--- a/code/datums/skills/_skill_modifier.dm
+++ b/code/datums/skills/_skill_modifier.dm
@@ -52,7 +52,7 @@ GLOBAL_LIST_EMPTY(potential_mods_per_skill)
GLOB.potential_skills_per_mod[target_skills_key] = list(target_skills)
else //Should be a list.
var/list/T = target_skills
- T = sortTim(target_skills, /proc/cmp_text_asc) //Sort the list contents alphabetically.
+ T = sortTim(target_skills, GLOBAL_PROC_REF(cmp_text_asc)) //Sort the list contents alphabetically.
target_skills_key = T.Join("-")
var/list/L = GLOB.potential_skills_per_mod[target_skills_key]
if(!L)
@@ -115,9 +115,9 @@ GLOBAL_LIST_EMPTY(potential_mods_per_skill)
skill_holder.need_static_data_update = TRUE
if(M.modifier_flags & MODIFIER_SKILL_BODYBOUND)
- M.RegisterSignal(src, COMSIG_MIND_TRANSFER, /datum/skill_modifier.proc/on_mind_transfer)
- M.RegisterSignal(current, COMSIG_MOB_ON_NEW_MIND, /datum/skill_modifier.proc/on_mob_new_mind, TRUE)
- RegisterSignal(M, COMSIG_PARENT_PREQDELETED, .proc/on_skill_modifier_deletion)
+ M.RegisterSignal(src, COMSIG_MIND_TRANSFER, TYPE_PROC_REF(/datum/skill_modifier, on_mind_transfer))
+ M.RegisterSignal(current, COMSIG_MOB_ON_NEW_MIND, TYPE_PROC_REF(/datum/skill_modifier, on_mob_new_mind), TRUE)
+ RegisterSignal(M, COMSIG_PARENT_PREQDELETED, PROC_REF(on_skill_modifier_deletion))
#undef ADD_MOD_STEP
@@ -201,4 +201,4 @@ GLOBAL_LIST_EMPTY(potential_mods_per_skill)
/datum/skill_modifier/proc/on_mob_new_mind(mob/source)
source.mind.add_skill_modifier(identifier)
- RegisterSignal(source.mind, COMSIG_MIND_TRANSFER, /datum/skill_modifier.proc/on_mind_transfer)
+ RegisterSignal(source.mind, COMSIG_MIND_TRANSFER, TYPE_PROC_REF(/datum/skill_modifier, on_mind_transfer))
diff --git a/code/datums/station_traits/_station_trait.dm b/code/datums/station_traits/_station_trait.dm
index 5fbf8611d5..cb0de6afd4 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 c24d93865c..09be52d700 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)
@@ -112,7 +112,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."
@@ -180,7 +180,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 1f7e040e97..38358da334 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.AddComponent(/datum/component/twitch_plays/simple_movement/auto, 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.AddComponent(/datum/component/twitch_plays/simple_movement/auto, 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 abe5a3a0e9..a1deb8899c 100644
--- a/code/datums/station_traits/positive_traits.dm
+++ b/code/datums/station_traits/positive_traits.dm
@@ -108,7 +108,7 @@
scarves -= /obj/item/clothing/neck/scarf/zomb // donator snowflake code--mayhaps we should make a glob for this or similar
- 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)
@@ -158,7 +158,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)
@@ -234,7 +234,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)
@@ -254,7 +254,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/debuffs.dm b/code/datums/status_effects/debuffs.dm
index af32731d93..1e91e91ed1 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -171,7 +171,7 @@
. = ..()
if(!.)
return
- RegisterSignal(owner, COMSIG_LIVING_LIFE, .proc/InterruptBiologicalLife)
+ RegisterSignal(owner, COMSIG_LIVING_LIFE, PROC_REF(InterruptBiologicalLife))
owner.mobility_flags &= ~(MOBILITY_USE | MOBILITY_PICKUP | MOBILITY_PULL | MOBILITY_HOLD)
owner.update_mobility()
owner.add_filter("stasis_status_ripple", 2, list("type" = "ripple", "flags" = WAVE_BOUNDED, "radius" = 0, "size" = 2))
@@ -509,7 +509,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()
return TRUE
return FALSE
@@ -1045,7 +1045,7 @@
. = ..()
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, "trance")
owner.add_client_colour(/datum/client_colour/monochrome/trance)
owner.visible_message("[stun ? "[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point." : ""]", \
@@ -1086,8 +1086,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 '[hypnomsg]'", LOG_ATTACK)
C.log_message("has been hypnotised by the phrase '[hypnomsg]' 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, hypnomsg), 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, hypnomsg), 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
diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm
index 34c83b9a8e..b7382c49db 100644
--- a/code/datums/status_effects/gas.dm
+++ b/code/datums/status_effects/gas.dm
@@ -12,7 +12,7 @@
icon_state = "frozen"
/datum/status_effect/freon/on_apply()
- RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/owner_resist)
+ RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(owner_resist))
if(!owner.stat)
to_chat(owner, "You become frozen in a cube!")
cube = icon('icons/effects/freeze.dmi', "ice_cube")
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index 53ba29622e..108e698a40 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -116,9 +116,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)
@@ -133,7 +133,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
diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm
index 74fc55e95b..f5903bbc28 100644
--- a/code/datums/status_effects/wound_effects.dm
+++ b/code/datums/status_effects/wound_effects.dm
@@ -41,8 +41,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 ..()
/datum/status_effect/limp/on_remove()
@@ -129,7 +129,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 ..()
/// check if the wound getting removed is the wound we're tied to
@@ -143,7 +143,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 434450b9be..55c7c64277 100644
--- a/code/datums/tgs_event_handler.dm
+++ b/code/datums/tgs_event_handler.dm
@@ -23,7 +23,7 @@
to_chat(world, "Server updated, changes will be applied on the next round...")
if(TGS_EVENT_WATCHDOG_DETACH)
message_admins("TGS restarting...")
- reattach_timer = addtimer(CALLBACK(src, .proc/LateOnReattach), 1 MINUTES)
+ reattach_timer = addtimer(CALLBACK(src, PROC_REF(LateOnReattach)), 1 MINUTES)
if(TGS_EVENT_WATCHDOG_REATTACH)
var/datum/tgs_version/old_version = world.TgsVersion()
var/datum/tgs_version/new_version = args[2]
diff --git a/code/datums/traits/_quirk.dm b/code/datums/traits/_quirk.dm
index e26a19d3f0..a2a8d64909 100644
--- a/code/datums/traits/_quirk.dm
+++ b/code/datums/traits/_quirk.dm
@@ -34,8 +34,8 @@
if(on_spawn_immediate)
on_spawn()
else
- addtimer(CALLBACK(src, .proc/on_spawn), 0)
- addtimer(CALLBACK(src, .proc/post_add), 30)
+ addtimer(CALLBACK(src, PROC_REF(on_spawn)), 0)
+ addtimer(CALLBACK(src, PROC_REF(post_add)), 30)
/datum/quirk/Destroy()
if(processing_quirk)
diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index 20cda350d6..3d99b61934 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -156,7 +156,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
medical_record_text = "Patient demonstrates a fear of the dark. (Seriously?)"
/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)
@@ -197,7 +197,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
medical_record_text = "Despite my warnings, the patient refuses turn on the lights, only to end up rolling down a full flight of stairs and into the cellar."
/datum/quirk/lightless/add()
- RegisterSignal(quirk_holder, COMSIG_MOVABLE_MOVED, .proc/on_holder_moved)
+ RegisterSignal(quirk_holder, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved))
/datum/quirk/lightless/remove()
UnregisterSignal(quirk_holder, COMSIG_MOVABLE_MOVED)
@@ -335,8 +335,8 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
processing_quirk = 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_EYECONTACT, PROC_REF(eye_contact))
+ RegisterSignal(quirk_holder, COMSIG_MOB_EXAMINATE, PROC_REF(looks_at_floor))
/datum/quirk/social_anxiety/remove()
UnregisterSignal(quirk_holder, list(COMSIG_MOB_EYECONTACT, COMSIG_MOB_EXAMINATE))
@@ -364,7 +364,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
if(prob(85) || (istype(mind_check) && mind_check.mind))
return
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, quirk_holder, "You make eye contact with [A]."), 3)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), quirk_holder, "You make eye contact with [A]."), 3)
/datum/quirk/social_anxiety/proc/eye_contact(datum/source, mob/living/other_mob, triggering_examiner)
if(prob(75))
@@ -387,7 +387,7 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
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, "[msg]"), 3) // so the examine signal has time to fire and this will print after
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), quirk_holder, "[msg]"), 3) // so the examine signal has time to fire and this will print after
return COMSIG_BLOCK_EYECONTACT
/datum/mood_event/anxiety_eyecontact
diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm
index bdd15b863f..45bcce41d8 100644
--- a/code/datums/traits/neutral.dm
+++ b/code/datums/traits/neutral.dm
@@ -215,7 +215,7 @@
/datum/quirk/jiggly_ass/add()
// Add examine text
- RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/on_examine_holder)
+ RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine_holder))
/datum/quirk/jiggly_ass/remove()
// Remove examine text
diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm
index 797b26b51d..9dd1a6871b 100644
--- a/code/datums/weather/weather.dm
+++ b/code/datums/weather/weather.dm
@@ -121,7 +121,7 @@
to_chat(M, telegraph_message)
if(telegraph_sound)
SEND_SOUND(M, 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
@@ -146,7 +146,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
@@ -167,7 +167,7 @@
to_chat(M, end_message)
if(end_sound)
SEND_SOUND(M, 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/airalarm.dm b/code/datums/wires/airalarm.dm
index 376512a375..addacb315d 100644
--- a/code/datums/wires/airalarm.dm
+++ b/code/datums/wires/airalarm.dm
@@ -32,13 +32,13 @@
if(!A.shorted)
A.shorted = TRUE
A.update_icon()
- 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 f21b3acc31..c932ff753e 100644
--- a/code/datums/wires/airlock.dm
+++ b/code/datums/wires/airlock.dm
@@ -83,9 +83,9 @@
return
if(!A.requiresID() || A.check_access(null))
if(A.density)
- INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/open)
+ INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, open))
else
- INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/close)
+ INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, close))
else
holder.visible_message("You hear a a grinding noise coming from the airlock.")
if(WIRE_BOLTS) // Pulse to toggle bolts (but only raise if power is on).
@@ -106,7 +106,7 @@
A.aiControlDisabled = 1
else if(A.aiControlDisabled == -1)
A.aiControlDisabled = 2
- 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(30, usr)
diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm
index d167a11fd3..4621e18709 100644
--- a/code/datums/wires/apc.dm
+++ b/code/datums/wires/apc.dm
@@ -31,14 +31,14 @@
if(!A.shorted)
A.shorted = TRUE
A.update()
- addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 1200)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 1200)
if(WIRE_IDSCAN) // Unlock for a little while.
A.locked = FALSE
- addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 300)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 300)
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), 10)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 10)
/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 01e87228d4..86f7dde386 100644
--- a/code/datums/wires/autolathe.dm
+++ b/code/datums/wires/autolathe.dm
@@ -28,14 +28,14 @@
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
A.shock(usr, 50)
- 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/wounds/_scars.dm b/code/datums/wounds/_scars.dm
index 0edcf65b42..a384862c7c 100644
--- a/code/datums/wounds/_scars.dm
+++ b/code/datums/wounds/_scars.dm
@@ -47,7 +47,7 @@
qdel(src)
return
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)
@@ -88,7 +88,7 @@
return
limb = BP
- RegisterSignal(limb, COMSIG_PARENT_QDELETING, .proc/limb_gone)
+ RegisterSignal(limb, COMSIG_PARENT_QDELETING, PROC_REF(limb_gone))
src.severity = severity
LAZYADD(limb.scars, src)
if(BP.owner)
diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm
index 9b1a912f49..2c1707e991 100644
--- a/code/datums/wounds/_wounds.dm
+++ b/code/datums/wounds/_wounds.dm
@@ -124,7 +124,7 @@
return
victim = L.owner
- RegisterSignal(victim, COMSIG_PARENT_QDELETING, .proc/null_victim)
+ RegisterSignal(victim, COMSIG_PARENT_QDELETING, PROC_REF(null_victim))
limb = L
LAZYADD(victim.all_wounds, src)
LAZYADD(limb.wounds, src)
diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm
index bf5c0f55d2..d4adc2e4dc 100644
--- a/code/datums/wounds/bones.dm
+++ b/code/datums/wounds/bones.dm
@@ -39,7 +39,7 @@
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))
@@ -235,7 +235,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))
@@ -254,7 +254,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))
@@ -275,7 +275,7 @@
else
user.visible_message("[user] begins resetting [victim]'s [limb.name] with [I].", "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)
@@ -350,7 +350,7 @@
user.visible_message("[user] begins hastily applying [I] to [victim]'s' [limb.name]...", "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)
@@ -388,7 +388,7 @@
user.visible_message("[user] begins applying [I] to [victim]'s' [limb.name]...", "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
regen_points_current = 0
diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm
index c16be6005a..3417c76f60 100644
--- a/code/datums/wounds/burns.dm
+++ b/code/datums/wounds/burns.dm
@@ -180,7 +180,7 @@
/// if someone is using ointment on our burns
/datum/wound/burn/proc/ointment(obj/item/stack/medical/ointment/I, mob/user)
user.visible_message("[user] begins applying [I] to [victim]'s [limb.name]...", "You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.name]...")
- 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)
@@ -197,7 +197,7 @@
/// if someone is using mesh on our burns
/datum/wound/burn/proc/mesh(obj/item/stack/medical/mesh/I, mob/user)
user.visible_message("[user] begins wrapping [victim]'s [limb.name] with [I]...", "You begin wrapping [user == victim ? "your" : "[victim]'s"] [limb.name] with [I]...")
- if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), target=victim, extra_checks = CALLBACK(src, .proc/still_exists)))
+ if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), target=victim, 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 434a711109..e57782f828 100644
--- a/code/datums/wounds/pierce.dm
+++ b/code/datums/wounds/pierce.dm
@@ -96,7 +96,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("[user] begins stitching [victim]'s [limb.name] with [I]...", "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("[user] stitches up some of the bleeding on [victim].", "You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")
var/blood_sutured = I.stop_bleeding / self_penalty_mult * 0.5
@@ -112,7 +112,7 @@
/datum/wound/pierce/proc/tool_cauterize(obj/item/I, mob/user)
var/self_penalty_mult = (user == victim ? 1.5 : 1)
user.visible_message("[user] begins cauterizing [victim]'s [limb.name] with [I]...", "You begin cauterizing [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("[user] cauterizes some of the bleeding on [victim].", "You cauterize some of the bleeding on [victim].")
diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm
index 02e3db3070..89c95ba706 100644
--- a/code/datums/wounds/slash.dm
+++ b/code/datums/wounds/slash.dm
@@ -47,7 +47,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)
@@ -180,7 +180,7 @@
user.visible_message("[user] begins licking the wounds on [victim]'s [limb.name].", "You begin licking the wounds on [victim]'s [limb.name]...", ignored_mobs=victim)
to_chat(victim, "[user] begins to lick the wounds on your [limb.name].[user] licks the wounds on [victim]'s [limb.name].", "You lick some of the wounds on [victim]'s [limb.name]", ignored_mobs=victim)
@@ -209,7 +209,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("[user] begins aiming [lasgun] directly at [victim]'s [limb.name]...", "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.BB.damage
lasgun.chambered.BB.wound_bonus -= 30
@@ -224,7 +224,7 @@
/datum/wound/slash/proc/tool_cauterize(obj/item/I, mob/user)
var/self_penalty_mult = (user == victim ? 1.5 : 1)
user.visible_message("[user] begins cauterizing [victim]'s [limb.name] with [I]...", "You begin cauterizing [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("[user] cauterizes some of the bleeding on [victim].", "You cauterize some of the bleeding on [victim].")
@@ -244,7 +244,7 @@
var/self_penalty_mult = (user == victim ? 1.4 : 1)
user.visible_message("[user] begins stitching [victim]'s [limb.name] with [I]...", "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("[user] stitches up some of the bleeding on [victim].", "You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")
var/blood_sutured = I.stop_bleeding / self_penalty_mult
diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 54f1db323a..97e073275f 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -173,7 +173,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
@@ -420,7 +420,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
if(D.operating)
D.nextstate = opening ? FIREDOOR_OPEN : FIREDOOR_CLOSED
else if(!(D.density ^ opening))
- INVOKE_ASYNC(D, (opening ? /obj/machinery/door/firedoor.proc/open : /obj/machinery/door/firedoor.proc/close))
+ INVOKE_ASYNC(D, (opening ? TYPE_PROC_REF(/obj/machinery/door/firedoor, open) : TYPE_PROC_REF(/obj/machinery/door/firedoor, close)))
/area/proc/firealert(obj/source)
if(always_unpowered == 1) //no fire alarms in space/asteroid
@@ -513,7 +513,7 @@ GLOBAL_LIST_EMPTY(teleportlocs)
var/mob/living/silicon/SILICON = i
if(SILICON.triggerAlarm("Burglar", src, cameras, trigger))
//Cancel silicon alert after 1 minute
- addtimer(CALLBACK(SILICON, /mob/living/silicon.proc/cancelAlarm,"Burglar",src,trigger), 600)
+ addtimer(CALLBACK(SILICON, TYPE_PROC_REF(/mob/living/silicon, cancelAlarm),"Burglar",src,trigger), 600)
/area/proc/set_fire_alarm_effects(boolean)
fire = boolean
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index 0749292288..d5fb09c455 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -706,7 +706,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
@@ -940,7 +940,7 @@
if(STR == src_object)
progress.end_progress()
return
- 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, "You dump as much of [src_object.parent]'s contents into [STR.insert_preposition]to [src] as you can.")
@@ -1340,7 +1340,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 3c1887ad27..764e61d4c8 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -172,7 +172,7 @@
if(isobj(A) || ismob(A))
if(A.layer > highest.layer)
highest = A
- INVOKE_ASYNC(src, .proc/SpinAnimation, 5, 2)
+ INVOKE_ASYNC(src, PROC_REF(SpinAnimation), 5, 2)
throw_impact(highest)
return TRUE
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index c31cbbdcfc..df698a4f5e 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -421,7 +421,7 @@ 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)
..()
@@ -740,7 +740,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 04892ad153..cd13665114 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 7c87f1bc82..d14e6e8aa1 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 2bc497e62a..36b1c9f2fb 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -89,7 +89,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, PROC_REF(display_roundstart_logout_report)), ROUNDSTART_LOGOUT_REPORT_TIME)
if(prob(20)) //cit-change
flipseclevel = TRUE
@@ -100,7 +100,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, PROC_REF(reopen_roundstart_suicide_roles)), delay)
if(SSdbcore.Connect())
var/list/to_set = list()
@@ -120,7 +120,7 @@
query_round_game_mode.Execute()
qdel(query_round_game_mode)
if(report)
- addtimer(CALLBACK(src, .proc/send_intercept, 0), rand(waittime_l, waittime_h))
+ addtimer(CALLBACK(src, PROC_REF(send_intercept), 0), rand(waittime_l, waittime_h))
generate_station_goals()
gamemode_ready = TRUE
return TRUE
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 220fbe9978..a46e4e90c8 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -69,7 +69,7 @@
/datum/game_mode/traitor/post_setup()
for(var/datum/mind/traitor in pre_traitors)
var/datum/antagonist/traitor/new_antag = new antag_datum()
- addtimer(CALLBACK(traitor, /datum/mind.proc/add_antag_datum, new_antag), rand(10,100))
+ addtimer(CALLBACK(traitor, TYPE_PROC_REF(/datum/mind, add_antag_datum), new_antag), rand(10,100))
if(!exchange_blue)
exchange_blue = -1 //Block latejoiners from getting exchange objectives
..()
diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm
index c19c59448f..dc016fc7a9 100644
--- a/code/game/machinery/_machinery.dm
+++ b/code/game/machinery/_machinery.dm
@@ -154,7 +154,7 @@ Class Procs:
START_PROCESSING(SSfastprocess, src)
else
START_PROCESSING(SSmachines, src)
- RegisterSignal(src, COMSIG_ENTER_AREA, .proc/power_change)
+ RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(power_change))
if (occupant_typecache)
occupant_typecache = typecacheof(occupant_typecache)
@@ -531,7 +531,7 @@ Class Procs:
I.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(I.use_tool(src, user, time, extra_checks = CALLBACK(src, .proc/unfasten_wrench_check, prev_anchored, user)))
+ if(I.use_tool(src, user, time, extra_checks = CALLBACK(src, PROC_REF(unfasten_wrench_check), prev_anchored, user)))
to_chat(user, "You [anchored ? "un" : ""]secure [src].")
setAnchored(!anchored)
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index b59e71d62e..b5fdb5af8d 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -55,4 +55,4 @@
to_chat(user, "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 6c4542bfd1..05cb3202d2 100644
--- a/code/game/machinery/autolathe.dm
+++ b/code/game/machinery/autolathe.dm
@@ -51,7 +51,7 @@
matching_designs = list()
/obj/machinery/autolathe/ComponentInitialize()
- AddComponent(/datum/component/material_container, SSmaterials.materialtypes_by_category[MAT_CATEGORY_RIGID], 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert))
+ AddComponent(/datum/component/material_container, SSmaterials.materialtypes_by_category[MAT_CATEGORY_RIGID], 0, TRUE, null, null, CALLBACK(src, PROC_REF(AfterMaterialInsert)))
/obj/machinery/autolathe/Destroy()
QDEL_NULL(wires)
@@ -210,7 +210,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
@@ -223,7 +223,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."))
@@ -477,4 +477,4 @@
// override the base to allow plastics
/obj/machinery/autolathe/ComponentInitialize()
var/list/extra_mats = list(/datum/material/plastic)
- AddComponent(/datum/component/material_container, SSmaterials.materialtypes_by_category[MAT_CATEGORY_RIGID] + extra_mats, 0, TRUE, null, null, CALLBACK(src, .proc/AfterMaterialInsert))
+ AddComponent(/datum/component/material_container, SSmaterials.materialtypes_by_category[MAT_CATEGORY_RIGID] + extra_mats, 0, TRUE, null, null, CALLBACK(src, PROC_REF(AfterMaterialInsert)))
diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm
index 54a06f39eb..03a17caa5f 100644
--- a/code/game/machinery/buttons.dm
+++ b/code/game/machinery/buttons.dm
@@ -183,7 +183,7 @@
if(device)
device.pulsed()
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 15)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 15)
/obj/machinery/button/power_change()
..()
diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm
index 6e794b8072..bd2faefbd7 100644
--- a/code/game/machinery/camera/camera.dm
+++ b/code/game/machinery/camera/camera.dm
@@ -117,7 +117,7 @@
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)
for(var/i in GLOB.player_list)
var/mob/M = i
if (M.client.eye == src)
@@ -325,7 +325,7 @@
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("[user] [change_msg] [src]!")
diff --git a/code/game/machinery/civilian_bountys.dm b/code/game/machinery/civilian_bountys.dm
index 1df0d02c3b..7768a06258 100644
--- a/code/game/machinery/civilian_bountys.dm
+++ b/code/game/machinery/civilian_bountys.dm
@@ -340,7 +340,7 @@
/obj/item/civ_bounty_beacon/attack_self()
loc.visible_message("\The [src] begins to beep loudly!")
- addtimer(CALLBACK(src, .proc/launch_payload), 4 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(launch_payload)), 4 SECONDS)
/obj/item/civ_bounty_beacon/proc/launch_payload()
playsound(src, "sparks", 80, TRUE)
diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm
index 06a399a2eb..9758c00ef3 100644
--- a/code/game/machinery/cloning.dm
+++ b/code/game/machinery/cloning.dm
@@ -137,7 +137,7 @@
if(G.suiciding) // The ghost came from a body that is suiciding.
return FALSE
if(clonemind.damnation_type) //Can't clone the damned.
- INVOKE_ASYNC(src, .proc/horrifyingsound)
+ INVOKE_ASYNC(src, PROC_REF(horrifyingsound))
mess = TRUE
update_icon()
return FALSE
diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm
index 804025961b..f091b77916 100644
--- a/code/game/machinery/computer/apc_control.dm
+++ b/code/game/machinery/computer/apc_control.dm
@@ -112,7 +112,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/battle.dm b/code/game/machinery/computer/arcade/battle.dm
index b668b648f2..166f89187c 100644
--- a/code/game/machinery/computer/arcade/battle.dm
+++ b/code/game/machinery/computer/arcade/battle.dm
@@ -207,7 +207,7 @@
else
playsound(src, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3)
- timer_id = addtimer(CALLBACK(src, .proc/enemy_action,player_stance,user),1 SECONDS,TIMER_STOPPABLE)
+ timer_id = addtimer(CALLBACK(src, PROC_REF(enemy_action),player_stance,user),1 SECONDS,TIMER_STOPPABLE)
gameover_check(user)
///the enemy turn, the enemy's action entirely depend on their current passive and a teensy tiny bit of randomness
diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm
index 1d47155c33..d57a18bfc6 100644
--- a/code/game/machinery/computer/camera.dm
+++ b/code/game/machinery/computer/camera.dm
@@ -277,13 +277,13 @@
/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/cloning.dm b/code/game/machinery/computer/cloning.dm
index 91211d3d40..16aa4f72be 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -274,7 +274,7 @@
say("Initiating scan...")
var/prev_locked = scanner.locked
scanner.locked = TRUE
- addtimer(CALLBACK(src, .proc/finish_scan, scanner.occupant, prev_locked), 2 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(finish_scan), scanner.occupant, prev_locked), 2 SECONDS)
. = TRUE
/obj/machinery/computer/cloning/proc/Toggle_autoprocess(mob/user)
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 8921232c06..8f7b15070b 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -200,7 +200,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
else
results_undamaged[++results_undamaged.len] = total_list
- var/list/returning = sortTim(results_damaged,/proc/damage_compare) + sortTim(results_undamaged,/proc/ijob_compare)
+ var/list/returning = sortTim(results_damaged,GLOBAL_PROC_REF(damage_compare)) + sortTim(results_undamaged,GLOBAL_PROC_REF(ijob_compare))
data_by_z["[z]"] = returning
last_update["[z]"] = world.time
diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm
index 70b66c1b87..917104df22 100644
--- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm
+++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm
@@ -111,7 +111,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/teleporter.dm b/code/game/machinery/computer/teleporter.dm
index eb1c4903fc..dcda7a33f2 100644
--- a/code/game/machinery/computer/teleporter.dm
+++ b/code/game/machinery/computer/teleporter.dm
@@ -90,7 +90,7 @@
say("Processing hub calibration to target...")
calibrating = TRUE
power_station.update_icon()
- 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
. = TRUE
/obj/machinery/computer/teleporter/proc/finish_calibration()
@@ -150,7 +150,7 @@
var/mob/living/M = target
var/obj/item/implant/tracking/I = locate() in M.implants
if(I)
- RegisterSignal(I, COMSIG_IMPLANT_REMOVING, .proc/untarget_implant)
+ RegisterSignal(I, COMSIG_IMPLANT_REMOVING, PROC_REF(untarget_implant))
imp_t = I
else
target = null
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index 8cdec2f324..9f8fd6ba5e 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -90,7 +90,7 @@
return
to_chat(user, "You start to add cables to the frame...")
- if(P.use_tool(src, user, 20, volume=50, amount=5, extra_checks = CALLBACK(src, .proc/check_state, 1)))
+ if(P.use_tool(src, user, 20, volume=50, amount=5, extra_checks = CALLBACK(src, PROC_REF(check_state), 1)))
to_chat(user, "You add cables to the frame.")
state = 2
icon_state = "box_1"
@@ -99,7 +99,7 @@
if(P.tool_behaviour == TOOL_SCREWDRIVER && !anchored)
user.visible_message("[user] disassembles the frame.", \
"You start to disassemble the frame...", "You hear banging and clanking.")
- if(P.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/check_state, 1)))
+ if(P.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(check_state), 1)))
if(state == 1)
to_chat(user, "You disassemble the frame.")
var/obj/item/stack/sheet/metal/M = new (loc, 5)
@@ -108,7 +108,7 @@
return
if(P.tool_behaviour == TOOL_WRENCH)
to_chat(user, "You start [anchored ? "un" : ""]securing [src]...")
- if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, .proc/check_state, 1)))
+ if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, PROC_REF(check_state), 1)))
if(state == 1)
to_chat(user, "You [anchored ? "un" : ""]secure [src].")
set_anchored(!anchored)
@@ -117,7 +117,7 @@
if(2)
if(P.tool_behaviour == TOOL_WRENCH)
to_chat(user, "You start [anchored ? "un" : ""]securing [src]...")
- if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, .proc/check_state, 2)))
+ if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, PROC_REF(check_state), 2)))
to_chat(user, "You [anchored ? "un" : ""]secure [src].")
set_anchored(!anchored)
return
@@ -175,7 +175,7 @@
if(P.tool_behaviour == TOOL_WRENCH && !circuit.needs_anchored)
to_chat(user, "You start [anchored ? "un" : ""]securing [src]...")
- if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, .proc/check_state, 3)))
+ if(P.use_tool(src, user, 40, volume=75, extra_checks = CALLBACK(src, PROC_REF(check_state), 3)))
to_chat(user, "You [anchored ? "un" : ""]secure [src].")
set_anchored(!anchored)
return
@@ -231,7 +231,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 1a0e36fb62..bf83cc21d3 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -351,7 +351,7 @@
glow.update_light()
continue
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(playing.song_beat)
#undef DISCO_INFENO_RANGE
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 29816473d0..37195b92e9 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -123,7 +123,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/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index c3ec2dff21..523593e451 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -113,7 +113,7 @@
set_frequency(frequency)
if(closeOtherId != null)
- addtimer(CALLBACK(.proc/update_other_id), 5)
+ addtimer(CALLBACK(PROC_REF(update_other_id)), 5)
if(glass)
airlock_material = "glass"
if(security_level > AIRLOCK_SECURITY_METAL)
@@ -224,9 +224,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)
@@ -346,7 +346,7 @@
if(cyclelinkedairlock.operating)
cyclelinkedairlock.delayed_close_requested = TRUE
else
- addtimer(CALLBACK(cyclelinkedairlock, .proc/close), 2)
+ addtimer(CALLBACK(cyclelinkedairlock, PROC_REF(close)), 2)
..()
/obj/machinery/door/airlock/proc/isElectrified()
@@ -403,7 +403,7 @@
secondsBackupPowerLost = 10
if(!spawnPowerRestoreRunning)
spawnPowerRestoreRunning = TRUE
- INVOKE_ASYNC(src, .proc/handlePowerRestore)
+ INVOKE_ASYNC(src, PROC_REF(handlePowerRestore))
update_icon()
/obj/machinery/door/airlock/proc/loseBackupPower()
@@ -411,7 +411,7 @@
src.secondsBackupPowerLost = 60
if(!spawnPowerRestoreRunning)
spawnPowerRestoreRunning = TRUE
- INVOKE_ASYNC(src, .proc/handlePowerRestore)
+ INVOKE_ASYNC(src, PROC_REF(handlePowerRestore))
update_icon()
/obj/machinery/door/airlock/proc/regainBackupPower()
@@ -1042,7 +1042,7 @@
user.visible_message("[user] is [welded ? "unwelding":"welding"] the airlock.", \
"You begin [welded ? "unwelding":"welding"] the airlock...", \
"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)))
welded = !welded
user.visible_message("[user.name] has [welded? "welded shut":"unwelded"] [src].", \
"You [welded ? "weld the airlock shut":"unweld the airlock"].")
@@ -1054,7 +1054,7 @@
user.visible_message("[user] is welding the airlock.", \
"You begin repairing the airlock...", \
"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)))
obj_integrity = max_integrity
stat &= ~BROKEN
user.visible_message("[user.name] has repaired [src].", \
@@ -1127,9 +1127,9 @@
if(!axe.wielded)
to_chat(user, "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)
else
- INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2)
+ INVOKE_ASYNC(src, (density ? PROC_REF(open) : PROC_REF(close)), 2)
if(I.tool_behaviour == TOOL_CROWBAR)
if(!I.can_force_powered)
@@ -1208,7 +1208,7 @@
operating = FALSE
if(delayed_close_requested)
delayed_close_requested = FALSE
- addtimer(CALLBACK(src, .proc/close), 1)
+ addtimer(CALLBACK(src, PROC_REF(close)), 1)
return TRUE
@@ -1305,7 +1305,7 @@
return
operating = TRUE
update_icon(AIRLOCK_EMAG, 1)
- addtimer(CALLBACK(src, .proc/open_sesame), 6)
+ addtimer(CALLBACK(src, PROC_REF(open_sesame)), 6)
return TRUE
/obj/machinery/door/airlock/proc/open_sesame()
@@ -1381,7 +1381,7 @@
deltimer(unelectrify_timerid)
unelectrify_timerid = null
if(secondsElectrified != ELECTRIFIED_PERMANENT)
- unelectrify_timerid = addtimer(CALLBACK(src, .proc/remove_electrify), secondsElectrified SECONDS, TIMER_STOPPABLE)
+ unelectrify_timerid = addtimer(CALLBACK(src, PROC_REF(remove_electrify)), secondsElectrified SECONDS, TIMER_STOPPABLE)
diag_hud_set_electrified()
if(user)
diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm
index f0b0d9eeb0..71c3ad6306 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 57dcb223cc..8c7ad08050 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -89,7 +89,7 @@
for(var/obj/machinery/door/window/brigdoor/door in targets)
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/obj/structure/closet/secure_closet/brig/C in targets)
if(C.broken)
@@ -117,7 +117,7 @@
for(var/obj/machinery/door/window/brigdoor/door in targets)
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/obj/structure/closet/secure_closet/brig/C in targets)
if(C.broken)
diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm
index a3483e5702..9911e63b88 100644
--- a/code/game/machinery/doors/door.dm
+++ b/code/game/machinery/doors/door.dm
@@ -254,7 +254,7 @@
if (. & EMP_PROTECT_SELF)
return
if(prob(severity/5) && (istype(src, /obj/machinery/door/airlock) || istype(src, /obj/machinery/door/window)) )
- INVOKE_ASYNC(src, .proc/open)
+ INVOKE_ASYNC(src, PROC_REF(open))
/obj/machinery/door/proc/unelectrify()
secondsElectrified = MACHINE_NOT_ELECTRIFIED
@@ -377,7 +377,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 d040b98a38..4a2b539ef4 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -128,7 +128,7 @@
/obj/machinery/door/firedoor/power_change()
if(powered(power_channel))
stat &= ~NOPOWER
- INVOKE_ASYNC(src, .proc/latetoggle)
+ INVOKE_ASYNC(src, PROC_REF(latetoggle))
else
stat |= NOPOWER
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index ba96cb5bf6..6928005729 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -38,9 +38,9 @@
/obj/machinery/door/poddoor/shuttledock/proc/check()
var/turf/T = get_step(src, checkdir)
if(!istype(T, 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_toxmix
name = "combustion chamber vent"
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 7d9ec6a9a1..e305e1660c 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -156,7 +156,7 @@
do_animate("opening")
playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
src.icon_state ="[src.base_state]open"
- addtimer(CALLBACK(src, .proc/finish_opening), 10)
+ addtimer(CALLBACK(src, PROC_REF(finish_opening)), 10)
return TRUE
/obj/machinery/door/window/proc/finish_opening()
@@ -186,7 +186,7 @@
density = TRUE
air_update_turf(1)
update_freelook_sight()
- addtimer(CALLBACK(src, .proc/finish_closing), 10)
+ addtimer(CALLBACK(src, PROC_REF(finish_closing)), 10)
return TRUE
/obj/machinery/door/window/proc/finish_closing()
@@ -231,7 +231,7 @@
operating = TRUE
flick("[src.base_state]spark", src)
playsound(src, "sparks", 75, 1)
- addtimer(CALLBACK(src, .proc/open_windows_me), 6)
+ addtimer(CALLBACK(src, PROC_REF(open_windows_me)), 6)
return TRUE
/obj/machinery/door/window/proc/open_windows_me()
@@ -349,11 +349,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/brigdoor
name = "secure door"
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 458f231f4b..6dfff281d5 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
/obj/machinery/doppler_array/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,null,null,CALLBACK(src,.proc/rot_message))
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,null,null,CALLBACK(src,PROC_REF(rot_message)))
/obj/machinery/doppler_array/Destroy()
GLOB.doppler_arrays -= src
diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm
index 0a0a4e08f3..463b5ba0ce 100644
--- a/code/game/machinery/embedded_controller/embedded_controller_base.dm
+++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm
@@ -56,10 +56,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()
if(program)
diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm
index 5d4f0f1ac8..ae8df91959 100644
--- a/code/game/machinery/harvester.dm
+++ b/code/game/machinery/harvester.dm
@@ -97,7 +97,7 @@
visible_message("The [name] begins warming up!")
say("Initializing harvest protocol.")
update_icon()
- addtimer(CALLBACK(src, .proc/harvest), interval)
+ addtimer(CALLBACK(src, PROC_REF(harvest)), interval)
/obj/machinery/harvester/proc/harvest()
warming_up = FALSE
@@ -132,7 +132,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 cd87a858b8..73f9089050 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -703,7 +703,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 9380038147..e477268d97 100644
--- a/code/game/machinery/hypnochair.dm
+++ b/code/game/machinery/hypnochair.dm
@@ -95,7 +95,7 @@
START_PROCESSING(SSobj, src)
start_time = world.time
update_icon()
- 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()
var/mob/living/carbon/C = occupant
diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm
index c3ce5732ab..7d6eab4913 100644
--- a/code/game/machinery/limbgrower.dm
+++ b/code/game/machinery/limbgrower.dm
@@ -41,7 +41,7 @@
stored_research = new /datum/techweb/specialized/autounlocking/limbgrower
. = ..()
AddComponent(/datum/component/plumbing/simple_demand)
- AddComponent(/datum/component/simple_rotation, ROTATION_WRENCH | ROTATION_CLOCKWISE, null, CALLBACK(src, .proc/can_be_rotated))
+ AddComponent(/datum/component/simple_rotation, ROTATION_WRENCH | ROTATION_CLOCKWISE, null, CALLBACK(src, PROC_REF(can_be_rotated)))
/obj/machinery/limbgrower/ui_interact(mob/user, datum/tgui/ui)
. = ..()
@@ -210,7 +210,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/magnet.dm b/code/game/machinery/magnet.dm
index fa71960c9d..20c496de5d 100644
--- a/code/game/machinery/magnet.dm
+++ b/code/game/machinery/magnet.dm
@@ -129,7 +129,7 @@
on = !on
if(on)
- INVOKE_ASYNC(src, .proc/magnetic_process)
+ INVOKE_ASYNC(src, PROC_REF(magnetic_process))
@@ -316,7 +316,7 @@
if("togglemoving")
moving = !moving
if(moving)
- INVOKE_ASYNC(src, .proc/MagnetMove)
+ INVOKE_ASYNC(src, PROC_REF(MagnetMove))
updateUsrDialog()
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 8b9333b5e0..5a40abaf6e 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -65,4 +65,4 @@
if(isliving(O))
var/mob/living/L = O
to_chat(L, "You feel something click beneath you!")
- addtimer(CALLBACK(src, .proc/drive), drive_delay)
+ addtimer(CALLBACK(src, PROC_REF(drive)), drive_delay)
diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm
index 7fceff4380..e2251d09b9 100644
--- a/code/game/machinery/porta_turret/portable_turret.dm
+++ b/code/game/machinery/porta_turret/portable_turret.dm
@@ -127,7 +127,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(var/set_to)
var/current = on
@@ -358,7 +358,7 @@ DEFINE_BITFIELD(turret_flags, list(
toggle_on(FALSE) //turns off the turret temporarily
update_icon()
//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)
@@ -378,7 +378,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)
. = ..()
@@ -387,7 +387,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
@@ -599,7 +599,7 @@ DEFINE_BITFIELD(turret_flags, list(
if(target)
popUp() //pop the turret up if it's not already up.
setDir(get_dir(base, target))//even if you can't shoot, follow the target
- INVOKE_ASYNC(src, .proc/shootAt, target)
+ INVOKE_ASYNC(src, PROC_REF(shootAt), target)
return 1
return
@@ -816,9 +816,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/ai
@@ -1194,8 +1194,8 @@ DEFINE_BITFIELD(turret_flags, list(
if(team_color == "blue")
if(istype(P, /obj/item/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/item/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/posi_alert.dm b/code/game/machinery/posi_alert.dm
index a2a67f22f9..cceb77a5b5 100644
--- a/code/game/machinery/posi_alert.dm
+++ b/code/game/machinery/posi_alert.dm
@@ -49,7 +49,7 @@
visible_message("There are positronic personalities available!")
radio.talk_into(src, "There are positronic personalities available!", science_channel)
playsound(loc, 'sound/machines/ping.ogg', 50)
- addtimer(CALLBACK(src, .proc/liftcooldown), 300)
+ addtimer(CALLBACK(src, PROC_REF(liftcooldown)), 300)
/obj/machinery/posialert/proc/liftcooldown()
inuse = FALSE
diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm
index c561170af4..f8a23456c0 100644
--- a/code/game/machinery/recycler.dm
+++ b/code/game/machinery/recycler.dm
@@ -183,7 +183,7 @@
safety_mode = TRUE
update_icon()
L.forceMove(loc)
- 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, 0)
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 52c96e269f..1fe552745d 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -338,7 +338,7 @@ GLOBAL_LIST_EMPTY(allConsoles)
Radio.set_frequency(radio_freq)
Radio.talk_into(src, "[emergency] emergency in [department]!!", radio_freq)
update_icon()
- addtimer(CALLBACK(src, .proc/clear_emergency), 5 MINUTES)
+ addtimer(CALLBACK(src, PROC_REF(clear_emergency)), 5 MINUTES)
if(href_list["department"] && message)
var/sending = message
diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm
index 82f15803ab..3bca8f8f43 100644
--- a/code/game/machinery/sheetifier.dm
+++ b/code/game/machinery/sheetifier.dm
@@ -13,7 +13,7 @@
/obj/machinery/sheetifier/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/reagent_containers/food/snacks/meat/slab, CALLBACK(src, .proc/CanInsertMaterials), CALLBACK(src, .proc/AfterInsertMaterials))
+ AddComponent(/datum/component/material_container, list(/datum/material/meat), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/reagent_containers/food/snacks/meat/slab, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, PROC_REF(AfterInsertMaterials)))
/obj/machinery/sheetifier/update_overlays()
. = ..()
@@ -35,7 +35,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/slotmachine.dm b/code/game/machinery/slotmachine.dm
index 4fa6476176..f7a6b6db2a 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -40,13 +40,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 = 0, i < reel.len, i++) //Populate the reels.
randomize_reels()
- INVOKE_ASYNC(src, .proc/toggle_reel_spin, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(toggle_reel_spin), FALSE)
/obj/machinery/computer/slot_machine/Destroy()
if(balance)
@@ -204,9 +204,9 @@
update_icon()
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 bd1ea0c483..67508ac9b8 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -325,7 +325,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),
)
@@ -436,7 +436,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
@@ -549,7 +549,7 @@
if(locked)
visible_message("You see [user] kicking against the doors of [src]!", \
"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_contents()
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 56629841e3..d9b110e8c4 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -405,7 +405,7 @@
chem_splash(get_turf(src), 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/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm
index f3726c4245..01b2716fd6 100644
--- a/code/game/machinery/telecomms/computers/message.dm
+++ b/code/game/machinery/telecomms/computers/message.dm
@@ -216,7 +216,7 @@
if(istype(S) && S.hack_software)
hacking = TRUE
//Time it takes to bruteforce is dependant on the password length.
- addtimer(CALLBACK(src, .proc/BruteForce, usr), (10 SECONDS) * length(linkedServer.decryptkey))
+ addtimer(CALLBACK(src, PROC_REF(BruteForce), usr), (10 SECONDS) * length(linkedServer.decryptkey))
if("del_log")
if(!auth)
@@ -344,7 +344,7 @@
var/obj/item/paper/monitorkey/MK = new(loc, linkedServer)
// Will help make emagging the console not so easy to get away with.
MK.info += "
�%@%(*$%&(�&?*(%&�/{}"
- addtimer(CALLBACK(src, .proc/UnmagConsole), (10 SECONDS) * length(linkedServer.decryptkey))
+ addtimer(CALLBACK(src, PROC_REF(UnmagConsole)), (10 SECONDS) * length(linkedServer.decryptkey))
//message = rebootmsg
return TRUE
diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
index eb79376dc3..2ce3a5ea2e 100644
--- a/code/game/machinery/transformer.dm
+++ b/code/game/machinery/transformer.dm
@@ -103,7 +103,7 @@
R.set_connected_ai(masterAI)
R.lawsync()
R.lawupdate = 1
- 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, 0)
diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm
index 8c2d3631e3..ddd2320a82 100644
--- a/code/game/machinery/washing_machine.dm
+++ b/code/game/machinery/washing_machine.dm
@@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(dye_registry, list(
busy = TRUE
update_icon()
- addtimer(CALLBACK(src, .proc/wash_cycle), 200)
+ addtimer(CALLBACK(src, PROC_REF(wash_cycle)), 200)
START_PROCESSING(SSfastprocess, src)
return TRUE
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 31e9d70462..cf7a8b756c 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -138,7 +138,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 = make_field(/datum/proximity_monitor/advanced/gravity, list("current_range" = 7, "host" = src, "gravity_value" = rand(0,3)))
@@ -247,7 +247,7 @@
if(ismob(A) && !(A in flashers)) // don't flash if we're already doing an effect
var/mob/M = A
if(M.client)
- INVOKE_ASYNC(src, .proc/blue_effect, M)
+ INVOKE_ASYNC(src, PROC_REF(blue_effect), M)
/obj/effect/anomaly/bluespace/proc/blue_effect(mob/M)
var/obj/blueeffect = new /obj(src)
@@ -282,7 +282,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 6db28b3700..886c1b7648 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/blessedAware, "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 f538a5a7b7..b1456a247b 100644
--- a/code/game/objects/effects/contraband.dm
+++ b/code/game/objects/effects/contraband.dm
@@ -70,7 +70,7 @@
name = "poster - [name]"
desc = "A large piece of space-resistant printed paper. [desc]"
- addtimer(CALLBACK(src, /datum.proc/_AddElement, list(/datum/element/beauty, 300)), 0)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, _AddElement), list(/datum/element/beauty, 300)), 0)
/obj/structure/sign/poster/proc/randomise(base_type)
var/list/poster_types = subtypesof(base_type)
diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm
index d846ecdaec..104789a543 100644
--- a/code/game/objects/effects/countdown.dm
+++ b/code/game/objects/effects/countdown.dm
@@ -19,7 +19,7 @@
/obj/effect/countdown/Initialize(mapload)
. = ..()
attach(loc)
- RegisterSignal(loc, COMSIG_PARENT_QDELETING, .proc/on_parent_deleting)
+ RegisterSignal(loc, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_deleting))
/obj/effect/countdown/proc/on_parent_deleting(atom/being_deleted, force)
qdel(src)
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 3a2c50e2a2..b94370b86a 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -34,7 +34,7 @@
if(LAZYLEN(diseases_to_add))
AddComponent(/datum/component/infective, diseases_to_add)
- addtimer(CALLBACK(src, /datum.proc/_AddElement, list(/datum/element/beauty, beauty)), 0)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, _AddElement), list(/datum/element/beauty, beauty)), 0)
/**
* A data list is passed into this.
diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm
index 6eb6fecd66..eb0e2c6b91 100644
--- a/code/game/objects/effects/effect_system/effect_system.dm
+++ b/code/game/objects/effects/effect_system/effect_system.dm
@@ -53,7 +53,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
for(var/i in 1 to number)
if(total_effects > 20)
return
- INVOKE_ASYNC(src, .proc/generate_effect)
+ INVOKE_ASYNC(src, PROC_REF(generate_effect))
/datum/effect_system/proc/generate_effect()
if(holder)
@@ -72,7 +72,7 @@ would spawn and follow the beaker, even if it is carried or thrown.
sleep(5)
step(E,direction)
if(!QDELETED(src))
- addtimer(CALLBACK(src, .proc/decrement_total_effect), 20)
+ addtimer(CALLBACK(src, PROC_REF(decrement_total_effect)), 20)
/datum/effect_system/proc/decrement_total_effect()
total_effects--
diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm
index e45461cde8..3522f68c84 100644
--- a/code/game/objects/effects/effect_system/effects_explosion.dm
+++ b/code/game/objects/effects/effect_system/effects_explosion.dm
@@ -17,7 +17,7 @@
var/direct = pick(GLOB.alldirs)
var/steps_amt = pick(1;25,2;50,3,4;200)
for(var/j in 1 to steps_amt)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/_step, expl, direct), j)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(_step), expl, direct), j)
/obj/effect/explosion
name = "fire"
@@ -55,4 +55,4 @@
S.start()
/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_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index d9cfc09220..648faf588a 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -315,7 +315,7 @@
/obj/structure/foamedmetal/resin/Initialize(mapload)
. = ..()
neutralize_air()
- addtimer(CALLBACK(src, .proc/neutralize_air), 5) // yeah this sucks, maybe when auxmos is out
+ addtimer(CALLBACK(src, PROC_REF(neutralize_air)), 5) // yeah this sucks, maybe when auxmos is out
/obj/structure/foamedmetal/resin/proc/neutralize_air()
if(isopenturf(loc))
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 9e6cde9336..d4fb0f11d4 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -42,7 +42,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()
@@ -64,7 +64,7 @@
if(C.smoke_delay)
return 0
C.smoke_delay++
- addtimer(CALLBACK(src, .proc/remove_smoke_delay, C), 10)
+ addtimer(CALLBACK(src, PROC_REF(remove_smoke_delay), C), 10)
return 1
/obj/effect/particle_effect/smoke/proc/remove_smoke_delay(mob/living/carbon/C)
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 22dd772ebe..45357960da 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -98,8 +98,8 @@
else //if on the floor, glowshroom on-floor sprite
icon_state = base_icon_state
- addtimer(CALLBACK(src, .proc/Spread), delay_spread)
- addtimer(CALLBACK(src, .proc/Decay), delay_decay, FALSE) // Start decaying the plant
+ addtimer(CALLBACK(src, PROC_REF(Spread)), delay_spread)
+ addtimer(CALLBACK(src, PROC_REF(Decay)), delay_decay, FALSE) // Start decaying the plant
/**
* Causes glowshroom spreading across the floor/walls.
@@ -151,7 +151,7 @@
CHECK_TICK
if(shrooms_planted <= myseed.yield) //if we didn't get all possible shrooms planted, try again later
myseed.adjust_yield(-shrooms_planted)
- addtimer(CALLBACK(src, .proc/Spread), delay_spread)
+ addtimer(CALLBACK(src, PROC_REF(Spread)), delay_spread)
/obj/structure/glowshroom/proc/CalcDir(turf/location = loc)
var/direction = 16
@@ -204,7 +204,7 @@
if(obj_integrity > max_integrity)
obj_integrity = max_integrity
if (myseed.endurance > 0)
- addtimer(CALLBACK(src, .proc/Decay), delay_decay, FALSE) // Recall decay timer
+ addtimer(CALLBACK(src, PROC_REF(Decay)), delay_decay, FALSE) // Recall decay timer
return
if (myseed.endurance < 1) // Plant is gone
qdel(src)
diff --git a/code/game/objects/effects/proximity.dm b/code/game/objects/effects/proximity.dm
index 7379a96400..3b2304b2fc 100644
--- a/code/game/objects/effects/proximity.dm
+++ b/code/game/objects/effects/proximity.dm
@@ -24,7 +24,7 @@
else if(hasprox_receiver == host) //Default case
hasprox_receiver = H
host = H
- RegisterSignal(host, COMSIG_MOVABLE_MOVED, .proc/HandleMove)
+ RegisterSignal(host, COMSIG_MOVABLE_MOVED, PROC_REF(HandleMove))
last_host_loc = host.loc
SetRange(current_range,TRUE)
diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm
index dd4a6ea479..4155f470fb 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/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm
index 64c34ad1cd..c94ae8d037 100644
--- a/code/game/objects/effects/temporary_visuals/clockcult.dm
+++ b/code/game/objects/effects/temporary_visuals/clockcult.dm
@@ -113,7 +113,7 @@
var/matrix/M = new
M.Turn(Get_Angle(src, user))
transform = M
- INVOKE_ASYNC(src, .proc/volthit)
+ INVOKE_ASYNC(src, PROC_REF(volthit))
/obj/effect/temp_visual/ratvar/volt_hit/proc/volthit()
if(user)
diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
index 543bad1fb8..5ce8d1c884 100644
--- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm
+++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm
@@ -496,7 +496,7 @@
status = rcd_status
delay = rcd_delay
if (status == RCD_DECONSTRUCT)
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 11)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 11)
delay -= 11
icon_state = "rcd_end_reverse"
else
@@ -518,7 +518,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 ac61fdc85d..14dc0abae5 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -739,7 +739,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
/obj/item/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback, force, messy_throw = TRUE)
thrownby = WEAKREF(thrower)
- callback = CALLBACK(src, .proc/after_throw, callback, (spin && messy_throw)) //replace their callback with our own
+ callback = CALLBACK(src, PROC_REF(after_throw), callback, (spin && messy_throw)) //replace their callback with our own
. = ..(target, range, speed, thrower, spin, diagonals_first, callback, force)
/obj/item/proc/after_throw(datum/callback/callback, messy_throw)
@@ -923,7 +923,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
var/mob/living/L = usr
if(usr.client.prefs.enable_tips)
var/timedelay = usr.client.prefs.tip_delay/100
- usr.client.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.
+ usr.client.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.outline_enabled)
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
@@ -991,7 +991,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
delay = user.mind.item_action_skills_mod(src, delay, skill_difficulty, SKILL_USE_TOOL, null, FALSE)
// 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))
diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm
index b182c9f227..6c1c4d2798 100644
--- a/code/game/objects/items/RCD.dm
+++ b/code/game/objects/items/RCD.dm
@@ -292,7 +292,7 @@ RLD
"SOUTH" = image(icon = 'icons/mob/radial.dmi', icon_state = "csouth"),
"WEST" = image(icon = 'icons/mob/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)
@@ -351,13 +351,13 @@ RLD
"External Maintenance" = get_airlock_image(/obj/machinery/door/airlock/maintenance/external/glass)
)
- 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)
@@ -402,7 +402,7 @@ RLD
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)
@@ -494,7 +494,7 @@ RLD
choices += list(
"Change Window Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype")
)
- var/choice = show_radial_menu(user,src,choices, custom_check = CALLBACK(src,.proc/check_menu,user))
+ var/choice = show_radial_menu(user,src,choices, custom_check = CALLBACK(src,PROC_REF(check_menu),user))
if(!check_menu(user))
return
switch(choice)
@@ -548,7 +548,7 @@ RLD
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, 0, 0, 3, 1, flame_range = 1)
@@ -887,7 +887,7 @@ RLD
machinery_data["cost"][A] = initial(M.rcd_cost)
machinery_data["delay"][A] = initial(M.rcd_delay)
- 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 fa73650142..8b61d0a5cb 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))
update_icon()
/obj/item/rcl/ComponentInitialize()
@@ -171,7 +171,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)
@@ -252,7 +252,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/binoculars.dm b/code/game/objects/items/binoculars.dm
index 0897dc1dca..941f13fba1 100644
--- a/code/game/objects/items/binoculars.dm
+++ b/code/game/objects/items/binoculars.dm
@@ -13,8 +13,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()
. = ..()
@@ -25,8 +25,8 @@
return ..()
/obj/item/binoculars/proc/on_wield(obj/item/source, mob/user)
- 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("[user] holds [src] up to [user.p_their()] eyes.", "You hold [src] up to your eyes.")
item_state = "binoculars_wielded"
diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm
index a311644b04..8428147b91 100644
--- a/code/game/objects/items/body_egg.dm
+++ b/code/game/objects/items/body_egg.dm
@@ -18,13 +18,13 @@
..()
ADD_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
owner.med_hud_set_status()
- INVOKE_ASYNC(src, .proc/AddInfectionImages, owner)
+ INVOKE_ASYNC(src, PROC_REF(AddInfectionImages), owner)
/obj/item/organ/body_egg/Remove(special = FALSE)
if(!QDELETED(owner))
REMOVE_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC)
owner.med_hud_set_status()
- INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner)
+ INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), owner)
return ..()
/obj/item/organ/body_egg/on_death()
diff --git a/code/game/objects/items/boombox.dm b/code/game/objects/items/boombox.dm
index 7ac2c67f5a..7a792b5b9f 100644
--- a/code/game/objects/items/boombox.dm
+++ b/code/game/objects/items/boombox.dm
@@ -50,7 +50,7 @@
/obj/item/boombox/raiq/Initialize(mapload)
. = ..()
- RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, .proc/start_party)
+ RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(start_party))
/obj/item/boombox/raiq/proc/start_party()
if(boomingandboxing)
diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm
index 91b37a4c5d..6511df2d49 100644
--- a/code/game/objects/items/broom.dm
+++ b/code/game/objects/items/broom.dm
@@ -15,8 +15,8 @@
/obj/item/broom/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/broom/ComponentInitialize()
. = ..()
@@ -28,7 +28,7 @@
/// triggered on wield of two handed item
/obj/item/broom/proc/on_wield(obj/item/source, mob/user)
to_chat(user, "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))
/// triggered on unwield of two handed item
/obj/item/broom/proc/on_unwield(obj/item/source, mob/user)
diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm
index f4fe339c7b..346f68b192 100644
--- a/code/game/objects/items/cardboard_cutouts.dm
+++ b/code/game/objects/items/cardboard_cutouts.dm
@@ -109,7 +109,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
if(!do_after(user, 1 SECONDS, src, timed_action_flags = IGNORE_HELD_ITEM))
diff --git a/code/game/objects/items/chainsaw.dm b/code/game/objects/items/chainsaw.dm
index 58046a35d1..ef4fa82e33 100644
--- a/code/game/objects/items/chainsaw.dm
+++ b/code/game/objects/items/chainsaw.dm
@@ -25,8 +25,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 8ece13681c..328ca30772 100644
--- a/code/game/objects/items/charter.dm
+++ b/code/game/objects/items/charter.dm
@@ -64,7 +64,7 @@
to_chat(user, "Your name has been sent to your employers for approval.")
// Autoapproves after a certain time
var/requires_approval = CONFIG_GET(flag/station_name_needs_approval)
- response_timer_id = addtimer(CALLBACK(src, .proc/check_state, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE)
+ response_timer_id = addtimer(CALLBACK(src, PROC_REF(check_state), new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE)
to_chat(GLOB.admins, "CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [html_encode(new_name)] ([requires_approval ? "REQUIRES ADMIN APPROVAL and will autodeny" : "will autoapprove"] in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT)[requires_approval ? " (APPROVE)" : ""] [ADMIN_CENTCOM_REPLY(user)]")
/obj/item/station_charter/proc/check_state(designation, uname, ureal_name, ukey)
diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm
index e808d3486f..028216e80c 100644
--- a/code/game/objects/items/cosmetics.dm
+++ b/code/game/objects/items/cosmetics.dm
@@ -134,7 +134,7 @@
return
if(location == BODY_ZONE_PRECISE_MOUTH)
if(user.a_intent == INTENT_HELP)
- INVOKE_ASYNC(src, .proc/new_facial_hairstyle, H, user, mirror)
+ INVOKE_ASYNC(src, PROC_REF(new_facial_hairstyle), H, user, mirror)
return
else
if(!(FACEHAIR in H.dna.species.species_traits))
@@ -164,7 +164,7 @@
else if(location == BODY_ZONE_HEAD)
if(user.a_intent == INTENT_HELP)
- INVOKE_ASYNC(src, .proc/new_hairstyle, H, user, mirror)
+ INVOKE_ASYNC(src, PROC_REF(new_hairstyle), H, user, mirror)
return
else
if(!(HAIR in H.dna.species.species_traits))
diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm
index c42db9624f..6a63213adc 100644
--- a/code/game/objects/items/crab17.dm
+++ b/code/game/objects/items/crab17.dm
@@ -78,7 +78,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
/obj/structure/checkoutmachine/Destroy()
@@ -172,7 +172,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)
@@ -209,7 +209,7 @@
/obj/effect/dumpeetTarget/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))
@@ -219,7 +219,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
/obj/effect/dumpeetTarget/Destroy()
dump = null
diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm
index 40038d2e7f..8b0111c7c0 100644
--- a/code/game/objects/items/debug_items.dm
+++ b/code/game/objects/items/debug_items.dm
@@ -65,7 +65,7 @@
"Scalpel" = image(icon = 'icons/obj/surgery.dmi', icon_state = "scalpel"),
"Saw" = image(icon = 'icons/obj/surgery.dmi', icon_state = "saw")
)
- 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 819bb6c969..f5641d8724 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -289,8 +289,8 @@
/obj/item/shockpaddles/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(!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
@@ -320,7 +320,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()
. = ..()
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 2b65f4351e..5f9cea98be 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -551,7 +551,7 @@ GLOBAL_LIST_EMPTY(PDAs)
update_label()
if (!silent)
playsound(src, 'sound/machines/terminal_processing.ogg', 15, 1)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/machines/terminal_success.ogg', 15, 1), 13)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(playsound), src, 'sound/machines/terminal_success.ogg', 15, 1), 13)
if("Eject")//Ejects the cart, only done from hub.
if (!isnull(cartridge))
diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm
index e857b7dbd5..554b82b111 100644
--- a/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -10,7 +10,7 @@
/obj/item/pda/clown/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/slippery, 120, NO_SLIP_WHEN_WALKING|SLIP_WHEN_JOGGING, CALLBACK(src, .proc/AfterSlip))
+ AddComponent(/datum/component/slippery, 120, NO_SLIP_WHEN_WALKING|SLIP_WHEN_JOGGING, CALLBACK(src, PROC_REF(AfterSlip)))
/obj/item/pda/clown/proc/AfterSlip(mob/living/carbon/human/M)
if (istype(M) && (M.real_name != owner))
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index be9244d245..0a3d635218 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -642,7 +642,7 @@ Code:
playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
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))
playsound(src, 'sound/machines/terminal_select.ogg', 50, 1)
if("Signal Frequency")
diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm
index 2cb4922f36..ed9245c0df 100644
--- a/code/game/objects/items/devices/desynchronizer.dm
+++ b/code/game/objects/items/devices/desynchronizer.dm
@@ -57,7 +57,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/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm
index c2e16c978d..4f33cac318 100644
--- a/code/game/objects/items/devices/dogborg_sleeper.dm
+++ b/code/game/objects/items/devices/dogborg_sleeper.dm
@@ -435,7 +435,7 @@
update_gut(hound)
if(cleaning)
- addtimer(CALLBACK(src, .proc/clean_cycle, hound), 50)
+ addtimer(CALLBACK(src, PROC_REF(clean_cycle), hound), 50)
/obj/item/dogborg/sleeper/proc/CheckAccepted(obj/item/I)
return is_type_in_typecache(I, important_items)
diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
index 5ed2cbd481..82e1f1fbec 100644
--- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
+++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm
@@ -43,7 +43,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 4caf9ee0aa..278f75ac28 100644
--- a/code/game/objects/items/devices/geiger_counter.dm
+++ b/code/game/objects/items/devices/geiger_counter.dm
@@ -141,7 +141,7 @@
if(user.a_intent == INTENT_HELP)
if(!(obj_flags & EMAGGED))
user.visible_message(span_notice("[user] scans [target] with [src]."), span_notice("You scan [target]'s radiation levels with [src]..."))
- addtimer(CALLBACK(src, .proc/scan, target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents
+ addtimer(CALLBACK(src, PROC_REF(scan), target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents
else
user.visible_message(span_notice("[user] scans [target] with [src]."), span_danger("You project [src]'s stored radiation into [target]!"))
target.rad_act(radiation_count)
@@ -222,7 +222,7 @@
return
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_ATOM_RAD_ACT)
- RegisterSignal(user, COMSIG_ATOM_RAD_ACT, .proc/redirect_rad_act)
+ RegisterSignal(user, COMSIG_ATOM_RAD_ACT, PROC_REF(redirect_rad_act))
listeningTo = user
/obj/item/geiger_counter/cyborg/proc/redirect_rad_act(datum/source, amount)
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index a3de2d822f..e716156eac 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)
- 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/portable_chem_mixer.dm b/code/game/objects/items/devices/portable_chem_mixer.dm
index 8622873c87..a8fb2f52c7 100644
--- a/code/game/objects/items/devices/portable_chem_mixer.dm
+++ b/code/game/objects/items/devices/portable_chem_mixer.dm
@@ -114,7 +114,7 @@
if (loc != user)
return ..()
if(SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED))
- INVOKE_ASYNC(src, /datum.proc/ui_interact, user)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/datum, ui_interact), user)
/obj/item/storage/portable_chem_mixer/attack_self(mob/user)
if(loc == user)
diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm
index 47dcaae60e..dcfc74eaaa 100644
--- a/code/game/objects/items/devices/pressureplates.dm
+++ b/code/game/objects/items/devices/pressureplates.dm
@@ -44,7 +44,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/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 10a85a8593..ad092b02d1 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -202,7 +202,7 @@
spans = list(M.speech_span)
if(!language)
language = M.get_selected_language()
- INVOKE_ASYNC(src, .proc/talk_into_impl, M, message, channel, spans.Copy(), language)
+ INVOKE_ASYNC(src, PROC_REF(talk_into_impl), M, message, channel, spans.Copy(), language)
return ITALICS | REDUCE_RANGE
/obj/item/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language)
@@ -273,7 +273,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)
diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm
index 48206ba867..84d4b4986d 100644
--- a/code/game/objects/items/devices/reverse_bear_trap.dm
+++ b/code/game/objects/items/devices/reverse_bear_trap.dm
@@ -43,7 +43,7 @@
soundloop.stop()
soundloop2.stop()
to_chat(loc, span_userdanger("*ding*"))
- addtimer(CALLBACK(src, .proc/snap), 2)
+ addtimer(CALLBACK(src, PROC_REF(snap)), 2)
/obj/item/reverse_bear_trap/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags)
if(iscarbon(user))
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 34c0b809c4..5c48b5a4e8 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -1013,7 +1013,7 @@ GENETICS 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/swapper.dm b/code/game/objects/items/devices/swapper.dm
index 08646efd98..cd9c042f67 100644
--- a/code/game/objects/items/devices/swapper.dm
+++ b/code/game/objects/items/devices/swapper.dm
@@ -56,7 +56,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 dea3bda144..d181a02656 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -97,7 +97,7 @@ effective or pretty fucking useless.
addtimer(VARSET_CALLBACK(src, icon_state, "health"), cooldown)
if(knowledge)
to_chat(user, "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)
else
if(knowledge)
to_chat(user, "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 7aafd729ea..34f7d10b02 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -161,7 +161,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
@@ -246,7 +246,7 @@
merge_gases()
for(var/i in 1 to 6)
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 20 + (i - 1) * 10)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 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 dc1a9fbd49..f326d0900c 100644
--- a/code/game/objects/items/dualsaber.dm
+++ b/code/game/objects/items/dualsaber.dm
@@ -86,8 +86,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))
/obj/item/dualsaber/ComponentInitialize()
. = ..()
@@ -182,7 +182,7 @@
impale(user)
return
if(spinnable && (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)
for(var/i in list(NORTH,SOUTH,EAST,WEST,EAST,SOUTH,NORTH,SOUTH,EAST,WEST,EAST,SOUTH))
@@ -236,7 +236,7 @@
add_fingerprint(user)
// Light your candles while spinning around the room
if(spinnable)
- 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 046f7ea1ab..ff15511092 100644
--- a/code/game/objects/items/eightball.dm
+++ b/code/game/objects/items/eightball.dm
@@ -67,7 +67,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/electrostaff.dm b/code/game/objects/items/electrostaff.dm
index 70a25bc9f9..4935eceea1 100644
--- a/code/game/objects/items/electrostaff.dm
+++ b/code/game/objects/items/electrostaff.dm
@@ -67,8 +67,8 @@
. = ..()
if(ispath(cell))
cell = new cell
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/turn_on)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/turn_off)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(turn_on))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(turn_off))
/obj/item/electrostaff/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/fireaxe.dm b/code/game/objects/items/fireaxe.dm
index c865eedf6a..7db530b0da 100644
--- a/code/game/objects/items/fireaxe.dm
+++ b/code/game/objects/items/fireaxe.dm
@@ -23,8 +23,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/grenades/antigravity.dm b/code/game/objects/items/grenades/antigravity.dm
index b6700599a3..09cbace9a8 100644
--- a/code/game/objects/items/grenades/antigravity.dm
+++ b/code/game/objects/items/grenades/antigravity.dm
@@ -13,6 +13,6 @@
for(var/turf/T in view(range,src))
T.AddElement(/datum/element/forced_gravity, forced_value)
- addtimer(CALLBACK(T, /datum/.proc/_RemoveElement, list(forced_value)), duration)
+ addtimer(CALLBACK(T, TYPE_PROC_REF(/datum, _RemoveElement), list(forced_value)), duration)
qdel(src)
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 3d35f7eb24..7a834122b6 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -309,7 +309,7 @@
message_admins("grenade primed by an assembly at [AREACOORD(DT)], attached by [ADMIN_LOOKUPFLW(M)] and last touched by [ADMIN_LOOKUPFLW(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name]).")
log_game("grenade primed by an assembly at [AREACOORD(DT)], attached by [key_name(M)] and last touched by [key_name(last)] ([nadeassembly.a_left.name] and [nadeassembly.a_right.name])")
else
- addtimer(CALLBACK(src, .proc/prime), det_time)
+ addtimer(CALLBACK(src, PROC_REF(prime)), det_time)
log_game("A grenade detonated at [AREACOORD(DT)]")
return TRUE
diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm
index 94438652ee..ade2851d85 100644
--- a/code/game/objects/items/grenades/clusterbuster.dm
+++ b/code/game/objects/items/grenades/clusterbuster.dm
@@ -58,7 +58,7 @@
var/steps = rand(1,4)
for(var/i in 1 to steps)
step_away(src,loc)
- addtimer(CALLBACK(src, .proc/prime), rand(15,60))
+ addtimer(CALLBACK(src, PROC_REF(prime)), rand(15,60))
/obj/item/grenade/clusterbuster/segment/prime(mob/living/lanced_by)
new payload_spawner(drop_location(), payload, rand(min_spawned,max_spawned))
diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm
index fb98e86ae1..a7d55fa2e4 100644
--- a/code/game/objects/items/grenades/grenade.dm
+++ b/code/game/objects/items/grenades/grenade.dm
@@ -110,7 +110,7 @@
playsound(src, 'sound/weapons/armbomb.ogg', volume, 1)
active = TRUE
icon_state = initial(icon_state) + "_active"
- addtimer(CALLBACK(src, .proc/prime), isnull(delayoverride)? det_time : delayoverride)
+ addtimer(CALLBACK(src, PROC_REF(prime)), isnull(delayoverride)? det_time : delayoverride)
/obj/item/grenade/proc/prime(mob/living/lanced_by)
var/turf/T = get_turf(src)
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 1ae396b28b..6b3ab67ef3 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -62,7 +62,7 @@
if(!QDELETED(target))
location = get_turf(target)
target.cut_overlay(plastic_overlay)
- UnregisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/add_plastic_overlay)
+ UnregisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(add_plastic_overlay))
if(!ismob(target) || full_damage_on_mobs)
target.ex_act(EXPLODE_HEAVY, target)
else
@@ -129,11 +129,11 @@
I.embedding["embed_chance"] = 0
I.updateEmbedding()
- RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/add_plastic_overlay)
+ RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(add_plastic_overlay))
target.update_icon()
if(!nadeassembly)
to_chat(user, "You plant the bomb. Timer counting down from [det_time].")
- addtimer(CALLBACK(src, .proc/prime), det_time*10)
+ addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10)
else
qdel(src) //How?
diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm
index e3a3d72579..c18e74dd21 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/hand_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/hand_item/circlegame/proc/waitASecond(mob/living/owner, mob/living/sucker)
@@ -43,10 +43,10 @@
if(owner == sucker) // big mood
to_chat(owner, "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, "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/hand_item/circlegame/proc/selfGottem(mob/living/owner)
@@ -341,7 +341,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??", "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??", "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 f868dfd3b9..230567d6ad 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -334,7 +334,7 @@
/obj/item/restraints/legcuffs/beartrap/energy/New()
..()
- addtimer(CALLBACK(src, .proc/dissipate), 100)
+ addtimer(CALLBACK(src, PROC_REF(dissipate)), 100)
/obj/item/restraints/legcuffs/beartrap/energy/proc/dissipate()
if(!ismob(loc))
diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm
index 2e5315ec1a..3e35b31857 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)
GLOB.poi_list += src
- RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, .proc/move_gracefully)
+ RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, PROC_REF(move_gracefully))
/obj/item/his_grace/Destroy()
STOP_PROCESSING(SSprocessing, src)
@@ -42,7 +42,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 451df23a49..f2ef6380ee 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -255,7 +255,7 @@
nullrod_icons = sort_list(nullrod_icons)
- var/choice = show_radial_menu(L, src , nullrod_icons, custom_check = CALLBACK(src, .proc/check_menu, L), radius = 42, require_near = TRUE)
+ var/choice = show_radial_menu(L, src , nullrod_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), L), radius = 42, require_near = TRUE)
if(!choice || !check_menu(L))
return
@@ -733,7 +733,7 @@
playsound(get_turf(user), 'sound/effects/woodhit.ogg', 75, 1, -1)
H.adjustStaminaLoss(rand(12,18))
if(prob(25))
- (INVOKE_ASYNC(src, .proc/jedi_spin, user))
+ (INVOKE_ASYNC(src, PROC_REF(jedi_spin), user))
else
return ..()
diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm
index 347ec118fd..e0dbf12c10 100644
--- a/code/game/objects/items/hot_potato.dm
+++ b/code/game/objects/items/hot_potato.dm
@@ -136,7 +136,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)
var/turf/T = get_turf(src)
message_admins("[user? "[ADMIN_LOOKUPFLW(user)] has primed [src]" : "A [src] has been primed"] (Timer:[delay],Explosive:[detonate_explosion],Range:[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_fire_range]) for detonation at [ADMIN_VERBOSEJMP(T)]")
diff --git a/code/game/objects/items/implants/implant_deathrattle.dm b/code/game/objects/items/implants/implant_deathrattle.dm
index 826dc71843..f658d84851 100644
--- a/code/game/objects/items/implants/implant_deathrattle.dm
+++ b/code/game/objects/items/implants/implant_deathrattle.dm
@@ -62,7 +62,7 @@
/obj/item/implant/deathrattle/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE)
. = ..()
if(.)
- RegisterSignal(target, COMSIG_LIVING_PREDEATH, .proc/on_predeath)
+ RegisterSignal(target, COMSIG_LIVING_PREDEATH, PROC_REF(on_predeath))
if(!group)
to_chat(target, "You hear a strange, robotic voice in your head... \"Warning: No other linked implants detected.\"")
diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm
index 370924063d..489cef3d39 100644
--- a/code/game/objects/items/implants/implant_explosive.dm
+++ b/code/game/objects/items/implants/implant_explosive.dm
@@ -37,7 +37,7 @@
popup = FALSE
if(response == "No")
return FALSE
- addtimer(CALLBACK(src, .proc/timed_explosion, cause), 1)
+ addtimer(CALLBACK(src, PROC_REF(timed_explosion), cause), 1)
/obj/item/implant/explosive/implant(mob/living/target)
for(var/X in target.implants)
@@ -65,10 +65,10 @@
if(delay > 7)
imp_in?.visible_message("[imp_in] starts beeping ominously!")
playsound(get_turf(imp_in ? imp_in : src), 'sound/items/timer.ogg', 30, 0)
- addtimer(CALLBACK(src, .proc/double_pain, TRUE), delay * 0.25)
- addtimer(CALLBACK(src, .proc/double_pain), delay * 0.5)
- addtimer(CALLBACK(src, .proc/double_pain), delay * 0.75)
- addtimer(CALLBACK(src, .proc/boom_goes_the_weasel), delay)
+ addtimer(CALLBACK(src, PROC_REF(double_pain), TRUE), delay * 0.25)
+ addtimer(CALLBACK(src, PROC_REF(double_pain)), delay * 0.5)
+ addtimer(CALLBACK(src, PROC_REF(double_pain)), delay * 0.75)
+ addtimer(CALLBACK(src, PROC_REF(boom_goes_the_weasel)), delay)
else //If the delay is short, just blow up already jeez
boom_goes_the_weasel()
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index 6d8ae34ef5..e28b414f23 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -57,7 +57,7 @@
. = ..()
if(.)
update_position()
- RegisterSignal(imp_in, COMSIG_MOVABLE_MOVED, .proc/update_position)
+ RegisterSignal(imp_in, COMSIG_MOVABLE_MOVED, PROC_REF(update_position))
/obj/item/implant/warp/removed(mob/living/source, silent, special)
. = ..()
diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm
index 219e4fdd68..6888ccf1da 100644
--- a/code/game/objects/items/implants/implant_stealth.dm
+++ b/code/game/objects/items/implants/implant_stealth.dm
@@ -36,7 +36,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/movable/A)
. = ..()
diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
index 9f27eba643..5d57c9ee69 100644
--- a/code/game/objects/items/melee/misc.dm
+++ b/code/game/objects/items/melee/misc.dm
@@ -139,8 +139,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)
diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm
index d1ceb36b6d..f24ea18eec 100644
--- a/code/game/objects/items/pinpointer.dm
+++ b/code/game/objects/items/pinpointer.dm
@@ -61,7 +61,7 @@
if(target)
unset_target()
target = newtarget
- RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/unset_target)
+ RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(unset_target))
/obj/item/pinpointer/proc/unset_target()
if(!target)
diff --git a/code/game/objects/items/pitchfork.dm b/code/game/objects/items/pitchfork.dm
index eff586cf11..1aa4f3a7a4 100644
--- a/code/game/objects/items/pitchfork.dm
+++ b/code/game/objects/items/pitchfork.dm
@@ -17,8 +17,8 @@
/obj/item/pitchfork/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/pitchfork/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index 2e881a333f..dc46bd0aa9 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -854,7 +854,7 @@ GLOBAL_LIST_INIT(valid_plushie_paths, valid_plushie_paths())
if(!H)
return //Type safety.
H.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
- addtimer(CALLBACK(H, /mob/living/carbon/human.proc/dropItemToGround, src, TRUE), 1)
+ addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, dropItemToGround), src, TRUE), 1)
/obj/item/toy/plush/plushling/New()
var/initial_state = pick("plushie_lizard", "plushie_snake", "plushie_slime", "fox")
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index ca5406b786..9c86a6ee7b 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -366,7 +366,7 @@
if(charging)
return
if(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()
diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm
index 1363f0994c..af9803f41f 100644
--- a/code/game/objects/items/shields.dm
+++ b/code/game/objects/items/shields.dm
@@ -530,7 +530,7 @@
/obj/item/shield/riot/implant/Moved()
. = ..()
if(istype(loc, /obj/item/organ/cyberimp/arm/shield))
- recharge_timerid = addtimer(CALLBACK(src, .proc/recharge), recharge_delay, flags = TIMER_STOPPABLE)
+ recharge_timerid = addtimer(CALLBACK(src, PROC_REF(recharge)), recharge_delay, flags = TIMER_STOPPABLE)
else //extending
if(recharge_timerid)
deltimer(recharge_timerid)
diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm
index b9d66a5bd0..33ee0957d3 100644
--- a/code/game/objects/items/singularityhammer.dm
+++ b/code/game/objects/items/singularityhammer.dm
@@ -19,8 +19,8 @@
/obj/item/singularityhammer/New()
..()
- 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))
START_PROCESSING(SSobj, src)
/obj/item/singularityhammer/ComponentInitialize()
@@ -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 14fb5062ad..200b803b83 100644
--- a/code/game/objects/items/spear.dm
+++ b/code/game/objects/items/spear.dm
@@ -27,8 +27,8 @@
/obj/item/spear/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/spear/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm
index defdfd6402..78c514e6d9 100644
--- a/code/game/objects/items/stacks/medical.dm
+++ b/code/game/objects/items/stacks/medical.dm
@@ -28,7 +28,7 @@
/obj/item/stack/medical/attack(mob/living/M, mob/user)
. = ..()
- INVOKE_ASYNC(src, .proc/try_heal, M, user)
+ INVOKE_ASYNC(src, PROC_REF(try_heal), M, user)
/obj/item/stack/medical/proc/try_heal(mob/living/M, mob/user, silent = FALSE)
if(!M.can_inject(user, TRUE))
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 982ad5f34a..225d72a182 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -68,7 +68,7 @@
if(merge)
for(var/obj/item/stack/S in loc)
if(can_merge(S))
- INVOKE_ASYNC(src, .proc/merge, S)
+ INVOKE_ASYNC(src, PROC_REF(merge), S)
var/list/temp_recipes = get_main_recipes()
recipes = temp_recipes.Copy()
if(material_type)
@@ -505,7 +505,7 @@
switch(option)
if("Custom")
var/list/sort_numbers = quick_split
- sort_numbers = sort_list(sort_numbers, /proc/cmp_numeric_text_desc)
+ sort_numbers = sort_list(sort_numbers, GLOBAL_PROC_REF(cmp_numeric_text_desc))
option_display.maptext = MAPTEXT("?")
quick_split = list("Custom" = option_display)
quick_split += sort_numbers
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 56ad6c2534..e080310b68 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -131,7 +131,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(mob/user)
diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm
index 3a8f5a5cc8..91c18a5941 100644
--- a/code/game/objects/items/storage/book.dm
+++ b/code/game/objects/items/storage/book.dm
@@ -60,7 +60,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "bible",
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 33465b82b3..12459bdf27 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -909,7 +909,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/summon.dm b/code/game/objects/items/summon.dm
index 7cdc540f17..3bcaf4524f 100644
--- a/code/game/objects/items/summon.dm
+++ b/code/game/objects/items/summon.dm
@@ -48,11 +48,11 @@
/obj/item/summon/dropped(mob/user, silent)
. = ..()
- addtimer(CALLBACK(src, .proc/check_activation), 0, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(check_activation)), 0, TIMER_UNIQUE)
/obj/item/summon/equipped(mob/user, slot)
. = ..()
- addtimer(CALLBACK(src, .proc/check_activation), 0, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(check_activation)), 0, TIMER_UNIQUE)
/obj/item/summon/proc/check_activation()
if(!host)
@@ -346,7 +346,7 @@
Wake()
/datum/summon_weapon/proc/ResetIn(ds)
- reset_timerid = addtimer(CALLBACK(src, .proc/Reset), ds, TIMER_STOPPABLE)
+ reset_timerid = addtimer(CALLBACK(src, PROC_REF(Reset)), ds, TIMER_STOPPABLE)
/datum/summon_weapon/proc/Target(atom/victim)
if(!istype(victim) || !isturf(victim.loc) || (host && !host.CheckTarget(victim)))
@@ -364,7 +364,7 @@
/datum/summon_weapon/proc/AnimationLock(duration)
if(animation_timerid)
deltimer(animation_timerid)
- animation_timerid = addtimer(CALLBACK(src, .proc/Act), duration, TIMER_CLIENT_TIME | TIMER_STOPPABLE)
+ animation_timerid = addtimer(CALLBACK(src, PROC_REF(Act)), duration, TIMER_CLIENT_TIME | TIMER_STOPPABLE)
/datum/summon_weapon/proc/Act()
animation_timerid = null
@@ -378,7 +378,7 @@
state = STATE_RECOVER
// register hit at the halfway mark
// we can do better math to approximate when the attack will hit but i'm too tired to bother
- addtimer(CALLBACK(src, .proc/Hit, victim), attack_length / 2, TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(src, PROC_REF(Hit), victim), attack_length / 2, TIMER_CLIENT_TIME)
// we need to approximate our incoming angle - again, better math exists but why bother
var/incoming_angle = angle
if(isturf(atom.loc) && (atom.loc != victim.loc))
@@ -398,7 +398,7 @@
return
var/reset_angle = rand(0, 360)
AnimationLock(MoveTo(host.master, null, reset_angle, 30, 90, reset_speed))
- addtimer(CALLBACK(src, .proc/Orbit, host.master, reset_angle, 30, 3 SECONDS), reset_speed, TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(src, PROC_REF(Orbit), host.master, reset_angle, 30, 3 SECONDS), reset_speed, TIMER_CLIENT_TIME)
if(STATE_RECOVER)
state = STATE_ATTACK
AnimationLock(Rotate(rand(-angle_vary, angle_vary), attack_speed, null))
@@ -526,7 +526,7 @@
locked = target
forceMove(locked.loc)
if(ismovable(locked))
- RegisterSignal(locked, COMSIG_MOVABLE_MOVED, .proc/Update)
+ RegisterSignal(locked, COMSIG_MOVABLE_MOVED, PROC_REF(Update))
/atom/movable/summon_weapon_effect/proc/Release()
if(ismovable(locked))
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index 25e2f1a292..6a130acce6 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -56,7 +56,7 @@
on = TRUE
icon_state = "[initial(icon_state)]-on"
ion_trail.start()
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/move_react)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
if(full_speed)
user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
else
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index b0b6a7a973..3c3460bcfc 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -184,8 +184,8 @@
var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(T)), 300, 1, null, atmos_link_override)
if(!(LAZYLEN(created) == 2))
return
- RegisterSignal(created[1], COMSIG_PARENT_QDELETING, .proc/on_portal_destroy) //Gosh darn it kevinz.
- RegisterSignal(created[2], COMSIG_PARENT_QDELETING, .proc/on_portal_destroy)
+ RegisterSignal(created[1], COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy)) //Gosh darn it kevinz.
+ RegisterSignal(created[2], COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy))
try_move_adjacent(created[1], user.dir)
active_portal_pairs[created[1]] = created[2]
var/obj/effect/portal/c1 = created[1]
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index b40c5c22cf..736dec1349 100644
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -65,7 +65,7 @@
core = ncore
icon_state = "core_container_loaded"
to_chat(user, "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()
@@ -201,7 +201,7 @@
T.icon_state = "supermatter_tongs"
icon_state = "core_container_loaded"
to_chat(user, "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/toys.dm b/code/game/objects/items/toys.dm
index a40d319002..f92c3659f8 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -410,7 +410,7 @@
active = TRUE
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, "[src] is already active.")
@@ -551,7 +551,7 @@
/obj/effect/decal/cleanable/ash/snappop_phoenix/Initialize(mapload)
. = ..()
if(!QDELETED(src))
- 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))
@@ -910,7 +910,7 @@
if(!(cardUser.mobility_flags & MOBILITY_USE))
return
var/O = src
- var/choice = show_radial_menu(usr,src, handradial, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE)
+ var/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
var/obj/item/toy/cards/singlecard/C = new/obj/item/toy/cards/singlecard(cardUser.loc)
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index e4c71ee6ff..b21277e6a5 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -1181,8 +1181,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
/obj/item/vibro_weapon/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/vibro_weapon/ComponentInitialize()
. = ..()
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index e7ab7214b7..71aafe9a1e 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -234,7 +234,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), 10)
+ addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
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/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index 6c30b20ccd..2aab290ee7 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -224,7 +224,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)
obj_integrity = integrity_failure * max_integrity
@@ -278,7 +278,7 @@
status = BURST
update_icon()
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)
if(child)
diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm
index 91c43dc238..0740f09d1d 100644
--- a/code/game/objects/structures/barsigns.dm
+++ b/code/game/objects/structures/barsigns.dm
@@ -111,7 +111,7 @@
return
obj_flags |= EMAGGED
to_chat(user, "You emag the barsign. Takeover in progress...")
- addtimer(CALLBACK(src, .proc/syndie_bar_good), 10 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(syndie_bar_good)), 10 SECONDS)
return TRUE
/obj/structure/sign/barsign/proc/syndie_bar_good()
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index d5b1e7a244..9f115af180 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -24,11 +24,11 @@
/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)
/obj/structure/chair/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, .proc/can_user_rotate),CALLBACK(src, .proc/can_be_rotated),null)
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate)),CALLBACK(src, PROC_REF(can_be_rotated)),null)
/obj/structure/chair/proc/can_be_rotated(mob/user)
return TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index d90d44ddfd..c80405872f 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -42,7 +42,7 @@
/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), 0)
+ addtimer(CALLBACK(src, PROC_REF(take_contents)), 0)
. = ..()
update_icon()
if(should_populate_contents)
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 1d6826b548..a5853f769e 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -26,7 +26,7 @@
step(src, direction)
user.setDir(direction)
if(oldloc != loc)
- addtimer(CALLBACK(src, .proc/ResetMoveDelay), (use_mob_movespeed ? user.movement_delay() : CONFIG_GET(number/movedelay/walk_delay)) * move_speed_multiplier)
+ addtimer(CALLBACK(src, PROC_REF(ResetMoveDelay)), (use_mob_movespeed ? user.movement_delay() : CONFIG_GET(number/movedelay/walk_delay)) * move_speed_multiplier)
else
ResetMoveDelay()
diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm
index f64397df09..164368e54c 100644
--- a/code/game/objects/structures/divine.dm
+++ b/code/game/objects/structures/divine.dm
@@ -41,7 +41,7 @@
to_chat(user, "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_icon()
- addtimer(CALLBACK(src, /atom/.proc/update_icon), time_between_uses)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), time_between_uses)
/obj/structure/healingfountain/update_icon_state()
diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm
index d62528ebf8..dee1e75dc9 100644
--- a/code/game/objects/structures/electricchair.dm
+++ b/code/game/objects/structures/electricchair.dm
@@ -45,7 +45,7 @@
var/mob/living/buckled_mob = m
buckled_mob.electrocute_act(85, src, 1)
to_chat(buckled_mob, "You feel a deep shock course through your body!")
- addtimer(CALLBACK(buckled_mob, /mob/living.proc/electrocute_act, 85, src, 1), 1)
+ addtimer(CALLBACK(buckled_mob, TYPE_PROC_REF(/mob/living, electrocute_act), 85, src, 1), 1)
visible_message("The electric chair went off!", "You hear a deep sharp shock!")
/obj/structure/chair/e_chair/Destroy()
diff --git a/code/game/objects/structures/femur_breaker.dm b/code/game/objects/structures/femur_breaker.dm
index cb829006d0..01999656ea 100644
--- a/code/game/objects/structures/femur_breaker.dm
+++ b/code/game/objects/structures/femur_breaker.dm
@@ -45,7 +45,7 @@
if (BREAKER_SLAT_DROPPED)
slat_status = BREAKER_SLAT_MOVING
icon_state = "breaker_raise"
- addtimer(CALLBACK(src, .proc/raise_slat), BREAKER_ANIMATION_LENGTH)
+ addtimer(CALLBACK(src, PROC_REF(raise_slat)), BREAKER_ANIMATION_LENGTH)
return
if (BREAKER_SLAT_RAISED)
if (LAZYLEN(buckled_mobs))
@@ -95,7 +95,7 @@
playsound(src, 'sound/effects/femur_breaker.ogg', 100, FALSE)
H.Stun(BREAKER_ANIMATION_LENGTH)
- addtimer(CALLBACK(src, .proc/damage_leg, H), BREAKER_ANIMATION_LENGTH, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(damage_leg), H), BREAKER_ANIMATION_LENGTH, TIMER_UNIQUE)
log_combat(user, H, "femur broke", src)
slat_status = BREAKER_SLAT_DROPPED
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 4861859cec..2cb3ea90ed 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -317,7 +317,7 @@
/obj/item/kirbyplants/ComponentInitialize()
. = ..()
AddElement(/datum/element/tactical)
- addtimer(CALLBACK(src, /datum.proc/_AddElement, list(/datum/element/beauty, 500)), 0)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/datum, _AddElement), list(/datum/element/beauty, 500)), 0)
AddComponent(/datum/component/two_handed, require_twohands=TRUE, force_unwielded=10, force_wielded=10)
/obj/item/kirbyplants/random
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 5a26fed2bd..90716557f1 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -484,7 +484,7 @@
id.update_label()
else
to_chat(L, "Your owner is already dead! You will soon perish.")
- addtimer(CALLBACK(L, /mob.proc/dust, 150)) //Give em a few seconds as a mercy.
+ addtimer(CALLBACK(L, TYPE_PROC_REF(/mob, dust), 150)) //Give em a few seconds as a mercy.
/datum/outfit/demonic_friend
name = "Demonic Friend"
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 604961abf4..a20162a2fb 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -64,7 +64,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))
@@ -77,7 +77,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
@@ -90,7 +90,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
@@ -133,7 +133,7 @@
for(var/mob/M in fov_viewers(world.view, src))
var/mob/living/carbon/human/C = M
if (ishuman(M))
- addtimer(CALLBACK(C, /mob/.proc/emote, "clap"), delay_offset * 0.3)
+ addtimer(CALLBACK(C, TYPE_PROC_REF(/mob, emote), "clap"), delay_offset * 0.3)
delay_offset++
else
H.apply_damage(15 * blade_sharpness, BRUTE, head)
diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm
index f58ba5d617..2410ae6ed8 100644
--- a/code/game/objects/structures/hivebot.dm
+++ b/code/game/objects/structures/hivebot.dm
@@ -15,7 +15,7 @@
smoke.start()
visible_message("[src] warps in!")
playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
- 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 0ebccf819e..ed9a352dd0 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -195,7 +195,7 @@
var/mob/living/M = user
M.electrocute_act(15,"Energy Barrier", flags = SHOCK_NOGLOVES)
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)
@@ -207,4 +207,4 @@
var/mob/living/M = AM
M.electrocute_act(15,"Energy Barrier", flags = SHOCK_NOGLOVES)
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 16e0566d68..d51922883b 100644
--- a/code/game/objects/structures/icemoon/cave_entrance.dm
+++ b/code/game/objects/structures/icemoon/cave_entrance.dm
@@ -112,7 +112,7 @@ GLOBAL_LIST_INIT(ore_probability, list(/obj/item/stack/ore/uranium = 50,
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE)
visible_message("[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)
/obj/effect/collapsing_demonic_portal/proc/collapse()
visible_message("Something slips out of [src]!")
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 5075ecd074..1f1ac7c263 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -111,7 +111,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 ab23ab97e0..9fefe0c676 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -97,7 +97,7 @@
)
if (up && down)
- var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, 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 6a3dcc761f..6d4970338b 100644
--- a/code/game/objects/structures/lavaland/necropolis_tendril.dm
+++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm
@@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(tendrils, list())
visible_message("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")
visible_message("Something falls free of the tendril!")
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, 1, 1)
- 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 52986a44d7..e6d9516997 100644
--- a/code/game/objects/structures/life_candle.dm
+++ b/code/game/objects/structures/life_candle.dm
@@ -35,7 +35,7 @@
linked_minds |= user.mind
update_icon()
- INVOKE_ASYNC(src, /atom/movable.proc/float, linked_minds.len)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, float), linked_minds.len)
if(linked_minds.len)
START_PROCESSING(SSobj, src)
set_light(lit_luminosity)
@@ -64,7 +64,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/manned_turret.dm b/code/game/objects/structures/manned_turret.dm
index ffd22a2de4..4e102c77e7 100644
--- a/code/game/objects/structures/manned_turret.dm
+++ b/code/game/objects/structures/manned_turret.dm
@@ -142,7 +142,7 @@
/obj/machinery/manned_turret/proc/volley(mob/user)
target_turf = get_turf(target)
for(var/i in 1 to number_of_shots)
- addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/manned_turret, fire_helper), user), i*rate_of_fire)
/obj/machinery/manned_turret/proc/fire_helper(mob/user)
if(user.incapacitated() || !(user in buckled_mobs))
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index 61563fc8c5..da967adfbf 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -95,7 +95,7 @@
isSwitchingStates = 0
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 || state != 1)
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index ff85f5b2eb..e4d310b0a3 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -30,7 +30,7 @@
var/action = anchored ? "unscrews [src] from" : "screws [src] to"
var/uraction = anchored ? "unscrew [src] from " : "screw [src] to"
user.visible_message("[user] [action] the floor.", "You start to [uraction] the floor...", "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)))
setAnchored(!anchored)
to_chat(user, " You [anchored ? "unscrew" : "screw"] [src] from the floor.")
return TRUE
diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm
index bfe6d8beee..d216e138be 100644
--- a/code/game/objects/structures/railings.dm
+++ b/code/game/objects/structures/railings.dm
@@ -16,7 +16,7 @@
/obj/structure/railing/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src, .proc/can_be_rotated),CALLBACK(src,.proc/after_rotation))
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src, PROC_REF(can_be_rotated)),CALLBACK(src, PROC_REF(after_rotation)))
/obj/structure/railing/Initialize(mapload)
. = ..()
@@ -59,7 +59,7 @@
if(flags_1&NODECONSTRUCT_1)
return
to_chat(user, "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)))
setAnchored(!anchored)
to_chat(user, "You [anchored ? "fasten the railing to":"unfasten the railing from"] the floor.")
return TRUE
diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm
index 7a5f60d47e..176faddb3a 100644
--- a/code/game/objects/structures/stairs.dm
+++ b/code/game/objects/structures/stairs.dm
@@ -108,7 +108,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/statues.dm b/code/game/objects/structures/statues.dm
index c3eed136be..3646187d13 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -22,7 +22,7 @@
/obj/structure/statue/ComponentInitialize()
. = ..()
var/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS
- AddComponent(/datum/component/simple_rotation, rotation_flags, null, CALLBACK(src, .proc/can_be_rotated))
+ AddComponent(/datum/component/simple_rotation, rotation_flags, null, CALLBACK(src, PROC_REF(can_be_rotated)))
/obj/structure/statue/proc/can_be_rotated(mob/user, rotation_type)
if(anchored)
@@ -388,7 +388,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="info")
/obj/item/chisel/dropped(mob/user, silent)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 3325710938..c1f0c6a2dd 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -321,7 +321,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)
if(newloc != loc) //Did we not move with the table? because that shit's ok
@@ -370,7 +370,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)
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 c9d9f9dd41..f6325c04bd 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
@@ -27,7 +27,7 @@
/obj/structure/c_transit_tube/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS,null,null,CALLBACK(src,.proc/after_rot))
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS,null,null,CALLBACK(src,PROC_REF(after_rot)))
/obj/structure/c_transit_tube/proc/after_rot(mob/user,rotation_type)
if(flipped_build_type && rotation_type == ROTATION_FLIP)
@@ -45,7 +45,7 @@
return
to_chat(user, "You start attaching the [name]...")
add_fingerprint(user)
- if(I.use_tool(src, user, time_to_unwrench, volume=50, extra_checks=CALLBACK(src, .proc/can_wrench_in_loc, user)))
+ if(I.use_tool(src, user, time_to_unwrench, volume=50, extra_checks=CALLBACK(src, PROC_REF(can_wrench_in_loc), user)))
to_chat(user, "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/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 7fc2bab6fd..19cff28536 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -332,10 +332,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 && watertemp != "freezing")
- addtimer(CALLBACK(src, .proc/make_mist), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(make_mist)), 5 SECONDS)
if(mist && (!on || watertemp == "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/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 4f1de6432a..fd25602847 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -313,7 +313,7 @@
/obj/structure/windoor_assembly/ComponentInitialize()
. = ..()
var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS
- AddComponent(/datum/component/simple_rotation, rotation_flags, can_be_rotated=CALLBACK(src, .proc/can_be_rotated), after_rotation=CALLBACK(src,.proc/after_rotation))
+ AddComponent(/datum/component/simple_rotation, rotation_flags, can_be_rotated=CALLBACK(src, PROC_REF(can_be_rotated)), after_rotation=CALLBACK(src,PROC_REF(after_rotation)))
/obj/structure/windoor_assembly/proc/can_be_rotated(mob/user,rotation_type)
if(anchored)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 3a6dc6ae9c..ebd9f369bc 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -120,7 +120,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
/obj/structure/window/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src, .proc/can_be_rotated),CALLBACK(src,.proc/after_rotation))
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src, PROC_REF(can_be_rotated)),CALLBACK(src, PROC_REF(after_rotation)))
/obj/structure/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
@@ -259,7 +259,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
I.play_tool_sound(src, 75)
if(state == WINDOW_SCREWED_TO_FRAME || state == WINDOW_IN_FRAME && anchored)
to_chat(user, "You begin to [state == WINDOW_SCREWED_TO_FRAME ? "unscrew the window from":"screw the window to"] the frame...")
- if(I.use_tool(src, user, decon_speed, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
+ if(I.use_tool(src, user, decon_speed, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored)))
if(extra_reinforced && state == WINDOW_IN_FRAME)
state = PRWINDOW_SECURE
else
@@ -267,7 +267,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
to_chat(user, "You [state == WINDOW_IN_FRAME ? "unfasten the window from":"fasten the window to"] the frame.")
else if(state == WINDOW_OUT_OF_FRAME)
to_chat(user, "You begin to [anchored ? "unscrew the frame from":"screw the frame to"] the floor...")
- if(I.use_tool(src, user, decon_speed, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
+ if(I.use_tool(src, user, decon_speed, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored)))
setAnchored(!anchored)
to_chat(user, "You [anchored ? "fasten the frame to":"unfasten the frame from"] the floor.")
return
@@ -276,7 +276,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
else if(I.tool_behaviour == TOOL_CROWBAR && reinf && (state == WINDOW_OUT_OF_FRAME || state == WINDOW_IN_FRAME) && anchored)
to_chat(user, "You begin to lever the window [state == WINDOW_OUT_OF_FRAME ? "into":"out of"] the frame...")
I.play_tool_sound(src, 75)
- if(I.use_tool(src, user, decon_speed, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
+ if(I.use_tool(src, user, decon_speed, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored)))
state = (state == WINDOW_OUT_OF_FRAME ? WINDOW_IN_FRAME : WINDOW_OUT_OF_FRAME)
to_chat(user, "You pry the window [state == WINDOW_IN_FRAME ? "into":"out of"] the frame.")
return
@@ -284,7 +284,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
else if(I.tool_behaviour == TOOL_WRENCH && !anchored)
I.play_tool_sound(src, 75)
to_chat(user, " You begin to disassemble [src]...")
- if(I.use_tool(src, user, decon_speed, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored)))
+ if(I.use_tool(src, user, decon_speed, 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)
G.add_fingerprint(user)
playsound(src, 'sound/items/Deconstruct.ogg', 50, 1)
@@ -302,7 +302,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup)
if(I.use_tool(src, user, 180, volume = 100))
to_chat(user, "The security bolts are glowing white hot and look ready to be removed.")
state = PRWINDOW_BOLTS_HEATED
- addtimer(CALLBACK(src, .proc/cool_bolts), 300)
+ addtimer(CALLBACK(src, PROC_REF(cool_bolts)), 300)
return
else
if(I.tool_behaviour == TOOL_SCREWDRIVER)
diff --git a/code/game/say.dm b/code/game/say.dm
index 73f773223d..24775f23dd 100644
--- a/code/game/say.dm
+++ b/code/game/say.dm
@@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(freqtospan, list(
for(var/i in 1 to barks)
if(total_delay > BARK_MAX_TIME)
break
- addtimer(CALLBACK(src, .proc/bark, hearers, range, vocal_volume, BARK_DO_VARY(vocal_pitch, vocal_pitch_range), vocal_current_bark), total_delay)
+ addtimer(CALLBACK(src, PROC_REF(bark), hearers, range, vocal_volume, BARK_DO_VARY(vocal_pitch, vocal_pitch_range), vocal_current_bark), total_delay)
total_delay += rand(DS2TICKS(vocal_speed / BARK_SPEED_BASELINE), DS2TICKS(vocal_speed / BARK_SPEED_BASELINE) + DS2TICKS(vocal_speed / BARK_SPEED_BASELINE)) TICKS
/atom/movable/proc/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE, atom/movable/source)
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index 0e32c170d7..e638033d85 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -298,7 +298,7 @@
lube |= SLIDE_ICE
if(lube&SLIDE)
- new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 4), 1, FALSE, CALLBACK(C, /mob/living/carbon/.proc/spin, 1, 1))
+ new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 4), 1, FALSE, CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, spin), 1, 1))
else if(lube&SLIDE_ICE)
new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 1), 1, FALSE) //spinning would be bad for ice, fucks up the next dir
return TRUE
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 1052e62e07..59405e1b10 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -128,7 +128,7 @@
if(defer_change) // TODO: make the defer change var a var for any changeturf flag
flags = CHANGETURF_DEFER_CHANGE
ScrapeAway(null, flags)
- addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(AfterChange)), 1, TIMER_UNIQUE)
playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction
/turf/closed/mineral/attack_animal(mob/living/simple_animal/user, list/modifiers)
@@ -587,7 +587,7 @@
if(defer_change)
flags = CHANGETURF_DEFER_CHANGE
ScrapeAway(null, flags)
- addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(AfterChange)), 1, TIMER_UNIQUE)
/turf/closed/mineral/gibtonite/volcanic
@@ -647,7 +647,7 @@
if(defer_change) // TODO: make the defer change var a var for any changeturf flag
flags = CHANGETURF_DEFER_CHANGE
ScrapeAway(flags=flags)
- addtimer(CALLBACK(src, .proc/AfterChange), 1, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(AfterChange)), 1, TIMER_UNIQUE)
playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction
// H.mind?.adjust_experience(/datum/skill/mining, 100) //yay!
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 85fbbc5c77..d258052102 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -388,7 +388,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, TRUE, user)))
+ 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, TRUE, user)))
stoplag(1)
progress.end_progress()
diff --git a/code/game/world.dm b/code/game/world.dm
index 77ceef0589..264933ddf9 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -83,11 +83,11 @@ GLOBAL_LIST(topic_status_cache)
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()
var/override_dir = params[OVERRIDE_LOG_DIRECTORY_PARAMETER]
diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm
index 5b667c5fd5..449d296951 100644
--- a/code/modules/VR/vr_sleeper.dm
+++ b/code/modules/VR/vr_sleeper.dm
@@ -65,7 +65,7 @@
obj_flags |= EMAGGED
you_die_in_the_game_you_die_for_real = TRUE
sparks.start()
- addtimer(CALLBACK(src, .proc/emagNotify), 150)
+ addtimer(CALLBACK(src, PROC_REF(emagNotify)), 150)
return TRUE
/obj/machinery/vr_sleeper/update_icon_state()
@@ -179,12 +179,12 @@
C.updateappearance(TRUE, TRUE, TRUE)
var/datum/component/virtual_reality/VR = vr_mob.AddComponent(/datum/component/virtual_reality, you_die_in_the_game_you_die_for_real)
if(VR.connect(M))
- RegisterSignal(VR, COMSIG_COMPONENT_UNREGISTER_PARENT, .proc/unset_vr_mob)
- RegisterSignal(VR, COMSIG_COMPONENT_REGISTER_PARENT, .proc/set_vr_mob)
+ RegisterSignal(VR, COMSIG_COMPONENT_UNREGISTER_PARENT, PROC_REF(unset_vr_mob))
+ RegisterSignal(VR, COMSIG_COMPONENT_REGISTER_PARENT, PROC_REF(set_vr_mob))
if(!only_current_user_can_interact)
- VR.RegisterSignal(src, COMSIG_ATOM_EMAG_ACT, /datum/component/virtual_reality.proc/you_only_live_once)
- VR.RegisterSignal(src, COMSIG_MACHINE_EJECT_OCCUPANT, /datum/component/virtual_reality.proc/revert_to_reality)
- VR.RegisterSignal(src, COMSIG_PARENT_QDELETING, /datum/component/virtual_reality.proc/machine_destroyed)
+ VR.RegisterSignal(src, COMSIG_ATOM_EMAG_ACT, TYPE_PROC_REF(/datum/component/virtual_reality, you_only_live_once))
+ VR.RegisterSignal(src, COMSIG_MACHINE_EJECT_OCCUPANT, TYPE_PROC_REF(/datum/component/virtual_reality, revert_to_reality))
+ VR.RegisterSignal(src, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum/component/virtual_reality, machine_destroyed))
to_chat(vr_mob, "Transfer successful! You are now playing as [vr_mob] in VR!")
else
to_chat(M, "Transfer failed! virtual reality data likely corrupted!")
@@ -240,7 +240,7 @@
vr_area = get_base_area(src)
if(!vr_area)
return INITIALIZE_HINT_QDEL
- addtimer(CALLBACK(src, .proc/clean_up), 3 MINUTES, TIMER_LOOP)
+ addtimer(CALLBACK(src, PROC_REF(clean_up)), 3 MINUTES, TIMER_LOOP)
/obj/effect/vr_clean_master/proc/clean_up()
if (!vr_area)
@@ -256,4 +256,4 @@
if(!QDELETED(M) && (M in contents) && M.stat == DEAD)
qdel(M)
corpse_party -= M
- addtimer(CALLBACK(src, .proc/clean_up), 3 MINUTES)
+ addtimer(CALLBACK(src, PROC_REF(clean_up)), 3 MINUTES)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 3ebb9e8089..32addf8953 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -215,7 +215,7 @@ GLOBAL_PROTECT(admin_verbs_debug)
/client/proc/discordnulls,
/client/proc/generate_wikichem_list //DO NOT PRESS UNLESS YOU WANT SUPERLAG
)
-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)
@@ -758,7 +758,7 @@ GLOBAL_PROTECT(admin_verbs_hideable)
if(!istype(T))
to_chat(src, "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 180735d746..6f00e7d98e 100644
--- a/code/modules/admin/antag_panel.dm
+++ b/code/modules/admin/antag_panel.dm
@@ -119,7 +119,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 532a11a532..3b683ebaf7 100644
--- a/code/modules/admin/check_antagonists.dm
+++ b/code/modules/admin/check_antagonists.dm
@@ -106,7 +106,7 @@
else
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/player_panel2.dm b/code/modules/admin/player_panel2.dm
index 72139127d7..440aa50f95 100644
--- a/code/modules/admin/player_panel2.dm
+++ b/code/modules/admin/player_panel2.dm
@@ -202,7 +202,7 @@ GLOBAL_LIST_INIT(pp_limbs, list(
message_admins("[key_name_admin(usr)] took control of [targetMob].")
log_admin("[key_name(usr)] took control of [targetMob].")
- addtimer(CALLBACK(targetMob.mob_panel, /datum.proc/ui_interact, targetMob), 0.1 SECONDS)
+ addtimer(CALLBACK(targetMob.mob_panel, TYPE_PROC_REF(/datum, ui_interact), targetMob), 0.1 SECONDS)
if ("smite")
admin.smite(targetMob)
diff --git a/code/modules/admin/playtimes.dm b/code/modules/admin/playtimes.dm
index 40608c8605..5dab238dfa 100644
--- a/code/modules/admin/playtimes.dm
+++ b/code/modules/admin/playtimes.dm
@@ -33,7 +33,7 @@
clients += list(client)
- clients = sort_list(clients, /proc/cmp_playtime)
+ clients = sort_list(clients, GLOBAL_PROC_REF(cmp_playtime))
data["clients"] = clients
return data
diff --git a/code/modules/admin/tag.dm b/code/modules/admin/tag.dm
index b7fc297cd1..9a1dc1b4f2 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/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
index d6628b808b..3b533a739a 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm
@@ -460,7 +460,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/SDQL2_VV_all, new(null
options |= SDQL2_OPTION_DO_NOT_AUTOGC
/datum/SDQL2_query/proc/ARun()
- INVOKE_ASYNC(src, .proc/Run)
+ INVOKE_ASYNC(src, PROC_REF(Run))
/datum/SDQL2_query/proc/Run()
if(SDQL2_IS_RUNNING)
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 09219e05ee..950a06b2b9 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -217,7 +217,7 @@
//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
if(CONFIG_GET(flag/popup_admin_pm))
- INVOKE_ASYNC(src, .proc/popup_admin_pm, recipient, msg)
+ INVOKE_ASYNC(src, PROC_REF(popup_admin_pm), recipient, msg)
else //neither are admins
to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.", confidential = TRUE)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 5c81eb55e6..cadff8e093 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -832,9 +832,9 @@
set desc = "Shows tracked profiling info from code lines that support it"
var/sort_list = 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 sort_list
if (!sort)
diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm
index 9ad07ac1b2..58b4495dbf 100644
--- a/code/modules/admin/verbs/individual_logging.dm
+++ b/code/modules/admin/verbs/individual_logging.dm
@@ -54,7 +54,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/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 091764c419..086161792c 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -351,9 +351,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),
diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm
index 3860706538..8c2a576dc7 100644
--- a/code/modules/admin/verbs/onlyone.dm
+++ b/code/modules/admin/verbs/onlyone.dm
@@ -19,13 +19,13 @@ GLOBAL_VAR_INIT(highlander, FALSE)
message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE!")
log_admin("[key_name(usr)] used THERE CAN BE ONLY ONE.")
- 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)
/client/proc/only_one_delayed()
send_to_playing_players("Bagpipes begin to blare. You feel Scottish pride coming over you.")
message_admins("[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), 420)
+ addtimer(CALLBACK(src, PROC_REF(only_one)), 420)
/mob/living/carbon/human/proc/make_scottish()
mind.add_antag_datum(/datum/antagonist/highlander)
diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm
index d10ec67d13..c2112c224d 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/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index db34e607c6..3836b15779 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1463,7 +1463,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/shots_this_limb = 0
for(var/t in shuffle(open_adj_turfs))
var/turf/iter_turf = t
- addtimer(CALLBACK(GLOBAL_PROC, .proc/firing_squad, dude, iter_turf, slice_part.body_zone, wound_bonuses[wound_bonus_rep], damage), delay_counter)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(firing_squad), dude, iter_turf, slice_part.body_zone, wound_bonuses[wound_bonus_rep], damage), delay_counter)
delay_counter += delay_per_shot
shots_this_limb++
if(shots_this_limb > shots_per_limb_per_rep)
@@ -1517,23 +1517,23 @@ Traitors and the like can also be revived with the previous role mostly intact.
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, 'modular_splurt/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, PROC_REF(playsound), carbon_target, 'modular_splurt/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
if(ADMIN_PUNISHMENT_BREADIFY)
#define BREADIFY_TIME (5 SECONDS)
var/mutable_appearance/bread_appearance = mutable_appearance('icons/obj/food/burgerbread.dmi', "bread")
var/mutable_appearance/transform_scanline = mutable_appearance('modular_splurt/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, PROC_REF(breadify), target), BREADIFY_TIME)
#undef BREADIFY_TIME
if(ADMIN_PUNISHMENT_BOOKIFY)
#define BOOKIFY_TIME (2 SECONDS)
var/mutable_appearance/book_appearance = mutable_appearance('icons/obj/library.dmi', "book")
var/mutable_appearance/transform_scanline = mutable_appearance('modular_splurt/icons/effects/effects.dmi', "transform_effect")
target.transformation_animation(book_appearance, time = BOOKIFY_TIME, transform_overlay=transform_scanline, reset_after=TRUE)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/bookify, target), BOOKIFY_TIME)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(bookify), target), BOOKIFY_TIME)
playsound(target, 'modular_splurt/sound/misc/bookify.ogg', 60, 1)
#undef BOOKIFY_TIME
if(ADMIN_PUNISHMENT_BONK)
@@ -1626,7 +1626,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
/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/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm
index 24e286310d..e62b0d681f 100644
--- a/code/modules/admin/verbs/secrets.dm
+++ b/code/modules/admin/verbs/secrets.dm
@@ -246,7 +246,7 @@
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
@@ -444,9 +444,9 @@
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, 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, PROC_REF(doPortalSpawn), get_random_station_turf(), pathToSpawn, prefs["amount"]["value"], storm, null, outfit), i*prefs["delay"]["value"])
if("changebombcap")
if(!is_funmin)
return
@@ -465,7 +465,7 @@
SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Monkeyize All Humans"))
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))
ok = TRUE
if("traitor_all")
if(!is_funmin)
diff --git a/code/modules/admin/view_variables/topic_basic.dm b/code/modules/admin/view_variables/topic_basic.dm
index 288f5cceee..7f4f508a2b 100644
--- a/code/modules/admin/view_variables/topic_basic.dm
+++ b/code/modules/admin/view_variables/topic_basic.dm
@@ -55,11 +55,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 = input(usr, "Choose a component/element to add","better know what ur fuckin doin pal") as null|anything in names
if(!usr || !result || result == "---Components---" || result == "---Elements---")
return
diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm
index ff01623f70..5c4fa50f8d 100644
--- a/code/modules/antagonists/_common/antag_datum.dm
+++ b/code/modules/antagonists/_common/antag_datum.dm
@@ -182,8 +182,8 @@ GLOBAL_LIST_EMPTY(antagonists)
apply_innate_effects()
give_antag_moodies()
remove_blacklisted_quirks()
- // 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?.deadmin & DEADMIN_ANTAGONIST))
@@ -548,7 +548,7 @@ GLOBAL_LIST_EMPTY(antagonists)
if(!ispath(request_target))
request_target = locate(request_target) in objectives
if(istype(request_target))
- RegisterSignal(request_target, COMSIG_PARENT_QDELETING, .proc/clean_request_from_del_objective)
+ RegisterSignal(request_target, COMSIG_PARENT_QDELETING, PROC_REF(clean_request_from_del_objective))
requested_objective_changes[uid] = additions
diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm
index f7e66ee90a..201f8ed1a4 100644
--- a/code/modules/antagonists/abductor/abductor.dm
+++ b/code/modules/antagonists/abductor/abductor.dm
@@ -112,7 +112,7 @@
/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 343faccad6..60c112a7e1 100644
--- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm
+++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm
@@ -660,7 +660,7 @@
user.visible_message("[user] places down [src] and activates it.", "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
diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm
index 312cc07997..ef8436826e 100644
--- a/code/modules/antagonists/abductor/equipment/gland.dm
+++ b/code/modules/antagonists/abductor/equipment/gland.dm
@@ -63,7 +63,7 @@
update_gland_hud()
var/atom/movable/screen/alert/mind_control/mind_alert = owner.throw_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/access.dm b/code/modules/antagonists/abductor/equipment/glands/access.dm
index ccef04b091..d7271b052b 100644
--- a/code/modules/antagonists/abductor/equipment/glands/access.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/access.dm
@@ -9,7 +9,7 @@
/obj/item/organ/heart/gland/access/activate()
to_chat(owner, "You feel like a VIP for some reason.")
- RegisterSignal(owner, COMSIG_MOB_ALLOWED, .proc/free_access)
+ RegisterSignal(owner, COMSIG_MOB_ALLOWED, PROC_REF(free_access))
/obj/item/organ/heart/gland/access/proc/free_access(datum/source, obj/O)
return TRUE
diff --git a/code/modules/antagonists/abductor/equipment/glands/electric.dm b/code/modules/antagonists/abductor/equipment/glands/electric.dm
index 9de0b96930..3a4ca4d0f4 100644
--- a/code/modules/antagonists/abductor/equipment/glands/electric.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/electric.dm
@@ -20,7 +20,7 @@
owner.visible_message("[owner]'s skin starts emitting electric arcs!",\
"You feel electric energy building up inside you!")
playsound(get_turf(owner), "sparks", 100, TRUE, -1)
- 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 e995826af6..6ae857f532 100644
--- a/code/modules/antagonists/abductor/equipment/glands/heal.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm
@@ -107,7 +107,7 @@
else
to_chat(owner, "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
@@ -125,7 +125,7 @@
else
to_chat(owner, "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("With a loud snap, [owner]'s [parse_zone(body_zone)] rapidly grows back from [owner.p_their()] body!",
@@ -155,7 +155,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.is_robotic_limb(FALSE))
diff --git a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
index cb3bb50b1e..4f17cd26eb 100644
--- a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
+++ b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm
@@ -48,7 +48,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 fe8b06ac77..a3d45b11b9 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, "You feel bloated.")
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, owner, "A massive stomachache overcomes you."), 150)
- addtimer(CALLBACK(src, .proc/vomit_plasma), 200)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), owner, "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 eade62b1bb..8f105bbecf 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 2ec8e70358..419c94f437 100644
--- a/code/modules/antagonists/abductor/machinery/pad.dm
+++ b/code/modules/antagonists/abductor/machinery/pad.dm
@@ -31,7 +31,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)
@@ -41,7 +41,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 0ba84a201f..489db34a2f 100644
--- a/code/modules/antagonists/ashwalker/ashwalker.dm
+++ b/code/modules/antagonists/ashwalker/ashwalker.dm
@@ -23,11 +23,11 @@
/datum/antagonist/ashwalker/on_body_transfer(mob/living/old_body, mob/living/new_body)
. = ..()
- 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))
/datum/antagonist/ashwalker/on_removal()
. = ..()
diff --git a/code/modules/antagonists/blob/blob/blobs/core.dm b/code/modules/antagonists/blob/blob/blobs/core.dm
index 317dcb2522..ef9aba85ab 100644
--- a/code/modules/antagonists/blob/blob/blobs/core.dm
+++ b/code/modules/antagonists/blob/blob/blobs/core.dm
@@ -18,7 +18,7 @@
return INITIALIZE_HINT_QDEL
if(overmind)
update_icon()
- addtimer(CALLBACK(src, .proc/generate_announcement), 1800)
+ addtimer(CALLBACK(src, PROC_REF(generate_announcement)), 1800)
. = ..()
/obj/structure/blob/core/proc/generate_announcement()
diff --git a/code/modules/antagonists/blob/blob/overmind.dm b/code/modules/antagonists/blob/blob/overmind.dm
index 3bd612d9ca..5e2be42fd5 100644
--- a/code/modules/antagonists/blob/blob/overmind.dm
+++ b/code/modules/antagonists/blob/blob/overmind.dm
@@ -113,7 +113,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_REROLL_TIMEYou have gained another free strain re-roll.")
free_strain_rerolls = 1
diff --git a/code/modules/antagonists/blood_contract/blood_contract.dm b/code/modules/antagonists/blood_contract/blood_contract.dm
index 5d2fda08fc..4de55f49e1 100644
--- a/code/modules/antagonists/blood_contract/blood_contract.dm
+++ b/code/modules/antagonists/blood_contract/blood_contract.dm
@@ -24,7 +24,7 @@
return
H.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY)
var/obj/effect/mine/pickup/bloodbath/B = new(H)
- INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, H) //could use moving out from the mine
+ INVOKE_ASYNC(B, TYPE_PROC_REF(/obj/effect/mine/pickup/bloodbath, mineEffect), H) //could use moving out from the mine
for(var/mob/living/carbon/human/P in GLOB.player_list)
if(P == H || HAS_TRAIT(P, TRAIT_NO_MIDROUND_ANTAG))
diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
index 17c21dc188..810c7c11e9 100644
--- a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
+++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
@@ -342,7 +342,7 @@
//This handles the application of antag huds/special abilities
/datum/antagonist/bloodsucker/apply_innate_effects(mob/living/mob_override)
- RegisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE,.proc/LifeTick)
+ RegisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE,PROC_REF(LifeTick))
return
//This handles the removal of antag huds/special abilities
diff --git a/code/modules/antagonists/bloodsucker/powers/feed.dm b/code/modules/antagonists/bloodsucker/powers/feed.dm
index a4bdcfee54..284356a296 100644
--- a/code/modules/antagonists/bloodsucker/powers/feed.dm
+++ b/code/modules/antagonists/bloodsucker/powers/feed.dm
@@ -146,7 +146,7 @@
to_chat(user, "You lean quietly toward [target] and secretly draw out your fangs...")
else
to_chat(user, "You pull [target] close to you and draw out your fangs...")
- if(!do_mob(user, target, feed_time, NONE, extra_checks = CALLBACK(src, .proc/ContinueActive, user, target)))//sleep(10)
+ if(!do_mob(user, target, feed_time, NONE, extra_checks = CALLBACK(src, PROC_REF(ContinueActive), user, target)))//sleep(10)
to_chat(user, "Your feeding was interrupted.")
//DeactivatePower(user,target)
return
@@ -207,7 +207,7 @@
//user.mobility_flags &= ~MOBILITY_MOVE // user.canmove = 0 // Prevents spilling blood accidentally.
// Abort? A bloody mistake.
- if(!do_mob(user, target, 2 SECONDS, NONE, extra_checks=CALLBACK(src, .proc/ContinueActive, user, target)))
+ if(!do_mob(user, target, 2 SECONDS, NONE, extra_checks=CALLBACK(src, PROC_REF(ContinueActive), user, target)))
// May have disabled Feed during do_mob
if(!active || !ContinueActive(user, target))
break
diff --git a/code/modules/antagonists/bloodsucker/powers/haste.dm b/code/modules/antagonists/bloodsucker/powers/haste.dm
index 05e2cd0330..5c5df41cdc 100644
--- a/code/modules/antagonists/bloodsucker/powers/haste.dm
+++ b/code/modules/antagonists/bloodsucker/powers/haste.dm
@@ -48,7 +48,7 @@
/datum/action/bloodsucker/targeted/haste/FireTargetedPower(atom/A)
// This is a non-async proc to make sure the power is "locked" until this finishes.
hit = list()
- RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move)
+ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
var/mob/living/user = owner
var/turf/T = isturf(A) ? A : get_turf(A)
// Pulled? Not anymore.
diff --git a/code/modules/antagonists/bloodsucker/powers/lunge.dm b/code/modules/antagonists/bloodsucker/powers/lunge.dm
index db7868fa8a..bc18008eef 100644
--- a/code/modules/antagonists/bloodsucker/powers/lunge.dm
+++ b/code/modules/antagonists/bloodsucker/powers/lunge.dm
@@ -31,14 +31,14 @@
T.min_distance = 2
active = TRUE
user.toggle_throw_mode()
- RegisterSignal(user, COMSIG_CARBON_TACKLED, .proc/DelayedDeactivatePower)
+ RegisterSignal(user, COMSIG_CARBON_TACKLED, PROC_REF(DelayedDeactivatePower))
while(B && ContinueActive(user))
B.AddBloodVolume(-0.1)
sleep(5)
//Without this, the leap component would get removed too early, causing the normal crash into effects.
/datum/action/bloodsucker/lunge/proc/DelayedDeactivatePower()
- addtimer(CALLBACK(src, .proc/DeactivatePower), 1 SECONDS, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(DeactivatePower)), 1 SECONDS, TIMER_UNIQUE)
/datum/action/bloodsucker/lunge/DeactivatePower(mob/living/user = owner)
. = ..()
diff --git a/code/modules/antagonists/bloodsucker/powers/mesmerize.dm b/code/modules/antagonists/bloodsucker/powers/mesmerize.dm
index 25f50d7af4..3586a5851f 100644
--- a/code/modules/antagonists/bloodsucker/powers/mesmerize.dm
+++ b/code/modules/antagonists/bloodsucker/powers/mesmerize.dm
@@ -114,9 +114,9 @@
var/power_time = 138 + level_current * 12
target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 30)
L.apply_status_effect(STATUS_EFFECT_MESMERIZE, 30)
- RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/ContinueTarget)
+ RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(ContinueTarget))
// 5 second windup
- addtimer(CALLBACK(src, .proc/apply_effects, L, target, power_time), 6 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(apply_effects), L, target, power_time), 6 SECONDS)
/datum/action/bloodsucker/targeted/mesmerize/proc/apply_effects(aggressor, victim, power_time)
var/mob/living/carbon/target = victim
diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm
index b92722eb8f..09e8e1be32 100644
--- a/code/modules/antagonists/changeling/changeling.dm
+++ b/code/modules/antagonists/changeling/changeling.dm
@@ -362,7 +362,7 @@
B.organ_flags &= ~ORGAN_VITAL
B.decoy_override = TRUE
update_changeling_icons_added()
- RegisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE,.proc/regenerate)
+ RegisterSignal(owner.current,COMSIG_LIVING_BIOLOGICAL_LIFE,PROC_REF(regenerate))
return
/datum/antagonist/changeling/remove_innate_effects()
@@ -499,7 +499,7 @@
/datum/antagonist/changeling/get_admin_commands()
. = ..()
if(stored_profiles.len && (owner.current.real_name != first_prof.name))
- .["Transform to initial appearance."] = CALLBACK(src,.proc/admin_restore_appearance)
+ .["Transform to initial appearance."] = CALLBACK(src,PROC_REF(admin_restore_appearance))
/datum/antagonist/changeling/proc/admin_restore_appearance(mob/admin)
if(!stored_profiles.len || !iscarbon(owner.current))
diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm
index 1ca2f1456d..f206fb86bc 100644
--- a/code/modules/antagonists/changeling/powers/biodegrade.dm
+++ b/code/modules/antagonists/changeling/powers/biodegrade.dm
@@ -21,7 +21,7 @@
user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O]!", \
"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)
@@ -31,7 +31,7 @@
user.visible_message("[user] vomits a glob of acid on [user.p_their()] [O]!", \
"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)
@@ -40,7 +40,7 @@
return FALSE
user.visible_message("[user] vomits a glob of acid across the front of [user.p_their()] [S]!", \
"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
@@ -50,7 +50,7 @@
return FALSE
C.visible_message("[C]'s hinges suddenly begin to melt and run!")
to_chat(user, "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)
@@ -59,7 +59,7 @@
return FALSE
C.visible_message("[src] shifts and starts to fall apart!")
to_chat(user, "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 7ce9da633e..cd0a929fb8 100644
--- a/code/modules/antagonists/changeling/powers/fakedeath.dm
+++ b/code/modules/antagonists/changeling/powers/fakedeath.dm
@@ -21,7 +21,7 @@
user.tod = STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)
user.fakedeath("changeling", TRUE) //play dead
user.update_stat()
- 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/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 9fe612ac07..64f0a7b59b 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -390,12 +390,12 @@
if(INTENT_GRAB)
C.visible_message("[L] is grabbed by [H]'s tentacle!","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
if(INTENT_HARM)
C.visible_message("[L] is thrown towards [H] by a tentacle!","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
L.visible_message("[L] is pulled by [H]'s tentacle!","A tentacle grabs you and pulls you towards [H]!")
@@ -711,7 +711,7 @@
enhancement = slow_enhancement // fuck em up kiddo
wound_enhancement = slow_wound_enhancement // really. fuck em up.
to_chat(user, "[src] are now formed to allow for [fasthands ? "fast, precise strikes" : "crippling, damaging blows"].")
- addtimer(CALLBACK(src, .proc/use_buffs, user, TRUE), 0.1) // go fuckin get em
+ addtimer(CALLBACK(src, PROC_REF(use_buffs), user, TRUE), 0.1) // go fuckin get em
/obj/item/clothing/gloves/fingerless/pugilist/cling/Initialize(mapload)
. = ..()
diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm
index 5d3f2cdf9e..559f038e3d 100644
--- a/code/modules/antagonists/changeling/powers/strained_muscles.dm
+++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm
@@ -27,7 +27,7 @@
user.DefaultCombatKnockdown(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 351d8622c9..2519dd1dbf 100644
--- a/code/modules/antagonists/changeling/powers/tiny_prick.dm
+++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm
@@ -152,7 +152,7 @@
target.visible_message("A grotesque blade forms around [target.name]\'s arm!", "Your arm twists and mutates, transforming into a horrific monstrosity!", "You hear organic matter ripping and tearing!")
playsound(target, 'sound/effects/blobattack.ogg', 30, 1)
- 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)
diff --git a/code/modules/antagonists/changeling/powers/transform.dm b/code/modules/antagonists/changeling/powers/transform.dm
index 72ff31d373..48eddca728 100644
--- a/code/modules/antagonists/changeling/powers/transform.dm
+++ b/code/modules/antagonists/changeling/powers/transform.dm
@@ -154,7 +154,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/clockcult/clock_effects/clock_overlay.dm b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
index 6c9097de0e..6a5bb1523d 100644
--- a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm
@@ -35,7 +35,7 @@
/obj/effect/clockwork/overlay/wall/Initialize(mapload)
. = ..()
queue_smooth_neighbors(src)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/queue_smooth, src), 1)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(queue_smooth), src), 1)
/obj/effect/clockwork/overlay/wall/Destroy()
queue_smooth_neighbors(src)
diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
index 18211d0447..eb2879e48e 100644
--- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm
@@ -259,7 +259,7 @@
if(!cyborg_checks(cyborg))
return
to_chat(cyborg, "You start to charge from the [sigil_name]...")
- if(!do_after(cyborg, 50, target = src, extra_checks = CALLBACK(src, .proc/cyborg_checks, cyborg, TRUE)))
+ if(!do_after(cyborg, 50, target = src, extra_checks = CALLBACK(src, PROC_REF(cyborg_checks), cyborg, TRUE)))
return
var/giving_power = min(FLOOR(cyborg.cell.maxcharge - cyborg.cell.charge, MIN_CLOCKCULT_POWER), get_clockwork_power()) //give the borg either all our power or their missing power floored to MIN_CLOCKCULT_POWER
if(adjust_clockwork_power(-giving_power))
diff --git a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm
index e5d5de2f08..922e442e90 100644
--- a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm
@@ -19,7 +19,7 @@
/obj/effect/clockwork/spatial_gateway/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/check_setup), 1)
+ addtimer(CALLBACK(src, PROC_REF(check_setup)), 1)
/obj/effect/clockwork/spatial_gateway/Destroy()
deltimer(timerid)
@@ -161,7 +161,7 @@
else
animate(src, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
animate(linked_gateway, transform = matrix() / 1.5, time = 10, flags = ANIMATION_END_NOW)
- addtimer(CALLBACK(src, .proc/check_uses), 10)
+ addtimer(CALLBACK(src, PROC_REF(check_uses)), 10)
return TRUE
/obj/effect/clockwork/spatial_gateway/proc/check_uses()
diff --git a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm
index 99d1142990..8f8d36f0d7 100644
--- a/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm
+++ b/code/modules/antagonists/clockcult/clock_helpers/fabrication_helpers.dm
@@ -180,7 +180,7 @@
if(reinf)
fabrication_cost -= POWER_ROD
for(var/obj/structure/grille/G in get_turf(src))
- INVOKE_ASYNC(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricate, G, user)
+ INVOKE_ASYNC(fabricator, TYPE_PROC_REF(/obj/item/clockwork/replica_fabricator, fabricate), G, user)
return list("operation_time" = fabrication_time, "new_obj_type" = windowtype, "power_cost" = fabrication_cost, "spawn_dir" = dir, "dir_in_new" = new_dir)
/obj/structure/window/reinforced/clockwork/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent)
@@ -237,7 +237,7 @@
fabricator.repairing = src
while(fabricator && user && src)
if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \
- extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricator_repair_checks, repair_values, src, user, TRUE)))
+ extra_checks = CALLBACK(fabricator, TYPE_PROC_REF(/obj/item/clockwork/replica_fabricator, fabricator_repair_checks), repair_values, src, user, TRUE)))
break
obj_integrity = clamp(obj_integrity + repair_values["healing_for_cycle"], 0, max_integrity)
adjust_clockwork_power(-repair_values["power_required"])
@@ -259,7 +259,7 @@
fabricator.repairing = src
while(fabricator && user && src)
if(!do_after(user, repair_values["healing_for_cycle"] * fabricator.speed_multiplier, target = src, \
- extra_checks = CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricator_repair_checks, repair_values, src, user, TRUE)))
+ extra_checks = CALLBACK(fabricator, TYPE_PROC_REF(/obj/item/clockwork/replica_fabricator, fabricator_repair_checks), repair_values, src, user, TRUE)))
break
fabricator_heal_tick(repair_values["healing_for_cycle"])
adjust_clockwork_power(-repair_values["power_required"])
@@ -323,7 +323,7 @@
for(var/obj/item/clockwork/alloy_shards/S in get_turf(src)) //convert all other shards in the turf if we can
if(S == src)
continue //we want the shards to be fabricated after the main shard, thus this delay
- addtimer(CALLBACK(fabricator, /obj/item/clockwork/replica_fabricator.proc/fabricate, S, user, TRUE), 0)
+ addtimer(CALLBACK(fabricator, TYPE_PROC_REF(/obj/item/clockwork/replica_fabricator, fabricate), S, user, TRUE), 0)
return list("operation_time" = 0, "new_obj_type" = null, "power_cost" = power_amount, "spawn_dir" = SOUTH)
/obj/item/clockwork/alloy_shards/medium/gear_bit/large/fabrication_vals(mob/living/user, obj/item/clockwork/replica_fabricator/fabricator, silent, power_amount)
diff --git a/code/modules/antagonists/clockcult/clock_helpers/scripture_checks.dm b/code/modules/antagonists/clockcult/clock_helpers/scripture_checks.dm
index 360ddabe72..7151e8b3eb 100644
--- a/code/modules/antagonists/clockcult/clock_helpers/scripture_checks.dm
+++ b/code/modules/antagonists/clockcult/clock_helpers/scripture_checks.dm
@@ -40,7 +40,7 @@
/proc/generate_all_scripture()
if(GLOB.all_scripture.len)
return
- for(var/V in sort_list(subtypesof(/datum/clockwork_scripture) - list(/datum/clockwork_scripture/channeled, /datum/clockwork_scripture/create_object, /datum/clockwork_scripture/create_object/construct), /proc/cmp_clockscripture_priority))
+ for(var/V in sort_list(subtypesof(/datum/clockwork_scripture) - list(/datum/clockwork_scripture/channeled, /datum/clockwork_scripture/create_object, /datum/clockwork_scripture/create_object/construct), GLOBAL_PROC_REF(cmp_clockscripture_priority)))
var/datum/clockwork_scripture/S = new V
GLOB.all_scripture[S.type] = S
diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/_call_weapon.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/_call_weapon.dm
index a6f2ee6d90..04d8dc9518 100644
--- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/_call_weapon.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/_call_weapon.dm
@@ -44,6 +44,6 @@
/datum/action/innate/call_weapon/proc/weapon_reset(cooldown_time)
cooldown = world.time + cooldown_time
- addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), cooldown_time)
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), cooldown_time)
owner.update_action_buttons_icon()
QDEL_NULL(weapon)
diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_shield.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_shield.dm
index 47105938e6..eb65c0ba76 100644
--- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_shield.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_shield.dm
@@ -49,7 +49,7 @@
C.apply_damage((iscultist(C) ? damage * 2 : damage), BURN, (istype(part, /obj/item/bodypart/l_arm) ? BODY_ZONE_L_ARM : BODY_ZONE_R_ARM)) //Deals the damage to the holder instead of absorbing it instead + forcedrops. Doubled if a cultist of Nar'Sie.
else
owner.adjustFireLoss(iscultist(owner) ? damage * 2 : damage)
- addtimer(CALLBACK(owner, /mob/living.proc/dropItemToGround, src, TRUE), 1)
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob/living, dropItemToGround), src, TRUE), 1)
else if(!is_servant_of_ratvar(attacker)) //No exploiting my snowflake mechanics
dam_absorbed += damage
playsound(owner, 'sound/machines/clockcult/steam_whoosh.ogg', 30)
diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
index 06fea9bd91..e75affc42e 100644
--- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm
@@ -51,7 +51,7 @@
user.emote("scream")
user.apply_damage(30, BRUTE, BODY_ZONE_HEAD)
user.adjustOrganLoss(ORGAN_SLOT_BRAIN, 30)
- addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off.
+ addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living, dropItemToGround), src, TRUE), 1) //equipped happens before putting stuff on(but not before picking items up), 1). thus, we need to wait for it to be on before forcing it off.
/obj/item/clothing/head/helmet/clockwork/mob_can_equip(M, equipper, slot, disable_warning, bypass_equip_delay_self)
if(equipper && !is_servant_of_ratvar(equipper))
@@ -119,7 +119,7 @@
user.apply_damage(15, BURN, BODY_ZONE_CHEST)
user.adjust_fire_stacks(2)
user.IgniteMob()
- addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1)
+ addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living, dropItemToGround), src, TRUE), 1)
/obj/item/clothing/gloves/clockwork
name = "clockwork gauntlets"
@@ -178,7 +178,7 @@
user.emote("scream")
user.apply_damage(7, BRUTE, BODY_ZONE_L_ARM)
user.apply_damage(7, BRUTE, BODY_ZONE_R_ARM)
- addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1)
+ addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living, dropItemToGround), src, TRUE), 1)
/obj/item/clothing/shoes/clockwork
name = "clockwork treads"
@@ -228,4 +228,4 @@
user.emote("scream")
user.apply_damage(7, BURN, BODY_ZONE_L_LEG)
user.apply_damage(7, BURN, BODY_ZONE_R_LEG)
- addtimer(CALLBACK(user, /mob/living.proc/dropItemToGround, src, TRUE), 1)
+ addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living, dropItemToGround), src, TRUE), 1)
diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
index 3298196de7..547f691599 100644
--- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
+++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm
@@ -123,7 +123,7 @@
/obj/item/clockwork/slab/dropped(mob/user)
. = ..()
- addtimer(CALLBACK(src, .proc/check_on_mob, user), 1) //dropped is called before the item is out of the slot, so we need to check slightly later
+ addtimer(CALLBACK(src, PROC_REF(check_on_mob), user), 1) //dropped is called before the item is out of the slot, so we need to check slightly later
/obj/item/clockwork/slab/worn_overlays(isinhands = FALSE, icon_file, used_state, style_flags = NONE)
. = ..()
@@ -358,7 +358,7 @@
recollecting = !recollecting
. = TRUE
if("recite")
- INVOKE_ASYNC(src, .proc/recite_scripture, text2path(params["script"]), usr, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(recite_scripture), text2path(params["script"]), usr, FALSE)
. = TRUE
if("bind")
var/datum/clockwork_scripture/path = text2path(params["script"]) //we need a path and not a string
diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm
index dc53217486..db3e0b1a43 100644
--- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm
+++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm
@@ -52,7 +52,7 @@
/obj/item/clothing/glasses/judicial_visor/dropped(mob/user)
. = ..()
- addtimer(CALLBACK(src, .proc/check_on_mob, user), 1) //dropped is called before the item is out of the slot, so we need to check slightly later
+ addtimer(CALLBACK(src, PROC_REF(check_on_mob), user), 1) //dropped is called before the item is out of the slot, so we need to check slightly later
/obj/item/clothing/glasses/judicial_visor/proc/check_on_mob(mob/user)
if(user && src != user.get_item_by_slot(ITEM_SLOT_EYES)) //if we happen to check and we AREN'T in the slot, we need to remove our shit from whoever we got dropped from
@@ -131,7 +131,7 @@
continue
V.recharging = TRUE //To prevent exploiting multiple visors to bypass the cooldown
V.update_status()
- addtimer(CALLBACK(V, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor, ranged_ability_user), (GLOB.ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown) * 2)
+ addtimer(CALLBACK(V, TYPE_PROC_REF(/obj/item/clothing/glasses/judicial_visor, recharge_visor), ranged_ability_user), (GLOB.ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown) * 2)
clockwork_say(ranged_ability_user, text2ratvar("Kneel, heathens!"))
ranged_ability_user.visible_message("[ranged_ability_user]'s judicial visor fires a stream of energy at [target], creating a strange mark!", "You direct [visor]'s power to [target]. You must wait for some time before doing this again.")
var/turf/targetturf = get_turf(target)
@@ -139,7 +139,7 @@
log_combat(ranged_ability_user, targetturf, "created a judicial marker")
ranged_ability_user.update_action_buttons_icon()
ranged_ability_user.update_inv_glasses()
- addtimer(CALLBACK(visor, /obj/item/clothing/glasses/judicial_visor.proc/recharge_visor, ranged_ability_user), GLOB.ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown)//Cooldown is reduced by 10x if Ratvar is up
+ addtimer(CALLBACK(visor, TYPE_PROC_REF(/obj/item/clothing/glasses/judicial_visor, recharge_visor), ranged_ability_user), GLOB.ratvar_awakens ? visor.recharge_cooldown*0.1 : visor.recharge_cooldown)//Cooldown is reduced by 10x if Ratvar is up
remove_ranged_ability()
return TRUE
@@ -161,7 +161,7 @@
. = ..()
set_light(1.4, 2, "#FE9C11")
user = caster
- INVOKE_ASYNC(src, .proc/judicialblast)
+ INVOKE_ASYNC(src, PROC_REF(judicialblast))
/obj/effect/clockwork/judicial_marker/singularity_act()
return
diff --git a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
index 7be9ef039b..9327bac74c 100644
--- a/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
+++ b/code/modules/antagonists/clockcult/clock_items/replica_fabricator.dm
@@ -115,7 +115,7 @@
else
user.visible_message("[user]'s [name] starts consuming [target]!", \
"Your [name] starts consuming [target]...")
- if(!do_after(user, fabrication_values["operation_time"], target = target, extra_checks = CALLBACK(src, .proc/fabricate_checks, fabrication_values, target, target_type, user, TRUE)))
+ if(!do_after(user, fabrication_values["operation_time"], target = target, extra_checks = CALLBACK(src, PROC_REF(fabricate_checks), fabrication_values, target, target_type, user, TRUE)))
return FALSE
if(!silent)
var/atom/A = fabrication_values["new_obj_type"]
diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
index e7aeb7e796..9a626f4f79 100644
--- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
+++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm
@@ -114,11 +114,11 @@
superheat_wall(A)
return
if(modifiers["middle"] || modifiers["ctrl"])
- INVOKE_ASYNC(src, .proc/issue_command, A)
+ INVOKE_ASYNC(src, PROC_REF(issue_command), A)
return
if(GLOB.ark_of_the_clockwork_justiciar == A)
var/obj/structure/destructible/clockwork/massive/celestial_gateway/G = GLOB.ark_of_the_clockwork_justiciar
- INVOKE_ASYNC(src, .proc/attempt_recall, G)
+ INVOKE_ASYNC(src, PROC_REF(attempt_recall), G)
else if(istype(A, /obj/structure/destructible/clockwork/trap/trigger))
var/obj/structure/destructible/clockwork/trap/trigger/T = A
T.visible_message("[T] clunks as it's activated remotely.")
diff --git a/code/modules/antagonists/clockcult/clock_scripture.dm b/code/modules/antagonists/clockcult/clock_scripture.dm
index feb724dceb..31487d782a 100644
--- a/code/modules/antagonists/clockcult/clock_scripture.dm
+++ b/code/modules/antagonists/clockcult/clock_scripture.dm
@@ -154,7 +154,7 @@ Judgement 80k power or nine converts
if(!channel_time)
return TRUE
chant()
- if(!do_after(invoker, channel_time, target = invoker, extra_checks = CALLBACK(src, .proc/check_special_requirements)))
+ if(!do_after(invoker, channel_time, target = invoker, extra_checks = CALLBACK(src, PROC_REF(check_special_requirements))))
slab.busy = null
chanting = FALSE
scripture_fail()
@@ -201,7 +201,7 @@ Judgement 80k power or nine converts
/datum/clockwork_scripture/channeled/scripture_effects()
for(var/i in 1 to chant_amount)
- if(!do_after(invoker, chant_interval, target = invoker, extra_checks = CALLBACK(src, .proc/can_recite)))
+ if(!do_after(invoker, chant_interval, target = invoker, extra_checks = CALLBACK(src, PROC_REF(can_recite))))
break
clockwork_say(invoker, text2ratvar(pick(chant_invocations)), whispered)
if(multiple_invokers_used)
diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm
index be4785f4a7..5d5aa95e47 100644
--- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm
+++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_scripts.dm
@@ -217,7 +217,7 @@
playsound(owner, 'sound/magic/clockwork/fellowship_armory.ogg', 15 * do_message, TRUE) //get sound loudness based on how much we equipped
cooldown = CLOCKWORK_ARMOR_COOLDOWN + world.time
owner.update_action_buttons_icon()
- addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), CLOCKWORK_ARMOR_COOLDOWN)
+ addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), CLOCKWORK_ARMOR_COOLDOWN)
return TRUE
/datum/action/innate/clockwork_armaments/proc/remove_item_if_better(obj/item/I, mob/user)
@@ -418,7 +418,7 @@
invoker.light_range = 4
invoker.light_color = LIGHT_COLOR_FIRE
invoker.update_light()
- addtimer(CALLBACK(invoker, /mob.proc/stop_void_volt_glow), channel_time)
+ addtimer(CALLBACK(invoker, TYPE_PROC_REF(/mob, stop_void_volt_glow)), channel_time)
..()//Do the timer & Chant
/mob/proc/stop_void_volt_glow() //Needed so the scripture being qdel()d doesn't prevent it.
diff --git a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
index 30b11bc8f3..f280ddecf2 100644
--- a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm
@@ -35,7 +35,7 @@
/obj/structure/destructible/clockwork/massive/celestial_gateway/Initialize(mapload)
. = ..()
- INVOKE_ASYNC(src, .proc/spawn_animation)
+ INVOKE_ASYNC(src, PROC_REF(spawn_animation))
glow = new(get_turf(src))
if(!GLOB.ark_of_the_clockwork_justiciar)
GLOB.ark_of_the_clockwork_justiciar = src
@@ -149,7 +149,7 @@
recalling = TRUE
sound_to_playing_players('sound/machines/clockcult/ark_recall.ogg', 75, FALSE)
hierophant_message("The Eminence has initiated a mass recall! You are being transported to the Ark!")
- addtimer(CALLBACK(src, .proc/mass_recall), 100)
+ addtimer(CALLBACK(src, PROC_REF(mass_recall)), 100)
/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/mass_recall()
for(var/V in SSticker.mode.servants_of_ratvar)
@@ -183,7 +183,7 @@
make_glow()
glow.icon_state = "clockwork_gateway_disrupted"
resistance_flags |= INDESTRUCTIBLE
- addtimer(CALLBACK(src, .proc/go_boom), 2.7 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(go_boom)), 2.7 SECONDS)
return
qdel(src)
diff --git a/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm b/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm
index 5302153b9c..6d6b9da281 100644
--- a/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/eminence_spire.dm
@@ -81,7 +81,7 @@
hierophant_message("[nominee] proposes selecting an Eminence from ghosts! You may object by interacting with the eminence spire. The vote will otherwise pass in 30 seconds.")
for(var/mob/M in servants_and_ghosts())
M.playsound_local(M, 'sound/machines/clockcult/ocularwarden-target.ogg', 50, FALSE)
- selection_timer = addtimer(CALLBACK(src, .proc/kingmaker), 300, TIMER_STOPPABLE)
+ selection_timer = addtimer(CALLBACK(src, PROC_REF(kingmaker)), 300, TIMER_STOPPABLE)
/obj/structure/destructible/clockwork/eminence_spire/proc/objection(mob/living/wright)
if(alert(wright, "Object to the selection of [eminence_nominee] as Eminence?", "Objection!", "Object", "Cancel") == "Cancel" || !is_servant_of_ratvar(wright) || !wright.canUseTopic(src) || !eminence_nominee)
diff --git a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
index da04353974..ea49b337f5 100644
--- a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm
@@ -30,7 +30,7 @@
var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/clockwork_effects.dmi', "ratvar_alert")
notify_ghosts("The Justiciar's light calls to you! Reach out to Ratvar in [get_area_name(src)] to be granted a shell to spread his glory!", null, source = src, alert_overlay = alert_overlay)
SSpersistence.station_was_destroyed = TRUE
- INVOKE_ASYNC(src, .proc/purge_the_heresy)
+ INVOKE_ASYNC(src, PROC_REF(purge_the_heresy))
/obj/structure/destructible/clockwork/massive/ratvar/Destroy()
@@ -171,7 +171,7 @@
priority_announce("Energy signal no longer detected.","Central Command Higher Dimensional Affairs")
return
sound_to_playing_players('sound/magic/clockwork/ark_activation_sequence.ogg', 80) //if this isn't lessened in volume it peaks for some reason
- addtimer(CALLBACK(GLOBAL_PROC, /proc/clockcult_ending_helper), 300)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(clockcult_ending_helper)), 300)
/proc/clockcult_ending_helper()
for(var/mob/M in GLOB.mob_list)
diff --git a/code/modules/antagonists/clockcult/clock_structures/reflector.dm b/code/modules/antagonists/clockcult/clock_structures/reflector.dm
index 7152953c6c..234f92fffe 100644
--- a/code/modules/antagonists/clockcult/clock_structures/reflector.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/reflector.dm
@@ -22,7 +22,7 @@
/obj/structure/destructible/clockwork/reflector/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src, .proc/can_be_rotated),CALLBACK(src,.proc/after_rotation))
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src, PROC_REF(can_be_rotated)),CALLBACK(src,PROC_REF(after_rotation)))
/obj/structure/destructible/clockwork/reflector/bullet_act(obj/item/projectile/P)
if(!anchored || !allowed_projectile_typecache[P.type] || !(P.dir in GLOB.cardinals))
diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
index ac8dc0bffb..5038e6513a 100644
--- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
+++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm
@@ -57,7 +57,7 @@
"A massive brass spike rips through your chassis and bursts into shrapnel in your casing!")
squirrel.adjustBruteLoss(50)
squirrel.Stun(20)
- addtimer(CALLBACK(src, .proc/take_damage, max_integrity), 1)
+ addtimer(CALLBACK(src, PROC_REF(take_damage), max_integrity), 1)
else
squirrel.visible_message("A massive brass spike erupts from the ground, impaling [squirrel]!", \
"A massive brass spike rams through your chest, hoisting you into the air!")
@@ -72,7 +72,7 @@
if(M)
M.take_damage(50,BRUTE,MELEE)
M.visible_message("A massive brass spike erupts from the ground, penetrating \the [M] and shattering the trap into pieces!")
- addtimer(CALLBACK(src, .proc/take_damage, max_integrity), 1)
+ addtimer(CALLBACK(src, PROC_REF(take_damage), max_integrity), 1)
else
visible_message("A massive brass spike erupts from the ground!")
diff --git a/code/modules/antagonists/clockcult/clockcult.dm b/code/modules/antagonists/clockcult/clockcult.dm
index 4e993763e7..ed2982f861 100644
--- a/code/modules/antagonists/clockcult/clockcult.dm
+++ b/code/modules/antagonists/clockcult/clockcult.dm
@@ -203,7 +203,7 @@
/datum/antagonist/clockcult/get_admin_commands()
. = ..()
- .["Give slab"] = CALLBACK(src,.proc/admin_give_slab)
+ .["Give slab"] = CALLBACK(src,PROC_REF(admin_give_slab))
/datum/antagonist/clockcult/proc/admin_give_slab(mob/admin)
if(!SSticker.mode.equip_servant(owner.current))
diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm
index 2e334c59c9..a4974d2c2b 100644
--- a/code/modules/antagonists/cult/blood_magic.dm
+++ b/code/modules/antagonists/cult/blood_magic.dm
@@ -268,7 +268,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, FALSE)
- 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,"[H] has been cursed with living nightmares!")
attached_action.charges--
attached_action.desc = attached_action.base_desc
diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm
index 2850cb85cc..c3c3c97b79 100644
--- a/code/modules/antagonists/cult/cult.dm
+++ b/code/modules/antagonists/cult/cult.dm
@@ -180,8 +180,8 @@
/datum/antagonist/cult/get_admin_commands()
. = ..()
- .["Dagger"] = CALLBACK(src,.proc/admin_give_dagger)
- .["Dagger and Metal"] = CALLBACK(src,.proc/admin_give_metal)
+ .["Dagger"] = CALLBACK(src,PROC_REF(admin_give_dagger))
+ .["Dagger and Metal"] = CALLBACK(src,PROC_REF(admin_give_metal))
/datum/antagonist/cult/proc/admin_give_dagger(mob/admin)
if(!equip_cultist(FALSE))
@@ -308,7 +308,7 @@
if(B.current)
SEND_SOUND(B.current, 'sound/hallucinations/i_see_you2.ogg')
to_chat(B.current, "The veil weakens as your cult grows, your eyes begin to glow...")
- addtimer(CALLBACK(src, .proc/rise, B.current), 200)
+ addtimer(CALLBACK(src, PROC_REF(rise), B.current), 200)
cult_risen = TRUE
if(ratio > CULT_ASCENDENT && !cult_ascendent)
@@ -316,7 +316,7 @@
if(B.current)
SEND_SOUND(B.current, 'sound/hallucinations/im_here1.ogg')
to_chat(B.current, "Your cult is ascendent and the red harvest approaches - you cannot hide your true nature for much longer!!")
- addtimer(CALLBACK(src, .proc/ascend, B.current), 200)
+ addtimer(CALLBACK(src, PROC_REF(ascend), B.current), 200)
cult_ascendent = TRUE
diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm
index bbdf41ff48..bdc5631eb2 100644
--- a/code/modules/antagonists/cult/cult_comms.dm
+++ b/code/modules/antagonists/cult/cult_comms.dm
@@ -189,7 +189,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
@@ -278,7 +278,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/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
@@ -290,7 +290,7 @@
B.current.client.images += C.cult_team.blood_target_image
attached_action.owner.update_action_buttons_icon()
remove_ranged_ability("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, PROC_REF(reset_blood_target),C.cult_team), 900, TIMER_STOPPABLE)
return TRUE
return FALSE
@@ -360,7 +360,7 @@
C.cult_team.blood_target = target
var/area/A = get_area(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/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
@@ -377,8 +377,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, PROC_REF(reset_blood_target),C.cult_team), base_cooldown, TIMER_STOPPABLE)
+ addtimer(CALLBACK(src, PROC_REF(reset_button)), base_cooldown)
//////// ELDRITCH PULSE /////////
@@ -468,4 +468,4 @@
attached_action.cooldown = world.time + attached_action.base_cooldown
remove_ranged_ability("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 d31cf6f69d..bb98676621 100644
--- a/code/modules/antagonists/cult/cult_items.dm
+++ b/code/modules/antagonists/cult/cult_items.dm
@@ -268,7 +268,7 @@
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()
@@ -723,8 +723,8 @@
/obj/item/cult_spear/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/cult_spear/ComponentInitialize()
. = ..()
@@ -894,10 +894,10 @@
qdel(src)
return
charging = TRUE
- INVOKE_ASYNC(src, .proc/charge, user)
+ INVOKE_ASYNC(src, PROC_REF(charge), user)
if(do_after(user, 90, target = user))
firing = TRUE
- INVOKE_ASYNC(src, .proc/pewpew, user, params)
+ INVOKE_ASYNC(src, PROC_REF(pewpew), user, params)
var/obj/structure/emergency_shield/invoker/N = new(user.loc)
if(do_after(user, 90, target = user))
user.DefaultCombatKnockdown(40)
@@ -970,7 +970,7 @@
playsound(L, 'sound/hallucinations/wail.ogg', 50, 1)
L.emote("scream")
var/datum/beam/current_beam = new(user,temp_target,time=7,beam_icon_state="blood_beam",btype=/obj/effect/ebeam/blood)
- INVOKE_ASYNC(current_beam, /datum/beam.proc/Start)
+ INVOKE_ASYNC(current_beam, TYPE_PROC_REF(/datum/beam, Start))
/obj/effect/ebeam/blood
@@ -1017,7 +1017,7 @@
playsound(src, 'sound/weapons/parry.ogg', 100, 1)
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 3a4079d67f..8f12696048 100644
--- a/code/modules/antagonists/cult/cult_structures.dm
+++ b/code/modules/antagonists/cult/cult_structures.dm
@@ -111,7 +111,7 @@
to_chat(user, "You study the schematics etched into the altar...")
var/list/options = list("Eldritch Whetstone" = radial_whetstone, "Construct Shell" = radial_shell, "Flask of Unholy Water" = radial_unholy_water)
- var/choice = show_radial_menu(user, src, options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/choice = show_radial_menu(user, src, options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
var/reward
switch(choice)
@@ -158,7 +158,7 @@
var/list/options = list("Shielded Robe" = radial_shielded, "Flagellant's Robe" = radial_flagellant, "Mirror Shield" = radial_mirror)
- var/choice = show_radial_menu(user, src, options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/choice = show_radial_menu(user, src, options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
var/reward
switch(choice)
@@ -294,7 +294,7 @@
to_chat(user, "You flip through the black pages of the archives...")
var/list/options = list("Zealot's Blindfold" = radial_blindfold, "Shuttle Curse" = radial_curse, "Veil Walker Set" = radial_veilwalker)
- var/choice = show_radial_menu(user, src, options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ var/choice = show_radial_menu(user, src, options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE)
var/reward
switch(choice)
diff --git a/code/modules/antagonists/cult/rune_spawn_action.dm b/code/modules/antagonists/cult/rune_spawn_action.dm
index 2dfbf722bf..fd3c704849 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)))
var/obj/effect/rune/new_rune = new rune_type(owner.loc)
new_rune.keyword = chosen_keyword
else
diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm
index c3d1520ef4..f2890cea51 100644
--- a/code/modules/antagonists/cult/runes.dm
+++ b/code/modules/antagonists/cult/runes.dm
@@ -447,7 +447,7 @@ structure_check() searches for nearby cultist structures required for the invoca
outer_portal = new(T, 600, color)
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)
@@ -673,7 +673,7 @@ structure_check() searches for nearby cultist structures required for the invoca
W.density = TRUE
W.update_state()
W.spread_density()
- density_timer = addtimer(CALLBACK(src, .proc/lose_density), 3000, TIMER_STOPPABLE)
+ density_timer = addtimer(CALLBACK(src, PROC_REF(lose_density)), 3000, TIMER_STOPPABLE)
/obj/effect/rune/wall/proc/lose_density()
if(density)
@@ -683,7 +683,7 @@ structure_check() searches for nearby cultist structures required for the invoca
var/oldcolor = color
add_atom_colour("#696969", FIXED_COLOUR_PRIORITY)
animate(src, color = oldcolor, time = 50, easing = EASE_IN)
- addtimer(CALLBACK(src, .proc/recharge), 50)
+ addtimer(CALLBACK(src, PROC_REF(recharge)), 50)
/obj/effect/rune/wall/proc/recharge()
recharging = FALSE
@@ -1001,11 +1001,11 @@ structure_check() searches for nearby cultist structures required for the invoca
if(ishuman(M))
if(!iscultist(M))
AH.remove_hud_from(M)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/hudFix, M), duration)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(hudFix), M), duration)
var/image/A = image('icons/mob/mob.dmi',M,"cultist", ABOVE_MOB_LAYER)
A.override = 1
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "human_apoc", A, FALSE)
- 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/spookoween/ghost_whisper.ogg'),sound('sound/spookoween/ghosty_wind.ogg')))
else
@@ -1013,13 +1013,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, FALSE)
- 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(!iscultist(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, FALSE)
- 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, "An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!")
diff --git a/code/modules/antagonists/devil/devil.dm b/code/modules/antagonists/devil/devil.dm
index 9f69f10887..1715def845 100644
--- a/code/modules/antagonists/devil/devil.dm
+++ b/code/modules/antagonists/devil/devil.dm
@@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master",
/datum/antagonist/devil/get_admin_commands()
. = ..()
- .["Toggle ascendable"] = CALLBACK(src,.proc/admin_toggle_ascendable)
+ .["Toggle ascendable"] = CALLBACK(src,PROC_REF(admin_toggle_ascendable))
/datum/antagonist/devil/proc/admin_toggle_ascendable(mob/admin)
ascendable = !ascendable
diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm
index f6c8c3dbe1..ea538c93ba 100644
--- a/code/modules/antagonists/disease/disease_mob.dm
+++ b/code/modules/antagonists/disease/disease_mob.dm
@@ -67,7 +67,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()
. = ..()
@@ -264,7 +264,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()
@@ -306,7 +306,7 @@ the new instance inside the host to be updated to the template's stats.
/mob/camera/disease/proc/adapt_cooldown()
to_chat(src, "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, "You are now ready to adapt again.")
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
index d7334d6c9c..5ad1c48e3f 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_antag.dm
@@ -144,7 +144,7 @@
/datum/antagonist/heretic/get_admin_commands()
. = ..()
- .["Equip"] = CALLBACK(src,.proc/equip_cultist)
+ .["Equip"] = CALLBACK(src,PROC_REF(equip_cultist))
/datum/antagonist/heretic/roundend_report()
var/list/parts = list()
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm
index 6640135f37..1dffd535fb 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm
@@ -24,7 +24,7 @@
if(!IS_HERETIC(user))
return
if(!is_in_use)
- INVOKE_ASYNC(src, .proc/activate , user)
+ INVOKE_ASYNC(src, PROC_REF(activate ), user)
/obj/effect/eldritch/attackby(obj/item/I, mob/living/user)
. = ..()
@@ -190,7 +190,7 @@
* Use this whenever you want to add someone to the list
*/
/datum/reality_smash_tracker/proc/AddMind(datum/mind/e_cultists)
- RegisterSignal(e_cultists.current,COMSIG_MOB_CLIENT_LOGIN,.proc/ReworkNetwork)
+ RegisterSignal(e_cultists.current,COMSIG_MOB_CLIENT_LOGIN,PROC_REF(ReworkNetwork))
targets |= e_cultists
Generate()
for(var/obj/effect/reality_smash/reality_smash in smashes)
@@ -218,8 +218,8 @@
/obj/effect/broken_illusion/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src,.proc/show_presence),15 SECONDS)
- addtimer(CALLBACK(src,.proc/remove_presence),195 SECONDS)
+ addtimer(CALLBACK(src,PROC_REF(show_presence)),15 SECONDS)
+ addtimer(CALLBACK(src,PROC_REF(remove_presence)),195 SECONDS)
var/image/I = image('icons/effects/eldritch.dmi',src,null,OBJ_LAYER)
I.override = TRUE
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm
index 2ac9cedaaa..7a44f5a2c4 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_knowledge.dm
@@ -170,11 +170,11 @@
to_chat(user, "These items don't possess the required fingerprints or DNA.")
return FALSE
- var/chosen_mob = input("Select the person you wish to curse","Your target") as null|anything in sort_list(compiled_list, /proc/cmp_mob_realname_dsc)
+ var/chosen_mob = input("Select the person you wish to curse","Your target") as null|anything in sort_list(compiled_list, GLOBAL_PROC_REF(cmp_mob_realname_dsc))
if(!chosen_mob)
return FALSE
curse(compiled_list[chosen_mob])
- addtimer(CALLBACK(src, .proc/uncurse, compiled_list[chosen_mob]),timer)
+ addtimer(CALLBACK(src, PROC_REF(uncurse), compiled_list[chosen_mob]),timer)
return TRUE
/datum/eldritch_knowledge/curse/proc/curse(mob/living/chosen_mob)
diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm
index 97b76090a7..9dc1d3f995 100644
--- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm
+++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm
@@ -359,15 +359,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/nightwatchers_rite/proc/line_target(offset, range, atom/at , atom/user)
@@ -446,7 +446,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)
@@ -492,7 +492,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
diff --git a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
index 15ac8a6cb6..59d38acb24 100644
--- a/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
+++ b/code/modules/antagonists/eldritch_cult/knowledge/flesh_lore.dm
@@ -55,7 +55,7 @@
var/datum/antagonist/heretic/master = user.mind.has_antag_datum(/datum/antagonist/heretic)
heretic_monster.set_owner(master)
atoms -= humie
- RegisterSignal(humie,COMSIG_MOB_DEATH,.proc/remove_ghoul)
+ RegisterSignal(humie,COMSIG_MOB_DEATH,PROC_REF(remove_ghoul))
ghouls += humie
/datum/eldritch_knowledge/flesh_ghoul/proc/remove_ghoul(datum/source)
@@ -114,7 +114,7 @@
log_game("[key_name_admin(human_target)] has become a ghoul, their master is [user.real_name]")
//we change it to true only after we know they passed all the checks
. = TRUE
- RegisterSignal(human_target,COMSIG_MOB_DEATH,.proc/remove_ghoul)
+ RegisterSignal(human_target,COMSIG_MOB_DEATH,PROC_REF(remove_ghoul))
human_target.revive(full_heal = TRUE, admin_revive = TRUE)
human_target.setMaxHealth(40)
human_target.health = 40
diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm
index 1dcb054153..a647f802a7 100644
--- a/code/modules/antagonists/gang/gang.dm
+++ b/code/modules/antagonists/gang/gang.dm
@@ -41,7 +41,7 @@
/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))
/datum/antagonist/gang/create_team(team_given) // gets called whenever add_antag_datum() is called on a mind
if(team_given)
diff --git a/code/modules/antagonists/gang/handler.dm b/code/modules/antagonists/gang/handler.dm
index 0f6e28752d..f1cb6a17fa 100644
--- a/code/modules/antagonists/gang/handler.dm
+++ b/code/modules/antagonists/gang/handler.dm
@@ -194,7 +194,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/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm
index f40ecc27cf..540b3251ce 100644
--- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm
+++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm
@@ -157,7 +157,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 af9c10abc6..665a21e593 100644
--- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
+++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm
@@ -470,7 +470,7 @@
sound_to_playing_players('sound/machines/alarm.ogg')
if(SSticker && 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)
@@ -505,7 +505,7 @@
/obj/machinery/nuclearbomb/proc/really_actually_explode(off_station)
Cinematic(get_cinematic_type(off_station),world,CALLBACK(SSticker,/datum/controller/subsystem/ticker/proc/station_explosion_detonation,src))
- INVOKE_ASYNC(GLOBAL_PROC,.proc/KillEveryoneOnZLevel, z)
+ INVOKE_ASYNC(GLOBAL_PROC,PROC_REF(KillEveryoneOnZLevel), z)
/obj/machinery/nuclearbomb/proc/get_cinematic_type(off_station)
if(off_station < 2)
@@ -551,10 +551,10 @@
var/datum/round_event_control/E = locate(/datum/round_event_control/vent_clog/beer) in SSevents.control
if(E)
E.runEvent()
- addtimer(CALLBACK(src, .proc/really_actually_explode), 110)
+ addtimer(CALLBACK(src, PROC_REF(really_actually_explode)), 110)
else
visible_message("[src] fizzes ominously.")
- addtimer(CALLBACK(src, .proc/fizzbuzz), 110)
+ addtimer(CALLBACK(src, PROC_REF(fizzbuzz)), 110)
/obj/machinery/nuclearbomb/beer/proc/disarm()
detonation_timer = null
@@ -727,7 +727,7 @@ This is here to make the tiles around the station mininuke change when it's arme
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(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 9875eb1581..9c0abf70b5 100644
--- a/code/modules/antagonists/nukeop/nukeop.dm
+++ b/code/modules/antagonists/nukeop/nukeop.dm
@@ -126,8 +126,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))
@@ -176,7 +176,7 @@
to_chat(owner, "If you feel you are not up to this task, give your ID to another operative.")
to_chat(owner, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.")
owner.announce_objectives()
- 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()
diff --git a/code/modules/antagonists/overthrow/overthrow.dm b/code/modules/antagonists/overthrow/overthrow.dm
index ed55f0598a..dd21191477 100644
--- a/code/modules/antagonists/overthrow/overthrow.dm
+++ b/code/modules/antagonists/overthrow/overthrow.dm
@@ -83,8 +83,8 @@
/datum/antagonist/overthrow/get_admin_commands()
. = ..()
- .["Give storage with random item"] = CALLBACK(src,.proc/equip_overthrow)
- .["Give overthrow boss equip"] = CALLBACK(src,.proc/equip_initial_overthrow_agent)
+ .["Give storage with random item"] = CALLBACK(src,PROC_REF(equip_overthrow))
+ .["Give overthrow boss equip"] = CALLBACK(src,PROC_REF(equip_initial_overthrow_agent))
// Dynamically creates the HUD for the team if it doesn't exist already, inserting it into the global huds list, and assigns it to the user. The index is saved into a var owned by the team datum.
/datum/antagonist/overthrow/proc/update_overthrow_icons_added(datum/mind/traitor_mind)
diff --git a/code/modules/antagonists/overthrow/overthrow_team.dm b/code/modules/antagonists/overthrow/overthrow_team.dm
index a22f08d45c..9d5ceb748f 100644
--- a/code/modules/antagonists/overthrow/overthrow_team.dm
+++ b/code/modules/antagonists/overthrow/overthrow_team.dm
@@ -25,7 +25,7 @@
target.team = src
target.find_target()
objectives += target
- addtimer(CALLBACK(src,.proc/update_objectives),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)
+ addtimer(CALLBACK(src,PROC_REF(update_objectives)),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)
/datum/team/overthrow/proc/update_objectives()
var/datum/objective/overthrow/heads/heads_obj = locate() in objectives
@@ -40,4 +40,4 @@
O.objectives += heads_obj
heads_obj.find_targets()
- addtimer(CALLBACK(src,.proc/update_objectives),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)
+ addtimer(CALLBACK(src,PROC_REF(update_objectives)),OBJECTIVE_UPDATING_TIME,TIMER_UNIQUE)
diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm
index e6d350064d..f6632bbe76 100644
--- a/code/modules/antagonists/pirate/pirate.dm
+++ b/code/modules/antagonists/pirate/pirate.dm
@@ -70,7 +70,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 07a9b6aba1..13e486bfb1 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -119,7 +119,7 @@
if(stasis)
return
if(revealed && essence <= 0)
- INVOKE_ASYNC(src, .proc/death)
+ INVOKE_ASYNC(src, PROC_REF(death))
if(unreveal_time && world.time >= unreveal_time)
unreveal_time = 0
revealed = FALSE
@@ -201,7 +201,7 @@
adjustBruteLoss(25) //hella effective
inhibited = TRUE
update_action_buttons_icon()
- addtimer(CALLBACK(src, .proc/reset_inhibit), 30)
+ addtimer(CALLBACK(src, PROC_REF(reset_inhibit)), 30)
/mob/living/simple_animal/revenant/proc/reset_inhibit()
inhibited = FALSE
@@ -369,7 +369,7 @@
/obj/item/ectoplasm/revenant/New()
..()
- addtimer(CALLBACK(src, .proc/try_reform), 600)
+ addtimer(CALLBACK(src, PROC_REF(try_reform)), 600)
/obj/item/ectoplasm/revenant/proc/scatter()
qdel(src)
@@ -478,7 +478,7 @@
log_combat(throwable, over, "spooky telekinesised at", throwable)
var/obj/effect/temp_visual/telekinesis/T = new(get_turf(throwable))
T.color = "#8715b4"
- addtimer(CALLBACK(spooker, /mob/living/simple_animal/revenant.proc/telekinesis_cooldown_end), 50)
+ addtimer(CALLBACK(spooker, TYPE_PROC_REF(/mob/living/simple_animal/revenant, telekinesis_cooldown_end)), 50)
sleep(5)
throwable.float(FALSE, TRUE)
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index 885921a944..dbe897d45a 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -195,7 +195,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)
@@ -206,7 +206,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
@@ -236,7 +236,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)
@@ -287,7 +287,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)
@@ -333,7 +333,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 235e50008c..0a398443b9 100644
--- a/code/modules/antagonists/revenant/revenant_blight.dm
+++ b/code/modules/antagonists/revenant/revenant_blight.dm
@@ -64,7 +64,7 @@
affected_mob.visible_message("[affected_mob] looks terrifyingly gaunt...", "You suddenly feel like your skin is wrong...")
affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY)
new /obj/effect/temp_visual/revenant(affected_mob.loc)
- addtimer(CALLBACK(src, .proc/curses), 150)
+ addtimer(CALLBACK(src, PROC_REF(curses)), 150)
/datum/disease/revblight/proc/curses()
if(QDELETED(affected_mob))
diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm
index e4625b4ef2..9a8c081495 100644
--- a/code/modules/antagonists/revolution/revolution.dm
+++ b/code/modules/antagonists/revolution/revolution.dm
@@ -93,7 +93,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
@@ -113,10 +113,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()
@@ -322,7 +322,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()
@@ -348,7 +348,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/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm
index 1c74c0a2c6..bc182a7770 100644
--- a/code/modules/antagonists/slaughter/slaughter.dm
+++ b/code/modules/antagonists/slaughter/slaughter.dm
@@ -135,7 +135,7 @@
. = ..()
add_movespeed_modifier(/datum/movespeed_modifier/slaughter)
var/slowdown_time = 6 SECONDS + (0.5 * consumed_buff)
- addtimer(CALLBACK(src, .proc/remove_movespeed_modifier, /datum/movespeed_modifier/slaughter), slowdown_time, TIMER_UNIQUE | TIMER_OVERRIDE)
+ addtimer(CALLBACK(src, PROC_REF(remove_movespeed_modifier), /datum/movespeed_modifier/slaughter), slowdown_time, TIMER_UNIQUE | TIMER_OVERRIDE)
/mob/living/simple_animal/slaughter/Destroy()
release_victims()
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index f184961004..68409470fa 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -148,7 +148,7 @@
if(!silent)
to_chat(H, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.")
H.dna.remove_mutation(CLOWNMUT)
- RegisterSignal(M, COMSIG_MOVABLE_HEAR, .proc/handle_hearing)
+ RegisterSignal(M, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing))
/datum/antagonist/traitor/remove_innate_effects(mob/living/mob_override)
. = ..()
diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
index e5fa38a415..e53f30712e 100644
--- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
+++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm
@@ -456,8 +456,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
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)
@@ -465,7 +465,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
minor_announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.","Network Alert:", TRUE)
to_chat(owner, "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)
@@ -614,7 +614,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
ranged_ability_user.playsound_local(ranged_ability_user, "sparks", 50, 0)
attached_action.adjust_uses(-1)
target.audible_message("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("Overcharging machine...")
return TRUE
@@ -661,7 +661,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
ranged_ability_user.playsound_local(ranged_ability_user, 'sound/misc/interference.ogg', 50, 0)
attached_action.adjust_uses(-1)
target.audible_message("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("Sending override signal...")
return TRUE
@@ -736,7 +736,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
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, "[alert_msg]")
return success
@@ -791,7 +791,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
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, "Emergency light connections severed.")
owner.playsound_local(owner, 'sound/effects/light_flicker.ogg', 50, FALSE)
diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm
index 923eadad3f..ede8656162 100644
--- a/code/modules/antagonists/traitor/syndicate_contract.dm
+++ b/code/modules/antagonists/traitor/syndicate_contract.dm
@@ -62,7 +62,7 @@
var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
var/obj/structure/closet/supplypod/extractionpod/empty_pod = new(pick(get_area_turfs(pod_storage_area))) //Lets not runtime
- RegisterSignal(empty_pod, COMSIG_ATOM_ENTERED, .proc/enter_check)
+ RegisterSignal(empty_pod, COMSIG_ATOM_ENTERED, PROC_REF(enter_check))
empty_pod.stay_after_drop = TRUE
empty_pod.reversing = TRUE
@@ -139,7 +139,7 @@
[C.registered_account.account_balance] cr.", TRUE)
/datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M) // They're off to holding - handle the return timer and give some text about what's going on.
- addtimer(CALLBACK(src, .proc/returnVictim, M), 4 MINUTES) // Ship 'em back - dead or alive... 4 minutes wait.
+ addtimer(CALLBACK(src, PROC_REF(returnVictim), M), 4 MINUTES) // Ship 'em back - dead or alive... 4 minutes wait.
if(M.stat != DEAD) //Even if they weren't the target, we're still treating them the same.
M.reagents.add_reagent(/datum/reagent/medicine/regen_jelly, 20) // Heal them up - gets them out of crit/soft crit. -- now 100% toxinlover friendly!!
M.flash_act()
diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm
index 7df91f4679..99e69e1fa1 100644
--- a/code/modules/antagonists/wizard/equipment/artefact.dm
+++ b/code/modules/antagonists/wizard/equipment/artefact.dm
@@ -120,7 +120,7 @@
insaneinthemembrane.sanity = 0
for(var/lore in typesof(/datum/brain_trauma/severe))
C.gain_trauma(lore)
- addtimer(CALLBACK(src, /obj/singularity/wizard.proc/deranged, C), 100)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/singularity/wizard, deranged), C), 100)
/obj/singularity/wizard/proc/deranged(mob/living/carbon/C)
if(!C || C.stat == DEAD)
diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm
index e0e00b92b9..7cb63500d4 100644
--- a/code/modules/antagonists/wizard/wizard.dm
+++ b/code/modules/antagonists/wizard/wizard.dm
@@ -143,7 +143,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/arousal/genitals.dm b/code/modules/arousal/genitals.dm
index 024dcac868..fffdcb614a 100644
--- a/code/modules/arousal/genitals.dm
+++ b/code/modules/arousal/genitals.dm
@@ -232,7 +232,7 @@
. = ..()
if(.)
update()
- RegisterSignal(owner, COMSIG_MOB_DEATH, .proc/update_appearance_genitals)
+ RegisterSignal(owner, COMSIG_MOB_DEATH, PROC_REF(update_appearance_genitals))
if(genital_flags & GENITAL_THROUGH_CLOTHES)
owner.exposed_genitals += src
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index ce8b39ea3b..c91f1ff1ee 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -60,9 +60,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))
return TRUE
//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm
index 32e262ce65..cc4533f118 100644
--- a/code/modules/assembly/doorcontrol.dm
+++ b/code/modules/assembly/doorcontrol.dm
@@ -40,7 +40,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))
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10)
/obj/item/assembly/control/airlock
@@ -83,7 +83,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)
@@ -96,7 +96,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)
@@ -108,7 +108,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)
@@ -121,7 +121,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)
@@ -139,7 +139,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 de3603ed64..f2469b7087 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -42,7 +42,7 @@
if(flash)
add_overlay(flashing_overlay)
attached_overlays += flashing_overlay
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 5)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 5)
if(holder)
holder.update_icon()
@@ -243,7 +243,7 @@
to_chat(I.owner, "Your photon projector implant overheats and deactivates!")
I.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)
@@ -251,7 +251,7 @@
to_chat(I.owner, "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(1)
return TRUE
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 2cd3b2be18..40fd86601c 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -22,7 +22,7 @@
/obj/item/assembly/infra/ComponentInitialize()
. = ..()
var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS
- AddComponent(/datum/component/simple_rotation, rotation_flags, after_rotation=CALLBACK(src,.proc/after_rotation))
+ AddComponent(/datum/component/simple_rotation, rotation_flags, after_rotation=CALLBACK(src,PROC_REF(after_rotation)))
/obj/item/assembly/infra/proc/after_rotation()
refreshBeam()
@@ -164,7 +164,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/offender)
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index c6fde7ca69..d96c935d74 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -88,7 +88,7 @@
switch(action)
if("signal")
- INVOKE_ASYNC(src, .proc/signal)
+ INVOKE_ASYNC(src, PROC_REF(signal))
. = TRUE
if("freq")
frequency = unformat_frequency(params["freq"])
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index a1202b8955..db64e01618 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("[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*10)//kill yourself once the time runs out
+ addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), time*10)//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 af262aeea8..6b0211226c 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -39,7 +39,7 @@
if(!istype(speaker, /obj/item/assembly/playback)) // Check if it isn't a playback device to prevent spam and lag
if(message_language == languages) // If it isn't in the same language as the message, don't try to find the message
if(check_activation(speaker, raw_message)) // Is it the message?
- addtimer(CALLBACK(src, .proc/pulse, 0), 10)
+ addtimer(CALLBACK(src, PROC_REF(pulse), 0), 10)
/obj/item/assembly/voice/proc/record_speech(atom/movable/speaker, raw_message, datum/language/message_language)
languages = message_language // Assign the message's language to a variable to use it elsewhere
@@ -58,7 +58,7 @@
say("Your voice pattern is saved.", language = languages)
if(VOICE_SENSOR_MODE)
if(length(raw_message))
- addtimer(CALLBACK(src, .proc/pulse, 0), 10)
+ addtimer(CALLBACK(src, PROC_REF(pulse), 0), 10)
/obj/item/assembly/voice/proc/check_activation(atom/movable/speaker, raw_message)
. = FALSE
diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm
index b2da2602ae..bddd97d5a6 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/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index f60e853aed..95baff7625 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -8,7 +8,7 @@
reaction = new r
if(!reaction.exclude)
. += reaction
- sortTim(., /proc/cmp_gas_reaction)
+ sortTim(., GLOBAL_PROC_REF(cmp_gas_reaction))
/proc/cmp_gas_reaction(datum/gas_reaction/a, datum/gas_reaction/b) // compares lists of reactions by the maximum priority contained within the list
return b.priority - a.priority
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 19b94eb64e..7a96a1899a 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -216,7 +216,7 @@
/obj/machinery/airalarm/Initialize(mapload, ndir, nbuild)
. = ..()
regenerate_TLV()
- RegisterSignal(SSdcs,COMSIG_GLOB_NEW_GAS,.proc/regenerate_TLV)
+ RegisterSignal(SSdcs,COMSIG_GLOB_NEW_GAS,PROC_REF(regenerate_TLV))
wires = new /datum/wires/airalarm(src)
if(ndir)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
index 35eb178771..8217ca4102 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
@@ -48,7 +48,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), 10)
+ addtimer(CALLBACK(src, PROC_REF(finish_interact)), 10)
/obj/machinery/atmospherics/components/binary/valve/proc/finish_interact()
toggle()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index f5c10b365f..cb74b71473 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -152,7 +152,7 @@
occupant_overlay.pixel_y--
add_overlay(occupant_overlay)
add_overlay("cover-on")
- addtimer(CALLBACK(src, .proc/run_anim, anim_up, occupant_overlay), 7, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(run_anim), anim_up, occupant_overlay), 7, TIMER_UNIQUE)
/obj/machinery/atmospherics/components/unary/cryo_cell/nap_violation(mob/violator)
open_machine()
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 0492f529ad..b4a71fecb1 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -126,7 +126,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)
@@ -134,7 +134,7 @@
var/datum/gas_mixture/air_contents = airs[1]
volume_rate = clamp(number, 0, air_contents.return_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_icon()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index 072babdf3e..18493b8e58 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -34,7 +34,7 @@
if(!id_tag)
id_tag = assign_uid_vents()
generate_clean_filter_types()
- RegisterSignal(SSdcs,COMSIG_GLOB_NEW_GAS,.proc/generate_clean_filter_types)
+ RegisterSignal(SSdcs,COMSIG_GLOB_NEW_GAS,PROC_REF(generate_clean_filter_types))
/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/generate_clean_filter_types()
clean_filter_types = list()
diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm
index b426b3082a..aedd12a68d 100644
--- a/code/modules/awaymissions/capture_the_flag.dm
+++ b/code/modules/awaymissions/capture_the_flag.dm
@@ -262,7 +262,7 @@
var/turf/T = get_turf(body)
new /obj/effect/ctf/ammo(T)
recently_dead_ckeys += body.ckey
- 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)
body.dust()
/obj/machinery/capture_the_flag/proc/clear_cooldown(ckey)
@@ -390,7 +390,7 @@
/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped()
. = ..()
- addtimer(CALLBACK(src, .proc/floor_vanish), 1)
+ addtimer(CALLBACK(src, PROC_REF(floor_vanish)), 1)
/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/proc/floor_vanish()
if(isturf(loc))
@@ -418,7 +418,7 @@
/obj/item/gun/ballistic/automatic/laser/ctf/dropped()
. = ..()
- addtimer(CALLBACK(src, .proc/floor_vanish), 1)
+ addtimer(CALLBACK(src, PROC_REF(floor_vanish)), 1)
/obj/item/gun/ballistic/automatic/laser/ctf/proc/floor_vanish()
if(isturf(loc))
@@ -429,7 +429,7 @@
/obj/item/ammo_box/magazine/recharge/ctf/dropped()
. = ..()
- addtimer(CALLBACK(src, .proc/floor_vanish), 1)
+ addtimer(CALLBACK(src, PROC_REF(floor_vanish)), 1)
/obj/item/ammo_box/magazine/recharge/ctf/proc/floor_vanish()
if(isturf(loc))
@@ -500,7 +500,7 @@
/obj/item/claymore/ctf/dropped(mob/user)
. = ..()
- addtimer(CALLBACK(src, .proc/floor_vanish), 1)
+ addtimer(CALLBACK(src, PROC_REF(floor_vanish)), 1)
/obj/item/claymore/ctf/proc/floor_vanish()
if(isturf(loc))
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 6a71545ce4..669a226c08 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -72,7 +72,7 @@
/obj/effect/mob_spawn/Initialize(mapload)
. = ..()
if(instant || (roundstart && (mapload || (SSticker && SSticker.current_state > GAME_STATE_SETTING_UP))))
- INVOKE_ASYNC(src, .proc/create)
+ INVOKE_ASYNC(src, PROC_REF(create))
else if(ghost_usable)
GLOB.poi_list |= src
LAZYADD(GLOB.mob_spawners[job_description ? job_description : name], src)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index 4fbe5f467a..2a812e53d8 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/jungleresort.dm b/code/modules/awaymissions/mission_code/jungleresort.dm
index 934f3e5e1f..910533ea12 100644
--- a/code/modules/awaymissions/mission_code/jungleresort.dm
+++ b/code/modules/awaymissions/mission_code/jungleresort.dm
@@ -28,7 +28,7 @@
/obj/item/clothing/head/rice_hat/cursed/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/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm
index eef757cf8e..f58dae49df 100644
--- a/code/modules/awaymissions/mission_code/murderdome.dm
+++ b/code/modules/awaymissions/mission_code/murderdome.dm
@@ -28,7 +28,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/balloon_alert/balloon_alert.dm b/code/modules/balloon_alert/balloon_alert.dm
index f529768b1d..fd77e2541e 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, 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 e8490837c3..e15f4b8675 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/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm
index f071761adb..557eb414e2 100644
--- a/code/modules/cargo/centcom_podlauncher.dm
+++ b/code/modules/cargo/centcom_podlauncher.dm
@@ -344,7 +344,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/item/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/item/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/gondolapod.dm b/code/modules/cargo/gondolapod.dm
index cbc4f088cd..82fb5f4ecf 100644
--- a/code/modules/cargo/gondolapod.dm
+++ b/code/modules/cargo/gondolapod.dm
@@ -67,7 +67,7 @@
/mob/living/simple_animal/pet/gondola/gondolapod/setOpened()
opened = TRUE
update_icon()
- 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/organic.dm b/code/modules/cargo/packs/organic.dm
index 0f01dfd5d9..878f28dd65 100644
--- a/code/modules/cargo/packs/organic.dm
+++ b/code/modules/cargo/packs/organic.dm
@@ -114,7 +114,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.")
break
diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm
index b0b77ec2b4..e1bf8da624 100644
--- a/code/modules/cargo/supplypod.dm
+++ b/code/modules/cargo/supplypod.dm
@@ -275,11 +275,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)
@@ -307,9 +307,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)
@@ -330,7 +330,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()
@@ -407,7 +407,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
@@ -589,8 +589,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)
@@ -613,7 +613,7 @@
if (pod.style != STYLE_INVISIBLE)
animate(pod.get_filter("motionblur"), y = 0, time = pod.delays[POD_FALLING], flags = ANIMATION_PARALLEL)
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, flags = ANIMATION_PARALLEL) //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)
@@ -629,7 +629,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 b749d4def6..9e5fc7565d 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,0)
playsound(src,'sound/machines/warning-buzzer.ogg',50,0)
- 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,0)
diff --git a/code/modules/client/client_colour.dm b/code/modules/client/client_colour.dm
index d89598f6cb..70260f3fcc 100644
--- a/code/modules/client/client_colour.dm
+++ b/code/modules/client/client_colour.dm
@@ -27,7 +27,7 @@
var/datum/client_colour/CC = new colour_type()
client_colours |= CC
- sortTim(client_colours, /proc/cmp_clientcolour_priority)
+ sortTim(client_colours, GLOBAL_PROC_REF(cmp_clientcolour_priority))
update_client_colour()
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 4d1ad44ae9..7ea3253b46 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -298,7 +298,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
prefs = new /datum/preferences(src)
GLOB.preferences_datums[ckey] = prefs
- addtimer(CALLBACK(src, .proc/ensure_keys_set, prefs), 10) //prevents possible race conditions
+ addtimer(CALLBACK(src, PROC_REF(ensure_keys_set), prefs), 10) //prevents possible race conditions
prefs.last_ip = address //these are gonna be used for banning
prefs.last_id = computer_id //these are gonna be used for banning
@@ -368,7 +368,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
// Initialize tgui panel
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()
if(alert_mob_dupe_login && !holder)
@@ -971,7 +971,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)
@@ -1036,7 +1036,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list(
var/mob/living/M = mob
M.update_damage_hud()
if (prefs.auto_fit_viewport)
- addtimer(CALLBACK(src,.verb/fit_viewport,10)) //Delayed to avoid wingets from Login calls.
+ addtimer(CALLBACK(src,VERB_REF(fit_viewport),10)) //Delayed to avoid wingets from Login calls.
SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_CHANGE_VIEW, src, old_view, actualview)
/client/proc/AnnouncePR(announcement)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 24d9afb4e4..ac777f8b6b 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1772,7 +1772,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
//The job before the current job. I only use this to get the previous jobs color when I'm filling in blank rows.
var/datum/job/lastJob
- for(var/datum/job/job in sort_list(SSjob.occupations, /proc/cmp_job_display_asc))
+ for(var/datum/job/job in sort_list(SSjob.occupations, GLOBAL_PROC_REF(cmp_job_display_asc)))
index += 1
if((index >= limit) || (job.title in splitJobs))
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index e98b134f74..12cae3298b 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -47,7 +47,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
outline_color = COLOR_THEME_MIDNIGHT
if(current_version < 46) //If you remove this, remove force_reset_keybindings() too.
force_reset_keybindings_direct(TRUE)
- addtimer(CALLBACK(src, .proc/force_reset_keybindings), 30) //No mob available when this is run, timer allows user choice.
+ addtimer(CALLBACK(src, PROC_REF(force_reset_keybindings)), 30) //No mob available when this is run, timer allows user choice.
if(current_version < 55) //Bitflag toggles don't set their defaults when they're added, always defaulting to off instead.
toggles |= SOUND_BARK
if(current_version < 56)
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index 05ef6f18e0..70eb975246 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()
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index ca2d45526d..712f835012 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -184,7 +184,7 @@ MOVED TO: modular_splurt/code/module/clothing/clothing.dm
if(iscarbon(loc))
var/mob/living/carbon/C = loc
C.visible_message("The [zone_name] on [C]'s [src.name] is [break_verb] away!", "The [zone_name] on your [src.name] is [break_verb] away!", vision_distance = COMBAT_MESSAGE_RANGE)
- RegisterSignal(C, COMSIG_MOVABLE_MOVED, .proc/bristle)
+ RegisterSignal(C, COMSIG_MOVABLE_MOVED, PROC_REF(bristle))
zones_disabled++
for(var/i in zone2body_parts_covered(def_zone))
@@ -227,7 +227,7 @@ MOVED TO: modular_splurt/code/module/clothing/clothing.dm
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)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(bristle))
if(LAZYLEN(user_vars_to_edit))
for(var/variable in user_vars_to_edit)
if(variable in user.vars)
diff --git a/code/modules/clothing/glasses/phantomthief.dm b/code/modules/clothing/glasses/phantomthief.dm
index db77f17218..47d02dd61e 100644
--- a/code/modules/clothing/glasses/phantomthief.dm
+++ b/code/modules/clothing/glasses/phantomthief.dm
@@ -35,7 +35,7 @@
return
if(slot != ITEM_SLOT_EYES)
return
- RegisterSignal(user, COMSIG_LIVING_COMBAT_ENABLED, .proc/injectadrenaline)
+ RegisterSignal(user, COMSIG_LIVING_COMBAT_ENABLED, PROC_REF(injectadrenaline))
/obj/item/clothing/glasses/phantomthief/syndicate/dropped(mob/user)
. = ..()
diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm
index cec4324b3c..3ca1c99dfe 100644
--- a/code/modules/clothing/gloves/_gloves.dm
+++ b/code/modules/clothing/gloves/_gloves.dm
@@ -16,7 +16,7 @@
/obj/item/clothing/gloves/ComponentInitialize()
. = ..()
- RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, /atom.proc/clean_blood)
+ RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, TYPE_PROC_REF(/atom, clean_blood))
/obj/item/clothing/gloves/clean_blood(datum/source, strength)
. = ..()
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index d763899987..1837504e99 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -50,7 +50,7 @@
/obj/item/clothing/gloves/color/yellow/sprayon/equipped(mob/user, slot)
. = ..()
- RegisterSignal(user, COMSIG_LIVING_SHOCK_PREVENTED, .proc/Shocked)
+ RegisterSignal(user, COMSIG_LIVING_SHOCK_PREVENTED, PROC_REF(Shocked))
/obj/item/clothing/gloves/color/yellow/sprayon/proc/Shocked()
shocks_remaining--
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index efa00ef888..3f711cfe25 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -200,7 +200,7 @@
/obj/item/clothing/gloves/fingerless/ablative/equipped(mob/user, slot)
. = ..()
if(current_equipped_slot == ITEM_SLOT_GLOVES)
- RegisterSignal(user, COMSIG_LIVING_ACTIVE_PARRY_START, .proc/get_component_parry_data)
+ RegisterSignal(user, COMSIG_LIVING_ACTIVE_PARRY_START, PROC_REF(get_component_parry_data))
wornonce = TRUE
/obj/item/clothing/gloves/fingerless/ablative/dropped(mob/user)
diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
index 40729a442d..db9eda055d 100644
--- a/code/modules/clothing/head/jobs.dm
+++ b/code/modules/clothing/head/jobs.dm
@@ -221,7 +221,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/misc.dm b/code/modules/clothing/head/misc.dm
index 0a626a0558..be32618c88 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -356,7 +356,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))
else
UnregisterSignal(M, COMSIG_MOB_SAY)
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index c0ff26342e..37cea9e30a 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -261,7 +261,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()
diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm
index b30adedb4b..bc4fc4fe23 100644
--- a/code/modules/clothing/masks/_masks.dm
+++ b/code/modules/clothing/masks/_masks.dm
@@ -19,7 +19,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)
diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm
index 606c361ab0..0d71c9b5b2 100644
--- a/code/modules/clothing/shoes/_shoes.dm
+++ b/code/modules/clothing/shoes/_shoes.dm
@@ -32,7 +32,7 @@
/obj/item/clothing/shoes/ComponentInitialize()
. = ..()
- RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, /atom.proc/clean_blood)
+ RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, TYPE_PROC_REF(/atom, clean_blood))
/obj/item/clothing/shoes/suicide_act(mob/living/carbon/user)
if(rand(2)>1)
@@ -96,7 +96,7 @@
equipped_before_drop = TRUE
if(can_be_tied && tied == SHOES_UNTIED)
our_alert = user.throw_alert("shoealert", /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
@@ -153,7 +153,7 @@
else
if(tied == SHOES_UNTIED && our_guy && user == our_guy)
our_alert = our_guy.throw_alert("shoealert", /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
@@ -180,7 +180,7 @@
return
user.visible_message("[user] begins [tied ? "unknotting" : "tying"] the laces of [user.p_their()] [src.name].", "You begin [tied ? "unknotting" : "tying"] the laces of your [src.name]...")
- if(do_after(user, lace_time, our_guy, extra_checks = CALLBACK(src, .proc/still_shoed, our_guy)))
+ if(do_after(user, lace_time, our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy)))
to_chat(user, "You [tied ? "unknot" : "tie"] the laces of your [src.name].")
if(tied == SHOES_UNTIED)
adjust_laces(SHOES_TIED, user)
@@ -204,7 +204,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, our_guy, extra_checks = CALLBACK(src, .proc/still_shoed, our_guy)))
+ if(do_after(user, mod_time, our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy)))
to_chat(user, "You [tied ? "untie" : "knot"] the laces on [loc]'s [src.name].")
if(tied == SHOES_UNTIED)
adjust_laces(SHOES_KNOTTED, user)
@@ -285,6 +285,6 @@
to_chat(user, "You begin [tied ? "untying" : "tying"] the laces on [src]...")
- if(do_after(user, lace_time, src, extra_checks = CALLBACK(src, .proc/still_shoed, user)))
+ if(do_after(user, lace_time, src, extra_checks = CALLBACK(src, PROC_REF(still_shoed), user)))
to_chat(user, "You [tied ? "untie" : "tie"] the laces on [src].")
adjust_laces(tied ? SHOES_TIED : SHOES_UNTIED, user)
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index 726b284632..cb9ff71776 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -90,14 +90,14 @@
/obj/item/clothing/shoes/magboots/crushing/attack_self(mob/user)
. = ..()
if (magpulse)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED,.proc/crush)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED,PROC_REF(crush))
else
UnregisterSignal(user,COMSIG_MOVABLE_MOVED)
/obj/item/clothing/shoes/magboots/crushing/equipped(mob/user,slot)
. = ..()
if (slot == ITEM_SLOT_FEET && magpulse)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED,.proc/crush)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED,PROC_REF(crush))
/obj/item/clothing/shoes/magboots/crushing/dropped(mob/user)
. = ..()
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index 08a77b9b2b..4f6a2d4263 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -384,13 +384,13 @@
return
active = TRUE
set_light(2, 3, rgb(rand(0,255),rand(0,255),rand(0,255)))
- addtimer(CALLBACK(src, .proc/lightUp), 5)
+ addtimer(CALLBACK(src, PROC_REF(lightUp)), 5)
/obj/item/clothing/shoes/kindleKicks/proc/lightUp(mob/user)
if(lightCycle < 15)
set_light(2, 3, rgb(rand(0,255),rand(0,255),rand(0,255)))
lightCycle += 1
- addtimer(CALLBACK(src, .proc/lightUp), 5)
+ addtimer(CALLBACK(src, PROC_REF(lightUp)), 5)
else
set_light(0)
lightCycle = 0
@@ -469,7 +469,7 @@
/obj/item/clothing/shoes/wallwalkers/equipped(mob/user,slot)
. = ..()
if(slot == ITEM_SLOT_FEET)
- RegisterSignal(user, COMSIG_MOB_CLIENT_MOVE,.proc/intercept_user_move)
+ RegisterSignal(user, COMSIG_MOB_CLIENT_MOVE,PROC_REF(intercept_user_move))
/obj/item/clothing/shoes/wallwalkers/dropped(mob/user)
. = ..()
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index 5ec0fad2e6..cad9e0a3b3 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -129,12 +129,12 @@
user.Stun(INFINITY)
animate(user, color = "#00ccee", time = 3)
- phase_timer_id = addtimer(CALLBACK(src, .proc/phase_2, user, to_turf, phase_in_ds), 3, TIMER_STOPPABLE)
+ phase_timer_id = addtimer(CALLBACK(src, PROC_REF(phase_2), user, to_turf, phase_in_ds), 3, TIMER_STOPPABLE)
/obj/item/clothing/suit/space/chronos/proc/phase_2(mob/living/carbon/human/user, turf/to_turf, phase_in_ds)
if(teleporting && activated && user)
animate(user, alpha = 0, time = 2)
- phase_timer_id = addtimer(CALLBACK(src, .proc/phase_3, user, to_turf, phase_in_ds), 2, TIMER_STOPPABLE)
+ phase_timer_id = addtimer(CALLBACK(src, PROC_REF(phase_3), user, to_turf, phase_in_ds), 2, TIMER_STOPPABLE)
else
finish_chronowalk(user, to_turf)
@@ -142,14 +142,14 @@
if(teleporting && activated && user)
user.forceMove(to_turf)
animate(user, alpha = 255, time = phase_in_ds)
- phase_timer_id = addtimer(CALLBACK(src, .proc/phase_4, user, to_turf), phase_in_ds, TIMER_STOPPABLE)
+ phase_timer_id = addtimer(CALLBACK(src, PROC_REF(phase_4), user, to_turf), phase_in_ds, TIMER_STOPPABLE)
else
finish_chronowalk(user, to_turf)
/obj/item/clothing/suit/space/chronos/proc/phase_4(mob/living/carbon/human/user, turf/to_turf)
if(teleporting && activated && user)
animate(user, color = "#ffffff", time = 3)
- phase_timer_id = addtimer(CALLBACK(src, .proc/finish_chronowalk, user, to_turf), 3, TIMER_STOPPABLE)
+ phase_timer_id = addtimer(CALLBACK(src, PROC_REF(finish_chronowalk), user, to_turf), 3, TIMER_STOPPABLE)
else
finish_chronowalk(user, to_turf)
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 274663a3b1..1ebcb05d8c 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -241,7 +241,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
@@ -274,7 +274,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
@@ -746,7 +746,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(mob/user)
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 24f91a3ab2..031e081d7a 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -397,7 +397,7 @@ Contains:
/obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/anti_magic, FALSE, FALSE, TRUE, ITEM_SLOT_HEAD, charges, TRUE, null, CALLBACK(src, .proc/anti_magic_gone))
+ AddComponent(/datum/component/anti_magic, FALSE, FALSE, TRUE, ITEM_SLOT_HEAD, charges, TRUE, null, CALLBACK(src, PROC_REF(anti_magic_gone)))
/obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/proc/anti_magic_gone()
var/mob/M = loc
@@ -418,7 +418,7 @@ Contains:
/obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize(mapload)
. = ..()
- AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, ITEM_SLOT_OCLOTHING, charges, TRUE, null, CALLBACK(src, .proc/anti_magic_gone))
+ AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, ITEM_SLOT_OCLOTHING, charges, TRUE, null, CALLBACK(src, PROC_REF(anti_magic_gone)))
/obj/item/clothing/suit/space/hardsuit/ert/paranormal/proc/anti_magic_gone()
var/mob/M = loc
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index 8eacf66bbe..2b7f1db484 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -65,7 +65,7 @@
/obj/item/clothing/head/helmet/space/plasmaman/ComponentInitialize()
. = ..()
- RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, .proc/wipe_that_smile_off_your_face)
+ RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(wipe_that_smile_off_your_face))
AddElement(/datum/element/update_icon_updates_onmob)
/obj/item/clothing/head/helmet/space/plasmaman/AltClick(mob/user)
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index 0d8aa60ba5..da80479bd3 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -187,7 +187,7 @@
/datum/action/item_action/stickmen/New(Target)
..()
if(isitem(Target))
- RegisterSignal(Target, COMSIG_PARENT_EXAMINE, .proc/give_infos)
+ RegisterSignal(Target, COMSIG_PARENT_EXAMINE, PROC_REF(give_infos))
/datum/action/item_action/stickmen/Destroy()
for(var/A in summoned_stickmen)
@@ -209,7 +209,7 @@
/datum/action/item_action/stickmen/Grant(mob/M)
. = ..()
if(owner)
- RegisterSignal(M, COMSIG_MOB_POINTED, .proc/rally)
+ RegisterSignal(M, COMSIG_MOB_POINTED, PROC_REF(rally))
if(book_of_grudges[M]) //Stop attacking your new master.
book_of_grudges -= M
for(var/A in summoned_stickmen)
@@ -246,9 +246,9 @@
var/mob/living/simple_animal/hostile/S = new summoned_mob_path (get_turf(usr))
S.faction = owner.faction
S.foes = book_of_grudges
- RegisterSignal(S, COMSIG_PARENT_QDELETING, .proc/remove_from_list)
+ RegisterSignal(S, COMSIG_PARENT_QDELETING, PROC_REF(remove_from_list))
ready = FALSE
- addtimer(CALLBACK(src, .proc/ready_again), cooldown)
+ addtimer(CALLBACK(src, PROC_REF(ready_again)), cooldown)
/datum/action/item_action/stickmen/proc/remove_from_list(datum/source, forced)
summoned_stickmen -= source
@@ -277,9 +277,9 @@
var/obj/vehicle/sealed/mecha/M = A
L = pick(M.occupants)
if(L && L.stat != DEAD && !HAS_TRAIT(L, TRAIT_DEATHCOMA)) //Taking revenge on the deads would be proposterous.
- addtimer(CALLBACK(src, .proc/clear_grudge, L), 2 MINUTES, TIMER_OVERRIDE|TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(clear_grudge), L), 2 MINUTES, TIMER_OVERRIDE|TIMER_UNIQUE)
if(!book_of_grudges[L])
- RegisterSignal(L, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_DEATH), .proc/grudge_settled)
+ RegisterSignal(L, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_DEATH), PROC_REF(grudge_settled))
book_of_grudges[L] = TRUE
for(var/k in summoned_stickmen) //Shamelessly copied from the blob rally power
var/mob/living/simple_animal/hostile/S = k
diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm
index 70e85a9cfb..8d09b73f86 100644
--- a/code/modules/detectivework/scanner.dm
+++ b/code/modules/detectivework/scanner.dm
@@ -33,7 +33,7 @@
if(log.len && !scanning)
scanning = TRUE
to_chat(user, "Printing report, please wait...")
- addtimer(CALLBACK(src, .proc/PrintReport), 100)
+ addtimer(CALLBACK(src, PROC_REF(PrintReport)), 100)
else
to_chat(user, "The scanner has no logs or is in use.")
diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm
index ec69f9e2c9..2dca91c6ef 100644
--- a/code/modules/events/fake_virus.dm
+++ b/code/modules/events/fake_virus.dm
@@ -26,7 +26,7 @@
for(var/i=1; i<=rand(1,defacto_min); i++)
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, "[pick("Your head hurts.", "Your head pounds.")]"), rand(30,150))
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), onecoughman, "[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 13964d6ec6..7313864780 100644
--- a/code/modules/events/fugitive_spawning.dm
+++ b/code/modules/events/fugitive_spawning.dm
@@ -58,7 +58,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
@@ -71,7 +71,7 @@
player_mind.special_role = "Fugitive"
player_mind.add_antag_datum(/datum/antagonist/fugitive)
var/datum/antagonist/fugitive/fugitiveantag = player_mind.has_antag_datum(/datum/antagonist/fugitive)
- INVOKE_ASYNC(fugitiveantag, /datum/antagonist/fugitive.proc/greet, backstory) //some fugitives have a sleep on their greet, so we don't want to stop the entire antag granting proc with fluff
+ INVOKE_ASYNC(fugitiveantag, TYPE_PROC_REF(/datum/antagonist/fugitive, greet), backstory) //some fugitives have a sleep on their greet, so we don't want to stop the entire antag granting proc with fluff
switch(backstory)
if("prisoner")
diff --git a/code/modules/events/ghost_role.dm b/code/modules/events/ghost_role.dm
index baabb435bc..8d4785f838 100644
--- a/code/modules/events/ghost_role.dm
+++ b/code/modules/events/ghost_role.dm
@@ -32,7 +32,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/pirates.dm b/code/modules/events/pirates.dm
index 1b1fdee584..6d00024a5c 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -59,8 +59,8 @@
// threat_msg.title = "Business proposition"
// threat_msg.content = "Ahoy! This be the [ship_name]. Cough up [payoff] credits or you'll walk the plank."
// threat_msg.possible_answers = list("We'll pay.","We will not be extorted.")
- threat_msg.answer_callback = CALLBACK(GLOBAL_PROC, .proc/pirates_answered, threat_msg, payoff, ship_name, initial_send_time, response_max_time, ship_template)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/spawn_pirates, threat_msg, ship_template, FALSE), response_max_time)
+ threat_msg.answer_callback = CALLBACK(GLOBAL_PROC, PROC_REF(pirates_answered), threat_msg, payoff, ship_name, initial_send_time, response_max_time, ship_template)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(spawn_pirates), threat_msg, ship_template, FALSE), response_max_time)
SScommunications.send_message(threat_msg,unique = TRUE)
/proc/pirates_answered(datum/comm_message/threat_msg, payoff, ship_name, initial_send_time, response_max_time, ship_template)
@@ -423,7 +423,7 @@
status_report = "Sending... "
pad.visible_message("[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/wizard/fakeexplosion.dm b/code/modules/events/wizard/fakeexplosion.dm
index 7a89fc14bd..cdc16a61d9 100644
--- a/code/modules/events/wizard/fakeexplosion.dm
+++ b/code/modules/events/wizard/fakeexplosion.dm
@@ -8,4 +8,4 @@
/datum/round_event/wizard/fake_explosion/start()
sound_to_playing_players('sound/machines/alarm.ogg')
- addtimer(CALLBACK(GLOBAL_PROC,.proc/Cinematic, CINEMATIC_NUKE_FAKE, world), 100)
+ addtimer(CALLBACK(GLOBAL_PROC,PROC_REF(Cinematic), CINEMATIC_NUKE_FAKE, world), 100)
diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm
index 281c4ba002..b38c9abe05 100644
--- a/code/modules/events/wizard/greentext.dm
+++ b/code/modules/events/wizard/greentext.dm
@@ -36,7 +36,7 @@
/obj/item/greentext/Initialize(mapload)
. = ..()
GLOB.poi_list |= src
- roundend_callback = CALLBACK(src,.proc/check_winner)
+ roundend_callback = CALLBACK(src,PROC_REF(check_winner))
SSticker.OnRoundend(roundend_callback)
/obj/item/greentext/Destroy(force)
diff --git a/code/modules/fields/fields.dm b/code/modules/fields/fields.dm
index 0bdabf5e8e..9e40be3c4d 100644
--- a/code/modules/fields/fields.dm
+++ b/code/modules/fields/fields.dm
@@ -158,7 +158,7 @@
var/atom/_host = host
var/atom/new_host_loc = _host.loc
if(last_host_loc != new_host_loc)
- INVOKE_ASYNC(src, .proc/recalculate_field)
+ INVOKE_ASYNC(src, PROC_REF(recalculate_field))
/datum/proximity_monitor/advanced/proc/post_setup_field()
@@ -310,7 +310,7 @@
UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
listeningTo = null
if(!istype(current) && operating)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_mob_move)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_move))
listeningTo = user
setup_debug_field()
else if(!operating)
diff --git a/code/modules/fields/infinite_void.dm b/code/modules/fields/infinite_void.dm
index 06b656a3a9..b6f23861d1 100644
--- a/code/modules/fields/infinite_void.dm
+++ b/code/modules/fields/infinite_void.dm
@@ -31,7 +31,7 @@
if(G.summoner && locate(/obj/effect/proc_holder/spell/aoe_turf/domain_expansion) 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/domain_expansion)
+ INVOKE_ASYNC(src, PROC_REF(domain_expansion))
/obj/effect/domain_expansion/Destroy()
QDEL_NULL(chronofield)
@@ -93,8 +93,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/modules/fields/timestop.dm b/code/modules/fields/timestop.dm
index db42ad6798..84df3dec0f 100644
--- a/code/modules/fields/timestop.dm
+++ b/code/modules/fields/timestop.dm
@@ -33,7 +33,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(chronofield)
@@ -100,8 +100,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/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm
index d017ffee6d..0ab4af3121 100644
--- a/code/modules/flufftext/Dreaming.dm
+++ b/code/modules/flufftext/Dreaming.dm
@@ -78,6 +78,6 @@
dream_fragments.Cut(1,2)
to_chat(src, "... [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 6aed1ba7d7..aac2193ce3 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -301,7 +301,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/bubble_attack, landing), 10)
+ addtimer(CALLBACK(src, PROC_REF(bubble_attack), landing), 10)
/datum/hallucination/oh_yeah/proc/bubble_attack(turf/landing)
var/charged = FALSE //only get hit once
@@ -345,10 +345,10 @@ GLOBAL_LIST_INIT(hallucination_list, list(
for(var/i in 1 to rand(5, 10))
target.playsound_local(source, 'sound/weapons/laser.ogg', 25, 1)
if(prob(50))
- addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/weapons/sear.ogg', 25, 1), rand(5,10))
+ addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/weapons/sear.ogg', 25, 1), rand(5,10))
hits++
else
- addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/weapons/effects/searwall.ogg', 25, 1), rand(5,10))
+ addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/weapons/effects/searwall.ogg', 25, 1), rand(5,10))
sleep(rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 6))
if(hits >= 4 && prob(70))
target.playsound_local(source, get_sfx("bodyfall"), 25, 1)
@@ -358,10 +358,10 @@ GLOBAL_LIST_INIT(hallucination_list, list(
for(var/i in 1 to rand(5, 10))
target.playsound_local(source, 'sound/weapons/taser2.ogg', 25, 1)
if(prob(50))
- addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/weapons/tap.ogg', 25, 1), rand(5,10))
+ addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/weapons/tap.ogg', 25, 1), rand(5,10))
hits++
else
- addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/weapons/effects/searwall.ogg', 25, 1), rand(5,10))
+ addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/weapons/effects/searwall.ogg', 25, 1), rand(5,10))
sleep(rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 6))
if(hits >= 3 && prob(70))
target.playsound_local(source, get_sfx("bodyfall"), 25, 1)
@@ -379,10 +379,10 @@ GLOBAL_LIST_INIT(hallucination_list, list(
for(var/i in 1 to rand(3, 6))
target.playsound_local(source, get_sfx("gunshot"), 25)
if(prob(60))
- addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, 'sound/weapons/pierce.ogg', 25, 1), rand(5,10))
+ addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, 'sound/weapons/pierce.ogg', 25, 1), rand(5,10))
hits++
else
- addtimer(CALLBACK(target, /mob/.proc/playsound_local, source, "ricochet", 25, 1), rand(5,10))
+ addtimer(CALLBACK(target, TYPE_PROC_REF(/mob, playsound_local), source, "ricochet", 25, 1), rand(5,10))
sleep(rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 6))
if(hits >= 2 && prob(80))
target.playsound_local(source, get_sfx("bodyfall"), 25, 1)
@@ -1121,7 +1121,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
return
to_chat(target, "You fall into the chasm!")
target.DefaultCombatKnockdown(40)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, target, "It's surprisingly shallow."), 15)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), target, "It's surprisingly shallow."), 15)
QDEL_IN(src, 30)
/obj/effect/hallucination/danger/anomaly
@@ -1244,13 +1244,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 1efff6714a..c0f6e25046 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -91,7 +91,7 @@
if(iscyborg(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell
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/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm
index cb1ed628c4..7bee665e70 100644
--- a/code/modules/food_and_drinks/food/snacks.dm
+++ b/code/modules/food_and_drinks/food/snacks.dm
@@ -100,7 +100,7 @@ All foods are distributed among various categories. Use common sense.
/obj/item/reagent_containers/food/snacks/attack(mob/living/M, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
if(user.a_intent == INTENT_HARM)
return ..()
- INVOKE_ASYNC(src, .proc/attempt_forcefeed, M, user)
+ INVOKE_ASYNC(src, PROC_REF(attempt_forcefeed), M, user)
/obj/item/reagent_containers/food/snacks/proc/attempt_forcefeed(mob/living/M, mob/living/user)
if(!eatverb)
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index c26da941b2..bd707cece7 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -474,7 +474,7 @@
/obj/item/reagent_containers/food/snacks/lollipop/cyborg/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/spamcheck), 1200)
+ addtimer(CALLBACK(src, PROC_REF(spamcheck)), 1200)
/obj/item/reagent_containers/food/snacks/lollipop/cyborg/equipped(mob/living/user, slot)
. = ..(user, slot)
@@ -502,7 +502,7 @@
/obj/item/reagent_containers/food/snacks/gumball/cyborg/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/spamcheck), 1200)
+ addtimer(CALLBACK(src, PROC_REF(spamcheck)), 1200)
/obj/item/reagent_containers/food/snacks/gumball/cyborg/equipped(mob/living/user, slot)
. = ..(user, slot)
diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm
index 831c5c6d16..0cf0e3c2d6 100644
--- a/code/modules/food_and_drinks/food/snacks_pastry.dm
+++ b/code/modules/food_and_drinks/food/snacks_pastry.dm
@@ -501,7 +501,7 @@
for(var/R in S.bonus_reagents)
LAZYSET(S.cached_reagents_amount, R, S.reagents.get_reagent_amount(R))
S.previous_typepath = type
- addtimer(CALLBACK(S, .proc/cool_down), 7 MINUTES) //canonically they reverted back to normal after 7 minutes.
+ addtimer(CALLBACK(S, PROC_REF(cool_down)), 7 MINUTES) //canonically they reverted back to normal after 7 minutes.
/obj/item/reagent_containers/food/snacks/donkpocket/proc/cool_down()
if(!previous_typepath) //This shouldn't happen.
diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
index fc00fd176e..1a28845414 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm
@@ -197,7 +197,7 @@
mob_occupant.death(1)
mob_occupant.ghostize()
qdel(src.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/reagent_containers/food/snacks/meat/slab/allmeat, meat_produced, gibtype, list/datum/disease/diseases)
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index 41cd860362..676a91591d 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, user), wait)
+ addtimer(CALLBACK(src, PROC_REF(loop), type, time, wait, user), wait)
/obj/machinery/microwave/proc/loop_finish(mob/user)
operating = FALSE
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
index 1f01f1f5eb..bdf0fee33a 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, initial(pixel_x)))
- addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, user, "The machine now has [stored_matter] monkey\s worth of material stored."))
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, "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/holiday/holidays.dm b/code/modules/holiday/holidays.dm
index 5a05699f7d..6c87c83eb2 100644
--- a/code/modules/holiday/holidays.dm
+++ b/code/modules/holiday/holidays.dm
@@ -602,7 +602,7 @@ This used to be a comment about ramadan but it got deleted because we don't prea
return "Have a merry Christmas!"
/datum/holiday/xmas/celebrate()
- SSticker.OnRoundstart(CALLBACK(src, .proc/roundstart_celebrate))
+ SSticker.OnRoundstart(CALLBACK(src, PROC_REF(roundstart_celebrate)))
/datum/holiday/xmas/proc/roundstart_celebrate()
for(var/obj/machinery/computer/security/telescreen/entertainment/Monitor in GLOB.machines)
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index 49a5c607ec..d48e4b4393 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -230,7 +230,7 @@
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
@@ -290,7 +290,7 @@
S.flags_1 |= NODECONSTRUCT_1
effects = list()
- addtimer(CALLBACK(src, .proc/finish_spawn), 30)
+ addtimer(CALLBACK(src, PROC_REF(finish_spawn)), 30)
/obj/machinery/computer/holodeck/proc/finish_spawn()
var/list/added = list()
@@ -310,7 +310,7 @@
// Emagging a machine creates an anomaly in the derez systems.
if(O && (obj_flags & EMAGGED) && !stat && !forced)
if((ismob(O) || ismob(O.loc)) && prob(50))
- addtimer(CALLBACK(src, .proc/derez, O, silent), 50) // may last a disturbingly long time
+ addtimer(CALLBACK(src, PROC_REF(derez), O, silent), 50) // may last a disturbingly long time
return
spawned -= O
diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm
index 7340ffda61..28819f815f 100644
--- a/code/modules/holodeck/turfs.dm
+++ b/code/modules/holodeck/turfs.dm
@@ -111,7 +111,7 @@
/turf/open/floor/holofloor/carpet/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 1)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1)
/turf/open/floor/holofloor/carpet/update_icon()
. = ..()
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index fd0f39fd75..a30033a18e 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -47,7 +47,7 @@
to_chat(user, "[I] is stuck to your hand!")
return TRUE
to_chat(user, "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
var/obj/item/W = I
if(W)
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index b0af08d515..f2139b740e 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -162,7 +162,7 @@
C.throw_mode_on()
icon_state = "firelemon_active"
playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
- addtimer(CALLBACK(src, .proc/prime), rand(10, 60))
+ addtimer(CALLBACK(src, PROC_REF(prime)), rand(10, 60))
/obj/item/reagent_containers/food/snacks/grown/firelemon/burn()
prime()
diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm
index c8b952889b..b264bee87a 100644
--- a/code/modules/hydroponics/grown/melon.dm
+++ b/code/modules/hydroponics/grown/melon.dm
@@ -66,7 +66,7 @@
var/uses = 1
if(seed)
uses = round(seed.potency / 20)
- AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, ITEM_SLOT_HANDS, uses, TRUE, CALLBACK(src, .proc/block_magic), CALLBACK(src, .proc/expire)) //deliver us from evil o melon god
+ AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, ITEM_SLOT_HANDS, uses, TRUE, CALLBACK(src, PROC_REF(block_magic)), CALLBACK(src, PROC_REF(expire))) //deliver us from evil o melon god
/obj/item/reagent_containers/food/snacks/grown/holymelon/proc/block_magic(mob/user, major)
if(major)
diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm
index 1a09635e8a..83411f9f85 100644
--- a/code/modules/hydroponics/grown/misc.dm
+++ b/code/modules/hydroponics/grown/misc.dm
@@ -330,7 +330,7 @@
playsound(src, 'sound/effects/fuse.ogg', 100, 0)
message_admins("[ADMIN_LOOKUPFLW(user)] ignited a coconut bomb for detonation at [ADMIN_VERBOSEJMP(user)] [pretty_string_from_reagent_list(reagents.reagent_list)]")
log_game("[key_name(user)] primed a coconut grenade for detonation at [AREACOORD(user)].")
- addtimer(CALLBACK(src, .proc/prime), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(prime)), 5 SECONDS)
icon_state = "coconut_grenade_active"
desc = "RUN!"
if(!seed.get_gene(/datum/plant_gene/trait/glow))
@@ -446,7 +446,7 @@
to_chat(user, "You swallow a gulp of [src].")
var/fraction = min(5/reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
- addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
+ addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), M, 5), 5)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
/obj/item/reagent_containers/food/snacks/grown/coconut/afterattack(obj/target, mob/user, proximity)
diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm
index 8485e20f61..d49e698a39 100644
--- a/code/modules/hydroponics/plant_genes.dm
+++ b/code/modules/hydroponics/plant_genes.dm
@@ -243,7 +243,7 @@
if(!istype(G, /obj/item/grown/bananapeel) && (!G.reagents || !G.reagents.has_reagent(/datum/reagent/lube)))
stun_len /= 3
- G.AddComponent(/datum/component/slippery, min(stun_len,140), NONE, CALLBACK(src, .proc/handle_slip, G))
+ G.AddComponent(/datum/component/slippery, min(stun_len,140), NONE, CALLBACK(src, PROC_REF(handle_slip), G))
/datum/plant_gene/trait/slip/proc/handle_slip(obj/item/reagent_containers/food/snacks/grown/G, mob/M)
for(var/datum/plant_gene/trait/T in G.seed.genes)
diff --git a/code/modules/instruments/instrument_data/_instrument_data.dm b/code/modules/instruments/instrument_data/_instrument_data.dm
index 5d937f304f..5042fa6715 100644
--- a/code/modules/instruments/instrument_data/_instrument_data.dm
+++ b/code/modules/instruments/instrument_data/_instrument_data.dm
@@ -83,7 +83,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/instruments/item.dm b/code/modules/instruments/instruments/item.dm
index 888aac4d40..4c496212c8 100644
--- a/code/modules/instruments/instruments/item.dm
+++ b/code/modules/instruments/instruments/item.dm
@@ -235,7 +235,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/songs/editor.dm b/code/modules/instruments/songs/editor.dm
index e385eed142..d3a3dde935 100644
--- a/code/modules/instruments/songs/editor.dm
+++ b/code/modules/instruments/songs/editor.dm
@@ -157,7 +157,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 = html_encode(input("Enter your line: ", parent.name) as text|null)
diff --git a/code/modules/integrated_electronics/core/printer.dm b/code/modules/integrated_electronics/core/printer.dm
index 5a5eeb8e2b..49be0eb179 100644
--- a/code/modules/integrated_electronics/core/printer.dm
+++ b/code/modules/integrated_electronics/core/printer.dm
@@ -294,7 +294,7 @@
to_chat(usr, "You begin printing a custom assembly. This will take approximately [DisplayTimeText(cloning_time)]. You can still print \
off normal parts during this time.")
playsound(src, 'sound/items/poster_being_created.ogg', 50, TRUE)
- addtimer(CALLBACK(src, .proc/print_program, usr), cloning_time)
+ addtimer(CALLBACK(src, PROC_REF(print_program), usr), cloning_time)
if("cancel")
if(!cloning || !program)
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index d0cd5d53b1..f0f0dc646b 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -654,7 +654,7 @@
/obj/item/integrated_circuit/input/signaler/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/init_frequency), 4 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(init_frequency)), 4 SECONDS)
/obj/item/integrated_circuit/input/signaler/Destroy()
SSradio.remove_object(src,frequency)
diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm
index 8be909163d..a6b8ed7f72 100644
--- a/code/modules/integrated_electronics/subtypes/manipulation.dm
+++ b/code/modules/integrated_electronics/subtypes/manipulation.dm
@@ -348,7 +348,7 @@
assembly.visible_message("[assembly] has thrown [A]!")
log_attack("[assembly] [REF(assembly)] has thrown [A] with non-lethal force.")
A.forceMove(drop_location())
- A.throw_at(locate(x_abs, y_abs, T.z), range, 3, null, null, null, CALLBACK(src, .proc/post_throw, A))
+ A.throw_at(locate(x_abs, y_abs, T.z), range, 3, null, null, null, CALLBACK(src, PROC_REF(post_throw), A))
// If the item came from a grabber now we can update the outputs since we've thrown it.
if(istype(G))
@@ -426,7 +426,7 @@
)
/obj/item/integrated_circuit/manipulation/matman/ComponentInitialize()
- var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, mtypes, 100000, FALSE, /obj/item/stack, CALLBACK(src, .proc/is_insertion_ready), CALLBACK(src, .proc/AfterMaterialInsert))
+ var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, mtypes, 100000, FALSE, /obj/item/stack, CALLBACK(src, PROC_REF(is_insertion_ready)), CALLBACK(src, PROC_REF(AfterMaterialInsert)))
materials.precise_insertion = TRUE
.=..()
diff --git a/code/modules/integrated_electronics/subtypes/output.dm b/code/modules/integrated_electronics/subtypes/output.dm
index a38d9ad5e2..512b4f3dd2 100644
--- a/code/modules/integrated_electronics/subtypes/output.dm
+++ b/code/modules/integrated_electronics/subtypes/output.dm
@@ -327,7 +327,7 @@
oldLoc = get_turf(oldLoc)
if(!QDELETED(camera) && !updating && oldLoc != get_turf(src))
updating = TRUE
- addtimer(CALLBACK(src, .proc/do_camera_update, oldLoc), update_speed)
+ addtimer(CALLBACK(src, PROC_REF(do_camera_update), oldLoc), update_speed)
/obj/item/integrated_circuit/output/video_camera/proc/do_camera_update(oldLoc)
if(!QDELETED(camera) && oldLoc != get_turf(src))
diff --git a/code/modules/integrated_electronics/subtypes/time.dm b/code/modules/integrated_electronics/subtypes/time.dm
index cae43718c2..26e5b16d0a 100644
--- a/code/modules/integrated_electronics/subtypes/time.dm
+++ b/code/modules/integrated_electronics/subtypes/time.dm
@@ -17,7 +17,7 @@
power_draw_per_use = 2
/obj/item/integrated_circuit/time/delay/do_work()
- addtimer(CALLBACK(src, .proc/activate_pin, 2), delay)
+ addtimer(CALLBACK(src, PROC_REF(activate_pin), 2), delay)
/obj/item/integrated_circuit/time/delay/five_sec
name = "five-sec delay circuit"
@@ -98,7 +98,7 @@
/obj/item/integrated_circuit/time/ticker/proc/tick()
if(is_running)
- addtimer(CALLBACK(src, .proc/tick), delay)
+ addtimer(CALLBACK(src, PROC_REF(tick)), delay)
if(world.time > next_fire)
next_fire = world.time + delay
activate_pin(1)
diff --git a/code/modules/integrated_electronics/subtypes/weaponized.dm b/code/modules/integrated_electronics/subtypes/weaponized.dm
index 0458700f44..893f3c5750 100644
--- a/code/modules/integrated_electronics/subtypes/weaponized.dm
+++ b/code/modules/integrated_electronics/subtypes/weaponized.dm
@@ -201,7 +201,7 @@
dt = clamp(detonation_time.data, 1, 12)*10
else
dt = 15
- addtimer(CALLBACK(attached_grenade, /obj/item/grenade.proc/prime), dt)
+ addtimer(CALLBACK(attached_grenade, TYPE_PROC_REF(/obj/item/grenade, prime)), dt)
var/atom/holder = loc
message_admins("activated a grenade assembly. Last touches: Assembly: [holder.fingerprintslast] Circuit: [fingerprintslast] Grenade: [attached_grenade.fingerprintslast]")
diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm
index ce8c54a685..c5f2ff2abe 100644
--- a/code/modules/jobs/job_types/_job.dm
+++ b/code/modules/jobs/job_types/_job.dm
@@ -200,7 +200,7 @@
/datum/job/proc/announce_head(var/mob/living/carbon/human/H, var/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, PROC_REF(_addtimer), CALLBACK(pick(GLOB.announcement_systems), /obj/machinery/announcement_system/proc/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/ai.dm b/code/modules/jobs/job_types/ai.dm
index 9b649135ae..e9753cfcca 100644
--- a/code/modules/jobs/job_types/ai.dm
+++ b/code/modules/jobs/job_types/ai.dm
@@ -68,7 +68,7 @@
/datum/job/ai/announce(mob/living/silicon/ai/AI)
. = ..()
- SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "[AI] has been downloaded to an empty bluespace-networked AI core at [AREACOORD(AI)]."))
+ SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, PROC_REF(minor_announce), "[AI] has been downloaded to an empty bluespace-networked AI core at [AREACOORD(AI)]."))
/datum/job/ai/config_check()
return CONFIG_GET(flag/allow_ai)
diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm
index 65811d40a0..c2aaaf4e09 100644
--- a/code/modules/jobs/job_types/captain.dm
+++ b/code/modules/jobs/job_types/captain.dm
@@ -43,7 +43,7 @@
/datum/job/captain/announce(mob/living/carbon/human/H)
..()
- SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, "Captain [H.nameless ? "" : "[H.real_name] "]on deck!"))
+ SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, PROC_REF(minor_announce), "Captain [H.nameless ? "" : "[H.real_name] "]on deck!"))
/datum/outfit/job/captain
name = "Captain"
diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm
index b5f09c65ca..0e8a7c2039 100644
--- a/code/modules/keybindings/setup.dm
+++ b/code/modules/keybindings/setup.dm
@@ -58,7 +58,7 @@
full_macro_assert(prefs_override)
/client/proc/full_macro_assert(datum/preferences/prefs_override = prefs)
- INVOKE_ASYNC(src, .proc/do_full_macro_assert, prefs_override) // winget sleeps.
+ INVOKE_ASYNC(src, PROC_REF(do_full_macro_assert), prefs_override) // winget sleeps.
// TODO: OVERHAUL ALL OF THIS AGAIN. While this works this is flatout horrid with the "use list but also don't use lists" crap. I hate my life.
/client/proc/do_full_macro_assert(datum/preferences/prefs_override = prefs)
diff --git a/code/modules/library/lib_codex_gigas.dm b/code/modules/library/lib_codex_gigas.dm
index 21296bcba9..09a0a87a28 100644
--- a/code/modules/library/lib_codex_gigas.dm
+++ b/code/modules/library/lib_codex_gigas.dm
@@ -75,7 +75,7 @@
return FALSE
if(action == "search")
SStgui.close_uis(src)
- addtimer(CALLBACK(src, .proc/perform_research, usr, currentName), 0)
+ addtimer(CALLBACK(src, PROC_REF(perform_research), usr, currentName), 0)
currentName = ""
currentSection = PRE_TITLE
return FALSE
diff --git a/code/modules/mafia/controller.dm b/code/modules/mafia/controller.dm
index 43d15ebffe..698a10bb53 100644
--- a/code/modules/mafia/controller.dm
+++ b/code/modules/mafia/controller.dm
@@ -206,10 +206,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)
@@ -222,7 +222,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)
@@ -254,7 +254,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)
@@ -283,13 +283,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.
@@ -404,7 +404,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.
@@ -445,9 +445,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.
@@ -460,7 +460,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)
/**
@@ -560,7 +560,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
/**
@@ -604,7 +604,7 @@
// ADD_TRAIT(H, TRAIT_CANNOT_CRYSTALIZE, MAFIA_TRAIT) freon tomfoolery
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 a48f890d10..2c35d5159f 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
@@ -511,7 +511,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)
. = ..()
@@ -541,7 +541,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)
@@ -572,8 +572,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)
. = ..()
@@ -594,7 +594,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
@@ -633,7 +633,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
@@ -654,7 +654,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)
. = ..()
@@ -701,8 +701,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
@@ -763,8 +763,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
@@ -851,9 +851,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)
. = ..()
@@ -874,7 +874,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
@@ -918,7 +918,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
@@ -934,7 +934,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)
@@ -964,7 +964,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/mining/aux_base.dm b/code/modules/mining/aux_base.dm
index 494ca0e433..14545f9570 100644
--- a/code/modules/mining/aux_base.dm
+++ b/code/modules/mining/aux_base.dm
@@ -283,7 +283,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
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/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 1588dfa5c5..facb34db47 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -38,7 +38,7 @@
/obj/item/clothing/suit/hooded/explorer/standard/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/hooded/explorer/standard/proc/upgrade_icon(datum/source, amount, maxamount)
SIGNAL_HANDLER
@@ -57,7 +57,7 @@
/obj/item/clothing/head/hooded/explorer/standard/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/hooded/explorer/standard/proc/upgrade_icon(datum/source, amount, maxamount)
SIGNAL_HANDLER
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index f89b67d323..ff786cf830 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -39,8 +39,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()
. = ..()
@@ -119,7 +119,7 @@
D.fire()
charged = FALSE
update_icon()
- addtimer(CALLBACK(src, .proc/Recharge), charge_time)
+ addtimer(CALLBACK(src, PROC_REF(Recharge)), charge_time)
return
if(proximity_flag && isliving(target))
var/mob/living/L = target
@@ -513,7 +513,7 @@
continue
playsound(L, 'sound/magic/fireball.ogg', 20, 1)
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)
@@ -577,7 +577,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 0bb082ca57..1e928945e7 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -31,7 +31,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 ed52f8399e..2eaf6ab218 100644
--- a/code/modules/mining/equipment/resonator.dm
+++ b/code/modules/mining/equipment/resonator.dm
@@ -71,7 +71,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 9eed296851..3bc147edaa 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -21,7 +21,7 @@
/obj/item/wormhole_jaunter/equipped(mob/user, slot)
. = ..()
if(slot == ITEM_SLOT_BELT)
- RegisterSignal(user, COMSIG_MOVABLE_CHASM_DROP, .proc/chasm_react)
+ RegisterSignal(user, COMSIG_MOVABLE_CHASM_DROP, PROC_REF(chasm_react))
/obj/item/wormhole_jaunter/dropped(mob/user)
. = ..()
@@ -103,4 +103,4 @@
L.DefaultCombatKnockdown(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 ef1fed4a18..3e4d28d20b 100644
--- a/code/modules/mining/laborcamp/laborstacker.dm
+++ b/code/modules/mining/laborcamp/laborstacker.dm
@@ -28,7 +28,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))
/proc/cmp_sheet_list(list/a, list/b)
return a["value"] - b["value"]
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index b9ab6463c7..f1dc577180 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -45,7 +45,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/ash/proc/regrow()
diff --git a/code/modules/mining/lavaland/ash_tree.dm b/code/modules/mining/lavaland/ash_tree.dm
index e1996d693c..e6cd52fa9e 100644
--- a/code/modules/mining/lavaland/ash_tree.dm
+++ b/code/modules/mining/lavaland/ash_tree.dm
@@ -73,7 +73,7 @@
container_used = W
//So we dont lose are bowl when cutting it down + needed for the harvest sap proc
user.transferItemToLoc(W, src)
- addtimer(CALLBACK(src, .proc/harvest_sap), harvest_sap_time SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(harvest_sap)), harvest_sap_time SECONDS)
else
to_chat(user, "There is no sap to collect.")
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 7a53be231b..566d412d80 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -408,7 +408,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, "The wisp enhances your vision.")
@@ -605,7 +605,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
@@ -879,7 +879,7 @@
/datum/status_effect/dodgeroll_iframes/on_apply()
. = ..()
- RegisterSignal(owner, COMSIG_LIVING_RUN_BLOCK, .proc/trolled)
+ RegisterSignal(owner, COMSIG_LIVING_RUN_BLOCK, PROC_REF(trolled))
/datum/status_effect/dodgeroll_iframes/on_remove()
UnregisterSignal(owner, list(
@@ -1105,7 +1105,7 @@
/obj/item/lava_staff/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
- INVOKE_ASYNC(src, .proc/attempt_lava, target, user, proximity_flag, click_parameters)
+ INVOKE_ASYNC(src, PROC_REF(attempt_lava), target, user, proximity_flag, click_parameters)
/obj/item/lava_staff/proc/attempt_lava(atom/target, mob/user, proximity_flag, click_parameters)
if(timer > world.time)
@@ -1177,7 +1177,7 @@
/obj/item/mayhem/attack_self(mob/user)
for(var/mob/living/carbon/human/H in range(7,user))
var/obj/effect/mine/pickup/bloodbath/B = new(H)
- INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, H)
+ INVOKE_ASYNC(B, TYPE_PROC_REF(/obj/effect/mine/pickup/bloodbath, mineEffect), H)
to_chat(user, "You shatter the bottle!")
playsound(user.loc, 'sound/effects/glassbr1.ogg', 100, 1)
message_admins("[ADMIN_LOOKUPFLW(user)] has activated a bottle of mayhem!")
@@ -1324,11 +1324,11 @@
calculate_anger_mod(user)
timer = world.time + CLICK_CD_MELEE //by default, melee attacks only cause melee blasts, and have an accordingly short cooldown
if(proximity_flag)
- INVOKE_ASYNC(src, .proc/aoe_burst, T, user)
+ INVOKE_ASYNC(src, PROC_REF(aoe_burst), T, user)
log_combat(user, target, "fired 3x3 blast at", src)
else
if(ismineralturf(target) && get_dist(user, target) < 6) //target is minerals, we can hit it(even if we can't see it)
- INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user)
+ INVOKE_ASYNC(src, PROC_REF(cardinal_blasts), T, user)
timer = world.time + cooldown_time
else if(target in view(5, get_turf(user))) //if the target is in view, hit it
timer = world.time + cooldown_time
@@ -1339,12 +1339,12 @@
C.monster_damage_boost = TRUE
log_combat(user, target, "fired a chaser at", src)
else
- INVOKE_ASYNC(src, .proc/cardinal_blasts, T, user) //otherwise, just do cardinal blast
+ INVOKE_ASYNC(src, PROC_REF(cardinal_blasts), T, user) //otherwise, just do cardinal blast
log_combat(user, target, "fired cardinal blast at", src)
else
to_chat(user, "That target is out of range!" )
timer = world.time
- INVOKE_ASYNC(src, .proc/prepare_icon_update)
+ INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
/obj/item/hierophant_club/proc/calculate_anger_mod(mob/user) //we get stronger as the user loses health
chaser_cooldown = initial(chaser_cooldown)
@@ -1382,7 +1382,7 @@
user.visible_message("[user] starts fiddling with [src]'s pommel...", \
"You start detaching the hierophant beacon...")
timer = world.time + 51
- INVOKE_ASYNC(src, .proc/prepare_icon_update)
+ INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
if(do_after(user, 50, target = user) && !beacon)
var/turf/T = get_turf(user)
playsound(T,'sound/magic/blind.ogg', 200, 1, -4)
@@ -1394,7 +1394,7 @@
You can remove the beacon to place it again by striking it with the club.")
else
timer = world.time
- INVOKE_ASYNC(src, .proc/prepare_icon_update)
+ INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
else
to_chat(user, "You need to be on solid ground to detach the beacon!")
return
@@ -1411,7 +1411,7 @@
user.update_action_buttons_icon()
user.visible_message("[user] starts to glow faintly...")
timer = world.time + 50
- INVOKE_ASYNC(src, .proc/prepare_icon_update)
+ INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
beacon.icon_state = "hierophant_tele_on"
var/obj/effect/temp_visual/hierophant/telegraph/edge/TE1 = new /obj/effect/temp_visual/hierophant/telegraph/edge(user.loc)
var/obj/effect/temp_visual/hierophant/telegraph/edge/TE2 = new /obj/effect/temp_visual/hierophant/telegraph/edge(beacon.loc)
@@ -1423,7 +1423,7 @@
to_chat(user, "The beacon is blocked by something, preventing teleportation!")
user.update_action_buttons_icon()
timer = world.time
- INVOKE_ASYNC(src, .proc/prepare_icon_update)
+ INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
beacon.icon_state = "hierophant_tele_off"
return
new /obj/effect/temp_visual/hierophant/telegraph(T, user)
@@ -1435,7 +1435,7 @@
if(user)
user.update_action_buttons_icon()
timer = world.time
- INVOKE_ASYNC(src, .proc/prepare_icon_update)
+ INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
if(beacon)
beacon.icon_state = "hierophant_tele_off"
return
@@ -1444,7 +1444,7 @@
to_chat(user, "The beacon is blocked by something, preventing teleportation!")
user.update_action_buttons_icon()
timer = world.time
- INVOKE_ASYNC(src, .proc/prepare_icon_update)
+ INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
beacon.icon_state = "hierophant_tele_off"
return
user.log_message("teleported self from [AREACOORD(source)] to [beacon]")
@@ -1457,7 +1457,7 @@
var/obj/effect/temp_visual/hierophant/blast/B = new /obj/effect/temp_visual/hierophant/blast(t, user, TRUE) //but absolutely will hurt enemies
B.damage = 25
for(var/mob/living/L in range(1, source))
- INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) //regardless, take all mobs near us along
+ INVOKE_ASYNC(src, PROC_REF(teleport_mob), source, L, T, user) //regardless, take all mobs near us along
sleep(6) //at this point the blasts detonate
if(beacon)
beacon.icon_state = "hierophant_tele_off"
@@ -1465,7 +1465,7 @@
qdel(TE1)
qdel(TE2)
timer = world.time
- INVOKE_ASYNC(src, .proc/prepare_icon_update)
+ INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
if(beacon)
beacon.icon_state = "hierophant_tele_off"
teleporting = FALSE
@@ -1504,7 +1504,7 @@
sleep(2)
new /obj/effect/temp_visual/hierophant/blast(T, user, friendly_fire_check)
for(var/d in GLOB.cardinals)
- INVOKE_ASYNC(src, .proc/blast_wall, T, d, user)
+ INVOKE_ASYNC(src, PROC_REF(blast_wall), T, d, user)
/obj/item/hierophant_club/proc/blast_wall(turf/T, dir, mob/living/user) //make a wall of blasts blast_range tiles long
if(!T)
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index 0b7ca7adfd..214e050e5a 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -23,7 +23,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/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 056ad2d642..4be4735a6f 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -338,7 +338,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
else
user.visible_message("[user] strikes \the [src], causing a chain reaction!", "You strike \the [src], causing a chain reaction.")
log_game("[key_name(user)] has primed a [name] for detonation at [AREACOORD(bombturf)]")
- 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)
@@ -406,7 +406,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
if (!attack_self(user))
user.visible_message("[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
/obj/item/coin/proc/manual_suicide(mob/living/user)
diff --git a/code/modules/mob/living/bloodcrawl.dm b/code/modules/mob/living/bloodcrawl.dm
index 6f2f7094e6..5cc8e40464 100644
--- a/code/modules/mob/living/bloodcrawl.dm
+++ b/code/modules/mob/living/bloodcrawl.dm
@@ -156,7 +156,7 @@
newcolor = BLOOD_COLOR_XENO
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(obj/effect/decal/cleanable/B)
if(src.mob_transforming)
diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm
index b3749b4a41..0695f32cea 100644
--- a/code/modules/mob/living/brain/posibrain.dm
+++ b/code/modules/mob/living/brain/posibrain.dm
@@ -83,7 +83,7 @@ GLOBAL_VAR(posibrain_notify_cooldown)
next_ask = world.time + askDelay
searching = TRUE
update_icon()
- addtimer(CALLBACK(src, .proc/check_success), askDelay)
+ addtimer(CALLBACK(src, PROC_REF(check_success)), askDelay)
/obj/item/mmi/posibrain/proc/check_success()
searching = FALSE
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 69c1488436..2b189887d5 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm
@@ -49,7 +49,7 @@
else //Maybe uses plasma in the future, although that wouldn't make any sense...
leaping = 1
update_icons()
- 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 = 0
diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm
index f452c4997d..7850ec1301 100644
--- a/code/modules/mob/living/carbon/alien/organs.dm
+++ b/code/modules/mob/living/carbon/alien/organs.dm
@@ -145,7 +145,7 @@
recent_queen_death = 1
owner.throw_alert("alien_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 bb92eb79bd..3211cf2529 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -51,7 +51,7 @@
/obj/item/organ/body_egg/alien_embryo/egg_process()
if(stage < 5 && prob(3))
stage++
- INVOKE_ASYNC(src, .proc/RefreshInfectionImage)
+ INVOKE_ASYNC(src, PROC_REF(RefreshInfectionImage))
if(stage == 5 && prob(50))
for(var/datum/surgery/S in owner.surgeries)
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 7dedf5a739..220b3efde4 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -109,7 +109,7 @@
return
if(stat == CONSCIOUS)
icon_state = "[initial(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 == "[initial(icon_state)]_thrown")
@@ -181,7 +181,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)
@@ -190,7 +190,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
@@ -233,7 +233,7 @@
stat = UNCONSCIOUS
icon_state = "[initial(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 58ab15dd55..cf8eee01db 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -267,7 +267,7 @@
MarkResistTime()
visible_message("[src] attempts to unbuckle [p_them()]self!", \
"You attempt to unbuckle yourself... (This will take around [round(buckle_cd/600,1)] minute\s, and you need to stay still.)")
- if(do_after(src, buckle_cd, src, timed_action_flags = IGNORE_HELD_ITEM | IGNORE_INCAPACITATED, extra_checks = CALLBACK(src, .proc/cuff_resist_check)))
+ if(do_after(src, buckle_cd, src, timed_action_flags = IGNORE_HELD_ITEM | IGNORE_INCAPACITATED, extra_checks = CALLBACK(src, PROC_REF(cuff_resist_check))))
if(!buckled)
return
buckled.user_unbuckle_mob(src, src)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 611fa9b3b6..64cf64509a 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -258,7 +258,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.
diff --git a/code/modules/mob/living/carbon/handle_corruption.dm b/code/modules/mob/living/carbon/handle_corruption.dm
index b56752453b..7253ab7ed4 100644
--- a/code/modules/mob/living/carbon/handle_corruption.dm
+++ b/code/modules/mob/living/carbon/handle_corruption.dm
@@ -55,7 +55,7 @@
to_chat(src, "Error - Malfunction in movement control subsystem.")
if("shortdeaf")
ADD_TRAIT(src, TRAIT_DEAF, CORRUPTED_SYSTEM)
- addtimer(CALLBACK(src, .proc/reenable_hearing), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reenable_hearing)), 5 SECONDS)
to_chat(src, "ZZZZT")
if("flopover")
DefaultCombatKnockdown(1)
@@ -72,7 +72,7 @@
to_chat(src, "Intent subsystem successfully recalibrated.")
if("longdeaf")
ADD_TRAIT(src, TRAIT_DEAF, CORRUPTED_SYSTEM)
- addtimer(CALLBACK(src, .proc/reenable_hearing), 20 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reenable_hearing)), 20 SECONDS)
to_chat(src, "Hearing subsystem successfully shutdown.")
if("longknockdown")
DefaultCombatKnockdown(50)
@@ -81,18 +81,18 @@
var/disabled_type = pick(list(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM, TRAIT_PARALYSIS_L_LEG, TRAIT_PARALYSIS_R_LEG))
ADD_TRAIT(src, disabled_type, CORRUPTED_SYSTEM)
update_disabled_bodyparts()
- addtimer(CALLBACK(src, .proc/reenable_limb, disabled_type), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reenable_limb), disabled_type), 5 SECONDS)
to_chat(src, "Error - Limb control subsystem partially shutdown, rebooting.")
if("shortblind")
become_blind(CORRUPTED_SYSTEM)
- addtimer(CALLBACK(src, .proc/reenable_vision), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reenable_vision)), 5 SECONDS)
to_chat(src, "Visual receptor shutdown detected - Initiating reboot.")
if("shortstun")
Stun(30)
to_chat(src, "Deadlock detected in primary systems, error code [rand(101, 999)].")
if("shortmute")
ADD_TRAIT(src, TRAIT_MUTE, CORRUPTED_SYSTEM)
- addtimer(CALLBACK(src, .proc/reenable_speech), 5 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reenable_speech)), 5 SECONDS)
to_chat(src, "Communications matrix successfully shutdown for maintenance.")
if("vomit")
to_chat(src, "Ejecting contaminant.")
@@ -109,21 +109,21 @@
var/disabled_type = pick(list(TRAIT_PARALYSIS_L_ARM, TRAIT_PARALYSIS_R_ARM, TRAIT_PARALYSIS_L_LEG, TRAIT_PARALYSIS_R_LEG))
ADD_TRAIT(src, disabled_type, CORRUPTED_SYSTEM)
update_disabled_bodyparts()
- addtimer(CALLBACK(src, .proc/reenable_limb, disabled_type), 25 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reenable_limb), disabled_type), 25 SECONDS)
to_chat(src, "Fatal error in limb control subsystem - rebooting.")
if("blindmutedeaf")
become_blind(CORRUPTED_SYSTEM)
- addtimer(CALLBACK(src, .proc/reenable_vision), (rand(10, 25)) SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reenable_vision)), (rand(10, 25)) SECONDS)
ADD_TRAIT(src, TRAIT_DEAF, CORRUPTED_SYSTEM)
- addtimer(CALLBACK(src, .proc/reenable_hearing), (rand(15, 35)) SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reenable_hearing)), (rand(15, 35)) SECONDS)
ADD_TRAIT(src, TRAIT_MUTE, CORRUPTED_SYSTEM)
- addtimer(CALLBACK(src, .proc/reenable_speech), (rand(20, 45)) SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(reenable_speech)), (rand(20, 45)) SECONDS)
to_chat(src, "Fatal error in multiple systems - Performing recovery.")
if("longstun")
Stun(80)
to_chat(src, "")
if("sleep")
- addtimer(CALLBACK(src, .proc/forcesleep), (rand(6, 10)) SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(forcesleep)), (rand(6, 10)) SECONDS)
to_chat(src, "Priority 1 shutdown order received in operating system - Preparing powerdown.")
if("inducetrauma")
to_chat(src, "Major interference detected in main operating matrix - Complications possible.")
diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm
index 4ca45ceabd..3163a749d7 100644
--- a/code/modules/mob/living/carbon/human/death.dm
+++ b/code/modules/mob/living/carbon/human/death.dm
@@ -50,7 +50,7 @@ GLOBAL_LIST_EMPTY(dead_players_during_shift)
if(SSticker.HasRoundStarted())
SSblackbox.ReportDeath(src)
if(is_devil(src))
- INVOKE_ASYNC(is_devil(src), /datum/antagonist/devil.proc/beginResurrectionCheck, src)
+ INVOKE_ASYNC(is_devil(src), TYPE_PROC_REF(/datum/antagonist/devil, beginResurrectionCheck), src)
/mob/living/carbon/human/proc/makeSkeleton()
ADD_TRAIT(src, TRAIT_DISFIGURED, TRAIT_GENERIC)
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index 7be24f08d6..052fd0c87a 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -198,7 +198,7 @@
//rock paper scissors emote handling
/mob/living/carbon/human/proc/beginRockPaperScissors(var/chosen_move)
GLOB.rockpaperscissors_players[src] = list(chosen_move, ROCKPAPERSCISSORS_NOT_DECIDED)
- do_after(src, ROCKPAPERSCISSORS_TIME_LIMIT, src, extra_checks = CALLBACK(src, .proc/rockpaperscissors_tick))
+ do_after(src, ROCKPAPERSCISSORS_TIME_LIMIT, src, extra_checks = CALLBACK(src, PROC_REF(rockpaperscissors_tick)))
var/new_entry = GLOB.rockpaperscissors_players[src]
if(new_entry[2] == ROCKPAPERSCISSORS_NOT_DECIDED)
to_chat(src, "You put your hand back down.")
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index da30304d2e..e5410271e9 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -31,7 +31,7 @@
if(CONFIG_GET(flag/disable_stambuffer))
enable_intentional_sprint_mode()
- RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, /atom.proc/clean_blood)
+ RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, TYPE_PROC_REF(/atom, clean_blood))
GLOB.human_list += src
/mob/living/carbon/human/proc/setup_human_dna()
@@ -49,7 +49,7 @@
AddElement(/datum/element/flavor_text/carbon, _name = "Naked Flavor Text", _save_key = "naked_flavor_text", _show_on_naked = TRUE) //SPLURT edit
AddElement(/datum/element/flavor_text/carbon/temporary, "", "Set Pose (Temporary Flavor Text)", "This should be used only for things pertaining to the current round!", _save_key = null)
AddElement(/datum/element/flavor_text, _name = "OOC Notes", _addendum = "Put information on ERP/vore/lewd-related preferences here. THIS SHOULD NOT CONTAIN REGULAR FLAVORTEXT!!", _save_key = "ooc_notes", _examine_no_preview = TRUE)
- 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))
/mob/living/carbon/human/Destroy()
QDEL_NULL(physiology)
@@ -602,7 +602,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)
diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm
index 7af123f9da..64a84b24a4 100644
--- a/code/modules/mob/living/carbon/human/human_update_icons.dm
+++ b/code/modules/mob/living/carbon/human/human_update_icons.dm
@@ -50,7 +50,7 @@ There are several things that need to be remembered:
/mob/living/carbon/human/ComponentInitialize()
. = ..()
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_HUMAN_NO_RENDER), /mob.proc/regenerate_icons)
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_HUMAN_NO_RENDER), TYPE_PROC_REF(/mob, regenerate_icons))
//HAIR OVERLAY
/mob/living/carbon/human/update_hair()
diff --git a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm
index 06efa5d9f2..2fd04cfb7d 100644
--- a/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm
+++ b/code/modules/mob/living/carbon/human/innate_abilities/coiling.dm
@@ -46,12 +46,12 @@
H.forceMove(get_turf(owner))
// cancel the coiling action if certain things are done
- RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/cancel_coil)
- RegisterSignal(owner, COMSIG_LIVING_RESTING, .proc/cancel_coil)
- RegisterSignal(owner, COMSIG_LIVING_STOPPED_PULLING, .proc/cancel_coil)
+ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(cancel_coil))
+ RegisterSignal(owner, COMSIG_LIVING_RESTING, PROC_REF(cancel_coil))
+ RegisterSignal(owner, COMSIG_LIVING_STOPPED_PULLING, PROC_REF(cancel_coil))
// update the coil offset, update again if owner changes direction
- RegisterSignal(owner, COMSIG_ATOM_DIR_CHANGE, .proc/update_coil_offset)
+ RegisterSignal(owner, COMSIG_ATOM_DIR_CHANGE, PROC_REF(update_coil_offset))
update_coil_offset(null, null, owner.dir)
// set our overlay to new image
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 3677efb2cf..ced295c775 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1722,7 +1722,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(radiation > RAD_MOB_HAIRLOSS)
if(prob(15) && !(H.hair_style == "Bald") && (HAIR in species_traits))
to_chat(H, "Your hair starts to fall out in clumps...")
- addtimer(CALLBACK(src, .proc/go_bald, H), 50)
+ addtimer(CALLBACK(src, PROC_REF(go_bald), H), 50)
/datum/species/proc/go_bald(mob/living/carbon/human/H)
if(QDELETED(H)) //may be called from a timer
@@ -2676,7 +2676,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(flying_species && H.movement_type & FLYING)
ToggleFlight(H)
- INVOKE_ASYNC(src, .proc/flyslip, H)
+ INVOKE_ASYNC(src, PROC_REF(flyslip), H)
. = stunmod * H.physiology.stun_mod * amount
@@ -2823,7 +2823,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
buckled_obj.unbuckle_mob(H)
step(buckled_obj, olddir)
else
- new /datum/forced_movement(H, get_ranged_target_turf(H, olddir, 4), 1, FALSE, CALLBACK(H, /mob/living/carbon/.proc/spin, 1, 1))
+ new /datum/forced_movement(H, get_ranged_target_turf(H, olddir, 4), 1, FALSE, CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon, spin), 1, 1))
return TRUE
//UNSAFE PROC, should only be called through the Activate or other sources that check for CanFly
diff --git a/code/modules/mob/living/carbon/human/species_types/arachnid.dm b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
index 819f347353..d0ed3490f8 100644
--- a/code/modules/mob/living/carbon/human/species_types/arachnid.dm
+++ b/code/modules/mob/living/carbon/human/species_types/arachnid.dm
@@ -125,7 +125,7 @@
(Press ALT+CLICK on the target to start wrapping.)")
H.adjust_nutrition(E.spinner_rate * -0.5)
addtimer(VARSET_CALLBACK(E, web_ready, TRUE), E.web_cooldown)
- RegisterSignal(H, list(COMSIG_MOB_ALTCLICKON), .proc/cocoonAtom)
+ RegisterSignal(H, list(COMSIG_MOB_ALTCLICKON), PROC_REF(cocoonAtom))
return
else
to_chat(H, "You're too hungry to spin web right now, eat something first!")
diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
index 2820726313..45f13f8b82 100644
--- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
@@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
. = ..()
var/mob/living/carbon/human/H = C
H.AddElement(/datum/element/dwarfism, COMSIG_SPECIES_LOSS, src)
- RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech) //We register handle_speech is being used.
+ RegisterSignal(C, COMSIG_MOB_SAY, PROC_REF(handle_speech)) //We register handle_speech is being used.
/datum/species/dwarf/on_species_loss(mob/living/carbon/H, datum/species/new_species)
. = ..()
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 8a483ea385..ac3dd6e6c0 100644
--- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm
@@ -50,8 +50,8 @@
g1 = GETGREENPART(default_color)
b1 = GETBLUEPART(default_color)
spec_updatehealth(H)
- RegisterSignal(C, COMSIG_ATOM_EMAG_ACT, .proc/on_emag_act)
- RegisterSignal(C, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act)
+ RegisterSignal(C, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag_act))
+ RegisterSignal(C, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act))
/datum/species/ethereal/on_species_loss(mob/living/carbon/human/C, datum/species/new_species, pref_load)
.=..()
@@ -84,7 +84,7 @@
EMPeffect = TRUE
spec_updatehealth(H)
to_chat(H, "You feel the light of your body leave you.")
- addtimer(CALLBACK(src, .proc/stop_emp, H), (severity/5) SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //lights out
+ addtimer(CALLBACK(src, PROC_REF(stop_emp), H), (severity/5) SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //lights out
/datum/species/ethereal/proc/on_emag_act(mob/living/carbon/human/H, mob/user)
if(emageffect)
@@ -94,7 +94,7 @@
to_chat(user, "You tap [H] on the back with your card.")
H.visible_message("[H] starts flickering in an array of colors!")
handle_emag(H)
- addtimer(CALLBACK(src, .proc/stop_emag, H), 30 SECONDS) //Disco mode for 30 seconds! 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), 30 SECONDS) //Disco mode for 30 seconds! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass.
/datum/species/ethereal/spec_life(mob/living/carbon/human/H)
@@ -113,7 +113,7 @@
return
current_color = pick(ETHEREAL_COLORS)
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 92253e415e..8ef1a2f9a4 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -470,7 +470,7 @@
var/mob/living/carbon/human/H = owner
H.visible_message("[H] starts vibrating!", "You start charging your bluespace core...")
playsound(get_turf(H), 'sound/weapons/flash.ogg', 25, 1)
- 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("[H] disappears in a shower of sparks!", "You teleport!")
@@ -511,7 +511,7 @@
..()
last_banana = world.time
last_honk = world.time
- RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(C, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/species/golem/bananium/on_species_loss(mob/living/carbon/C)
. = ..()
@@ -643,7 +643,7 @@
/datum/species/golem/clockwork/on_species_gain(mob/living/carbon/human/H)
. = ..()
H.faction |= "ratvar"
- RegisterSignal(H, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(H, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/species/golem/clockwork/on_species_loss(mob/living/carbon/human/H)
if(!is_servant_of_ratvar(H))
@@ -757,7 +757,7 @@
H.forceMove(src)
cloth_golem = H
to_chat(cloth_golem, "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
@@ -1011,7 +1011,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 85e85828b0..f46198a521 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -659,8 +659,8 @@
linked_mobs.Add(M)
if(!selflink)
to_chat(M, "You are now connected to [slimelink_owner.real_name]'s Slime Link.")
- RegisterSignal(M, COMSIG_MOB_DEATH , .proc/unlink_mob)
- RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/unlink_mob)
+ RegisterSignal(M, COMSIG_MOB_DEATH , PROC_REF(unlink_mob))
+ RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(unlink_mob))
var/datum/action/innate/linked_speech/action = new(src)
linked_actions.Add(action)
action.Grant(M)
diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
index 85ab2b44cd..1d6431f537 100644
--- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
@@ -39,7 +39,7 @@
H.faction |= "mushroom"
mush = new()
mush.teach(H, TRUE)
- RegisterSignal(C, COMSIG_MOB_ON_NEW_MIND, .proc/on_new_mind)
+ RegisterSignal(C, COMSIG_MOB_ON_NEW_MIND, PROC_REF(on_new_mind))
/datum/species/mush/proc/on_new_mind(mob/owner)
mush.teach(owner, TRUE) //make_temporary TRUE as it shouldn't carry over to other mobs on mind transfer_to.
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 71390aa5df..70383fcdc3 100644
--- a/code/modules/mob/living/carbon/human/species_types/synths.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synths.dm
@@ -34,7 +34,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))
/datum/species/synth/on_species_loss(mob/living/carbon/human/H)
. = ..()
diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm
index 2640c642dd..07137d95e9 100644
--- a/code/modules/mob/living/carbon/monkey/combat.dm
+++ b/code/modules/mob/living/carbon/monkey/combat.dm
@@ -74,7 +74,7 @@
if(I.force >= best_force)
best_force = I.force
else
- addtimer(CALLBACK(src, .proc/pickup_and_wear, I), 5)
+ addtimer(CALLBACK(src, PROC_REF(pickup_and_wear), I), 5)
return TRUE
@@ -117,7 +117,7 @@
pickupTarget = null
pickupTimer = 0
else
- INVOKE_ASYNC(src, .proc/walk2derpless, pickupTarget.loc)
+ INVOKE_ASYNC(src, PROC_REF(walk2derpless), pickupTarget.loc)
if(Adjacent(pickupTarget) || Adjacent(pickupTarget.loc)) // next to target
drop_all_held_items() // who cares about these items, i want that one!
if(isturf(pickupTarget.loc)) // on floor
@@ -131,7 +131,7 @@
if(!pickpocketing)
pickpocketing = TRUE
M.visible_message("[src] starts trying to take [pickupTarget] from [M]", "[src] tries to take [pickupTarget]!")
- INVOKE_ASYNC(src, .proc/pickpocket, M)
+ INVOKE_ASYNC(src, PROC_REF(pickpocket), M)
return TRUE
switch(mode)
@@ -167,7 +167,7 @@
return TRUE
if(target != null)
- INVOKE_ASYNC(src, .proc/walk2derpless, target)
+ INVOKE_ASYNC(src, PROC_REF(walk2derpless), target)
// pickup any nearby weapon
if(!pickupTarget && prob(MONKEY_WEAPON_PROB))
@@ -252,7 +252,7 @@
if(target.pulledby != src && !istype(target.pulledby, /mob/living/carbon/monkey/))
- INVOKE_ASYNC(src, .proc/walk2derpless, target.loc)
+ INVOKE_ASYNC(src, PROC_REF(walk2derpless), target.loc)
if(Adjacent(target) && isturf(target.loc))
a_intent = INTENT_GRAB
@@ -265,11 +265,11 @@
frustration = 0
else if(!disposing_body)
- INVOKE_ASYNC(src, .proc/walk2derpless, bodyDisposal.loc)
+ INVOKE_ASYNC(src, PROC_REF(walk2derpless), bodyDisposal.loc)
if(Adjacent(bodyDisposal))
disposing_body = TRUE
- addtimer(CALLBACK(src, .proc/stuff_mob_in), 5)
+ addtimer(CALLBACK(src, PROC_REF(stuff_mob_in)), 5)
else
var/turf/olddist = get_dist(src, bodyDisposal)
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 771ba4305f..cbe3dc2c96 100644
--- a/code/modules/mob/living/death.dm
+++ b/code/modules/mob/living/death.dm
@@ -86,7 +86,7 @@
med_hud_set_status()
clear_typing_indicator()
if(!gibbed && !QDELETED(src))
- addtimer(CALLBACK(src, .proc/med_hud_set_status), (DEFIB_TIME_LIMIT * 10) + 1)
+ addtimer(CALLBACK(src, PROC_REF(med_hud_set_status)), (DEFIB_TIME_LIMIT * 10) + 1)
stop_pulling()
var/signal = SEND_SIGNAL(src, COMSIG_MOB_DEATH, gibbed) | SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MOB_DEATH, src, gibbed)
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index cd67dd2ff4..bb816773c0 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -129,7 +129,7 @@
H.CloseWings()
else
H.OpenWings()
- addtimer(CALLBACK(H, open ? /mob/living/carbon/human.proc/OpenWings : /mob/living/carbon/human.proc/CloseWings), wing_time)
+ addtimer(CALLBACK(H, open ? TYPE_PROC_REF(/mob/living/carbon/human, OpenWings) : TYPE_PROC_REF(/mob/living/carbon/human, CloseWings), wing_time))
/datum/emote/living/flap/aflap
key = "aflap"
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index f4f8060fb3..fd1551afca 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -24,7 +24,7 @@
break
var/msg = "[key_name_admin(src)] [ADMIN_JMP(src)] was found to have no .loc with an attached client, if the cause is unknown it would be wise to ask how this was accomplished."
message_admins(msg)
- INVOKE_ASYNC(GLOBAL_PROC, .proc/send2tgs_adminless_only, "Mob", msg, R_ADMIN)
+ INVOKE_ASYNC(GLOBAL_PROC, PROC_REF(send2tgs_adminless_only), "Mob", msg, R_ADMIN)
log_game("[key_name(src)] was found to have no .loc with an attached client.")
// This is a temporary error tracker to make sure we've caught everything
@@ -83,7 +83,7 @@
handle_diginvis() //AI becomes unable to see mob
if((movement_type & FLYING) && !(movement_type & FLOATING)) //TODO: Better floating
- INVOKE_ASYNC(src, /atom/movable.proc/float, TRUE)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, float), TRUE)
if(!loc)
return FALSE
@@ -201,7 +201,7 @@
/mob/living/proc/gravity_animate()
if(!get_filter("gravity"))
add_filter("gravity",1, GRAVITY_MOTION_BLUR)
- 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 68925aca88..25de796d6c 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -927,7 +927,7 @@
else
throw_alert("gravity", /atom/movable/screen/alert/weightless)
if(!override && !is_flying())
- INVOKE_ASYNC(src, /atom/movable.proc/float, !has_gravity)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, float), !has_gravity)
/mob/living/float(on)
if(throwing)
diff --git a/code/modules/mob/living/living_active_block.dm b/code/modules/mob/living/living_active_block.dm
index 65a474c782..1b271dc6b5 100644
--- a/code/modules/mob/living/living_active_block.dm
+++ b/code/modules/mob/living/living_active_block.dm
@@ -102,7 +102,7 @@
var/delay = data.block_start_delay
combat_flags |= COMBAT_FLAG_ACTIVE_BLOCK_STARTING
animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = delay, FALSE, SINE_EASING | EASE_IN)
- if(!do_after(src, delay, src, (IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE), extra_checks = CALLBACK(src, .proc/continue_starting_active_block)))
+ if(!do_after(src, delay, src, (IGNORE_USER_LOC_CHANGE|IGNORE_TARGET_LOC_CHANGE), extra_checks = CALLBACK(src, PROC_REF(continue_starting_active_block))))
to_chat(src, "You fail to raise [I].")
combat_flags &= ~(COMBAT_FLAG_ACTIVE_BLOCK_STARTING)
animate(src, pixel_x = get_standard_pixel_x_offset(), pixel_y = get_standard_pixel_y_offset(), time = 2.5, FALSE, SINE_EASING | EASE_IN, ANIMATION_END_NOW)
diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm
index 13240b2734..e7d9471525 100644
--- a/code/modules/mob/living/living_active_parry.dm
+++ b/code/modules/mob/living/living_active_parry.dm
@@ -52,7 +52,7 @@
parry_start_time = world.time
successful_parries = list()
successful_parry_counterattacks = list()
- addtimer(CALLBACK(src, .proc/end_parry_sequence), full_parry_duration)
+ addtimer(CALLBACK(src, PROC_REF(end_parry_sequence)), full_parry_duration)
if(data.parry_flags & PARRY_LOCK_ATTACKING)
ADD_TRAIT(src, TRAIT_MOBILITY_NOUSE, ACTIVE_PARRY_TRAIT)
if(data.parry_flags & PARRY_LOCK_SPRINTING)
@@ -486,7 +486,7 @@
if(owner)
attach_to(owner)
if(autorun)
- INVOKE_ASYNC(src, .proc/run_animation, windup, active, spindown)
+ INVOKE_ASYNC(src, PROC_REF(run_animation), windup, active, spindown)
/obj/effect/abstract/parry/main/Destroy()
detach_from(owner)
diff --git a/code/modules/mob/living/living_block.dm b/code/modules/mob/living/living_block.dm
index 99e74916da..3ca8703d34 100644
--- a/code/modules/mob/living/living_block.dm
+++ b/code/modules/mob/living/living_block.dm
@@ -27,7 +27,7 @@
return_list[BLOCK_RETURN_PROJECTILE_BLOCK_PERCENTAGE] = 100
return
var/list/obj/item/tocheck = get_blocking_items()
- sortTim(tocheck, /proc/cmp_numeric_dsc, TRUE)
+ sortTim(tocheck, GLOBAL_PROC_REF(cmp_numeric_dsc), TRUE)
// i don't like this
var/block_chance_modifier = round(damage / -3)
if(real_attack)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index cd46072921..da1eab967b 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -470,8 +470,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, PROC_REF(cult_ending_helper), 1), 120)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(ending_helper)), 270)
if(client)
makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, src, cultoverride = TRUE)
else
@@ -512,7 +512,7 @@
/mob/living/proc/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /atom/movable/screen/fullscreen/tiled/flash, override_protection = 0)
if((override_protection || get_eye_protection() < intensity) && (override_blindness_check || !(HAS_TRAIT(src, TRAIT_BLIND))))
overlay_fullscreen("flash", type)
- addtimer(CALLBACK(src, .proc/clear_fullscreen, "flash", 25), 25)
+ addtimer(CALLBACK(src, PROC_REF(clear_fullscreen), "flash", 25), 25)
return TRUE
return FALSE
diff --git a/code/modules/mob/living/living_mobility.dm b/code/modules/mob/living/living_mobility.dm
index 7b0642bfc1..e060e0ba02 100644
--- a/code/modules/mob/living/living_mobility.dm
+++ b/code/modules/mob/living/living_mobility.dm
@@ -159,7 +159,7 @@
//Handle citadel autoresist
if(CHECK_MOBILITY(src, MOBILITY_MOVE) && !(combat_flags & COMBAT_FLAG_INTENTIONALLY_RESTING) && canstand_involuntary && iscarbon(src) && client?.prefs?.autostand)//CIT CHANGE - adds autostanding as a preference
- addtimer(CALLBACK(src, .proc/resist_a_rest, TRUE), 0) //CIT CHANGE - ditto
+ addtimer(CALLBACK(src, PROC_REF(resist_a_rest), TRUE), 0) //CIT CHANGE - ditto
// Movespeed mods based on arms/legs quantity
if(!get_leg_ignore())
diff --git a/code/modules/mob/living/living_signals.dm b/code/modules/mob/living/living_signals.dm
index 0eb83658d7..2c93aeadbf 100644
--- a/code/modules/mob/living/living_signals.dm
+++ b/code/modules/mob/living/living_signals.dm
@@ -2,12 +2,12 @@
/// FOR BLOCKING MOVEMENT, USE TRAIT_MOBILITY_NOMOVE AS MUCH AS POSSIBLE. IT WILL MAKE REFACTORS IN THE FUTURE EASIER.
/mob/living/ComponentInitialize()
. = ..()
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOMOVE), .proc/update_mobility)
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOPICKUP), .proc/update_mobility)
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOUSE), .proc/update_mobility)
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOREST), .proc/update_mobility)
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_LIVING_NO_DENSITY), .proc/update_density)
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_PUGILIST), .proc/update_pugilism)
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOMOVE), PROC_REF(update_mobility))
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOPICKUP), PROC_REF(update_mobility))
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOUSE), PROC_REF(update_mobility))
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOREST), PROC_REF(update_mobility))
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_LIVING_NO_DENSITY), PROC_REF(update_density))
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_PUGILIST), PROC_REF(update_pugilism))
/mob/living/proc/update_pugilism()
if(HAS_TRAIT(src, TRAIT_PUGILIST))
diff --git a/code/modules/mob/living/living_sprint.dm b/code/modules/mob/living/living_sprint.dm
index e45866bcf6..3ee272f405 100644
--- a/code/modules/mob/living/living_sprint.dm
+++ b/code/modules/mob/living/living_sprint.dm
@@ -1,6 +1,6 @@
/mob/living/ComponentInitialize()
. = ..()
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_SPRINT_LOCKED), .proc/update_sprint_lock)
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_SPRINT_LOCKED), PROC_REF(update_sprint_lock))
/mob/living/proc/update_sprint_icon()
var/atom/movable/screen/sprintbutton/S = locate() in hud_used?.static_inventory
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 7f78baea42..16e83be1e9 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -320,7 +320,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
speech_bubble_recipients.Add(M.client)
var/image/I = image('icons/mob/talk.dmi', src, "[bubble_type][say_test(message)]", FLY_LAYER)
I.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
- INVOKE_ASYNC(GLOBAL_PROC, /.proc/flick_overlay, I, speech_bubble_recipients, 30)
+ INVOKE_ASYNC(GLOBAL_PROC, TYPE_PROC_REF(/, flick_overlay), I, speech_bubble_recipients, 30)
//Listening gets trimmed here if a vocal bark's present. If anyone ever makes this proc return listening, make sure to instead initialize a copy of listening in here to avoid wonkiness
if(SEND_SIGNAL(src, COMSIG_MOVABLE_QUEUE_BARK, listening, args) || vocal_bark || vocal_bark_id)
diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm
index 21f8646ec1..9d2a09ee5b 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")
if(!isnull(deployed_shell))
disconnect_shell()
diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
index 4591720b79..1240280091 100644
--- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm
@@ -50,7 +50,7 @@
/datum/camerachunk/proc/hasChanged(update_now = 0)
if(seenby.len || update_now)
- addtimer(CALLBACK(src, .proc/update), UPDATE_BUFFER, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(update)), UPDATE_BUFFER, TIMER_UNIQUE)
else
changed = 1
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 892fa6955b..1506442158 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -177,7 +177,7 @@
blind_eyes(1)
update_sight()
to_chat(src, "You've lost power!")
- addtimer(CALLBACK(src, .proc/start_RestorePowerRoutine), 20)
+ addtimer(CALLBACK(src, PROC_REF(start_RestorePowerRoutine)), 20)
#undef POWER_RESTORATION_OFF
#undef POWER_RESTORATION_START
diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm
index d92f4a5999..a6df5811a9 100644
--- a/code/modules/mob/living/silicon/laws.dm
+++ b/code/modules/mob/living/silicon/laws.dm
@@ -9,7 +9,7 @@
throw_alert("newlaw", /atom/movable/screen/alert/newlaw)
if(announce && last_lawchange_announce != world.time)
to_chat(src, "Your laws have been changed.")
- addtimer(CALLBACK(src, .proc/show_laws), 0)
+ addtimer(CALLBACK(src, PROC_REF(show_laws)), 0)
last_lawchange_announce = world.time
/mob/living/silicon/proc/set_law_sixsixsix(law, announce = TRUE)
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 715894efa3..35b6ae5621 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -370,7 +370,7 @@
deltimer(radio_short_timerid)
radio_short = TRUE
to_chat(src, "Your radio shorts out!")
- radio_short_timerid = addtimer(CALLBACK(src, .proc/unshort_radio), radio_short_cooldown, flags = TIMER_STOPPABLE)
+ radio_short_timerid = addtimer(CALLBACK(src, PROC_REF(unshort_radio)), radio_short_cooldown, flags = TIMER_STOPPABLE)
/mob/living/silicon/pai/proc/unshort_radio()
radio_short = FALSE
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index a917d15d2f..868811d8d0 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -17,7 +17,7 @@
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_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge))
robot_modules_background = new()
robot_modules_background.icon_state = "block"
@@ -82,7 +82,7 @@
mmi.brainmob.container = mmi
mmi.update_appearance()
- INVOKE_ASYNC(src, .proc/updatename)
+ INVOKE_ASYNC(src, PROC_REF(updatename))
aicamera = new/obj/item/camera/siliconcam/robot_camera(src)
toner = tonermax
@@ -749,7 +749,7 @@
. = ..()
radio = new /obj/item/radio/borg/syndicate(src)
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/modules/syndicate/create_modularInterface()
if(!modularInterface)
@@ -995,7 +995,7 @@
hat_offset = module.hat_offset
magpulse = module.magpulsing
- INVOKE_ASYNC(src, .proc/updatename)
+ INVOKE_ASYNC(src, PROC_REF(updatename))
/mob/living/silicon/robot/proc/place_on_head(obj/item/new_hat)
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index d842afd455..02eaf3255f 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -215,7 +215,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real
ResetModule()
return TRUE
- INVOKE_ASYNC(src, .proc/beep_boop_rogue_bot, user)
+ INVOKE_ASYNC(src, PROC_REF(beep_boop_rogue_bot), user)
return TRUE
/mob/living/silicon/robot/proc/beep_boop_rogue_bot(mob/user)
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 510c958872..fd2c88a0bc 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -225,7 +225,7 @@
R.module = RM
R.update_module_innate()
RM.rebuild_modules()
- INVOKE_ASYNC(RM, .proc/do_transform_animation)
+ INVOKE_ASYNC(RM, PROC_REF(do_transform_animation))
if(RM.dogborg || R.dogborg)
RM.dogborg_equip()
R.typing_indicator_state = /obj/effect/overlay/typing_indicator/machine/dogborg
@@ -395,7 +395,7 @@
bad_snowflake.pixel_x = -16
med_icons["Alina"] = bad_snowflake
med_icons = sort_list(med_icons)
- var/med_borg_icon = show_radial_menu(R, R , med_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/med_borg_icon = show_radial_menu(R, R , med_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(med_borg_icon)
if("Default")
cyborg_base_icon = "medical"
@@ -630,7 +630,7 @@
bad_snowflake.pixel_x = -16
engi_icons["Alina"] = bad_snowflake
engi_icons = sort_list(engi_icons)
- var/engi_borg_icon = show_radial_menu(R, R , engi_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/engi_borg_icon = show_radial_menu(R, R , engi_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(engi_borg_icon)
if("Default")
cyborg_base_icon = "engineer"
@@ -842,7 +842,7 @@
bad_snowflake.pixel_x = -16
sec_icons["Alina"] = bad_snowflake
sec_icons = sort_list(sec_icons)
- var/sec_borg_icon = show_radial_menu(R, R , sec_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/sec_borg_icon = show_radial_menu(R, R , sec_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(sec_borg_icon)
if("Default")
cyborg_base_icon = "sec"
@@ -1046,7 +1046,7 @@
"Raptor V-4" = image(icon = 'modular_splurt/icons/mob/robots_64x45.dmi', icon_state = "peaceraptor-b"), // SPLURT Addon (ChompS Port)
"Handy" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "handy_peace") // SPLURT Addon (Fallout 13)
))
- var/peace_borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/peace_borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(peace_borg_icon)
if("Default")
cyborg_base_icon = "peace"
@@ -1323,7 +1323,7 @@
bad_snowflake.pixel_x = -16
service_icons["Alina"] = bad_snowflake
service_icons = sort_list(service_icons)
- var/service_robot_icon = show_radial_menu(R, R , service_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/service_robot_icon = show_radial_menu(R, R , service_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(service_robot_icon)
if("(Service) Waitress")
cyborg_base_icon = "service_f"
@@ -1635,7 +1635,7 @@
wide.pixel_x = -16
mining_icons[a] = wide
mining_icons = sort_list(mining_icons)
- var/mining_borg_icon = show_radial_menu(R, R , mining_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/mining_borg_icon = show_radial_menu(R, R , mining_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(mining_borg_icon)
if("Lavaland")
cyborg_base_icon = "miner"
diff --git a/code/modules/mob/living/silicon/silicon_movement.dm b/code/modules/mob/living/silicon/silicon_movement.dm
index 590326eda1..cc0a01aa37 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 5796fe67ac..d2a9baf137 100644
--- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
+++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm
@@ -33,7 +33,7 @@
/mob/living/simple_animal/bot/secbot/grievous/Initialize(mapload)
. = ..()
weapon = new baton_type(src)
- 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)
@@ -51,7 +51,7 @@
weapon.attack(C, src)
playsound(src, 'sound/weapons/blade1.ogg', 50, TRUE, -1)
if(C.stat == DEAD)
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 2)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 2)
back_to_idle()
@@ -107,7 +107,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
@@ -122,7 +122,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 1320c13085..913537c241 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -561,7 +561,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 = all_access //Give the bot all-access while under the AI's command.
if(client)
- reset_access_timer_id = addtimer(CALLBACK (src, .proc/bot_reset), 600, 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)), 600, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) //if the bot is player controlled, they get the extra access for a limited time
to_chat(src, "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, "[icon2html(src, calling_ai)] [name] called to [end_area]. [path.len-1] meters to destination.")
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index cde12b5459..3932732348 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -152,7 +152,7 @@
/mob/living/simple_animal/bot/ed209/proc/retaliate(mob/living/carbon/human/H)
var/judgement_criteria = judgement_criteria()
- threatlevel = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons))
+ threatlevel = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons)))
threatlevel += 6
if(threatlevel >= 4)
target = H
@@ -204,7 +204,7 @@
var/threatlevel = 0
if((C.stat) || (C.lying))
continue
- threatlevel = C.assess_threat(judgement_criteria, lasercolor, weaponcheck=CALLBACK(src, .proc/check_for_weapons))
+ threatlevel = C.assess_threat(judgement_criteria, lasercolor, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons)))
//speak(C.real_name + text(": threat: []", threatlevel))
if(threatlevel < 4 )
continue
@@ -217,7 +217,7 @@
if(targets.len>0)
var/mob/living/carbon/t = pick(targets)
if((t.stat!=2) && (t.lying != 1) && (!t.handcuffed)) //we don't shoot people who are dead, cuffed or lying down.
- INVOKE_ASYNC(src, .proc/shootAt, t)
+ INVOKE_ASYNC(src, PROC_REF(shootAt), t)
switch(mode)
if(BOT_IDLE) // idle
@@ -235,7 +235,7 @@
if(target) // make sure target exists
if(Adjacent(target) && isturf(target.loc)) // if right next to perp
- INVOKE_ASYNC(src, .proc/stun_attack, target)
+ INVOKE_ASYNC(src, PROC_REF(stun_attack), target)
mode = BOT_PREP_ARREST
anchored = TRUE
@@ -306,13 +306,13 @@
target = null
last_found = world.time
frustration = 0
- INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds
+ INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) //ensure bot quickly responds
/mob/living/simple_animal/bot/ed209/proc/back_to_hunt()
anchored = FALSE
frustration = 0
mode = BOT_HUNT
- INVOKE_ASYNC(src, .proc/handle_automated_action) //ensure bot quickly responds
+ INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) //ensure bot quickly responds
// look for a criminal in view of the bot
@@ -329,7 +329,7 @@
if((C.name == oldtarget_name) && (world.time < last_found + 100))
continue
- threatlevel = C.assess_threat(judgement_criteria, lasercolor, weaponcheck=CALLBACK(src, .proc/check_for_weapons))
+ threatlevel = C.assess_threat(judgement_criteria, lasercolor, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons)))
if(!threatlevel)
continue
@@ -527,7 +527,7 @@
if(ishuman(C))
var/mob/living/carbon/human/H = C
var/judgement_criteria = judgement_criteria()
- threat = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons))
+ threat = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons)))
log_combat(src,C,"stunned")
if(declare_arrests)
var/area/location = get_area(src)
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index 42bb2f63bc..a5b2655a09 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -50,14 +50,14 @@
/mob/living/simple_animal/bot/honkbot/proc/sensor_blink()
icon_state = "honkbot-c"
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 5, TIMER_OVERRIDE|TIMER_UNIQUE)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 5, TIMER_OVERRIDE|TIMER_UNIQUE)
//honkbots react with sounds.
/mob/living/simple_animal/bot/honkbot/proc/react_ping()
playsound(src, 'sound/machines/ping.ogg', 50, TRUE, -1) //the first sound upon creation!
spam_flag = TRUE
sensor_blink()
- addtimer(CALLBACK(src, .proc/spam_flag_false), 18) // calibrates before starting the honk
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), 18) // calibrates before starting the honk
/mob/living/simple_animal/bot/honkbot/proc/react_buzz()
playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE, -1)
@@ -97,7 +97,7 @@
/mob/living/simple_animal/bot/honkbot/on_attack_hand(mob/living/carbon/human/H)
if(H.a_intent == INTENT_HARM)
retaliate(H)
- addtimer(CALLBACK(src, .proc/react_buzz), 5)
+ addtimer(CALLBACK(src, PROC_REF(react_buzz)), 5)
return ..()
@@ -106,7 +106,7 @@
return
if(!W.tool_behaviour == TOOL_SCREWDRIVER && (W.force) && (!target) && (W.damtype != STAMINA) ) // Check for welding tool to fix #2432.
retaliate(user)
- addtimer(CALLBACK(src, .proc/react_buzz), 5)
+ addtimer(CALLBACK(src, PROC_REF(react_buzz)), 5)
..()
/mob/living/simple_animal/bot/honkbot/emag_act(mob/user)
@@ -154,21 +154,21 @@
playsound(src, honksound, 50, TRUE, -1)
spam_flag = TRUE //prevent spam
sensor_blink()
- addtimer(CALLBACK(src, .proc/spam_flag_false), cooldowntimehorn)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntimehorn)
else if (emagged == 2) //emagged honkbots will spam short and memorable sounds.
if (!spam_flag)
playsound(src, "honkbot_e", 50, 0)
spam_flag = TRUE // prevent spam
icon_state = "honkbot-e"
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 30, TIMER_OVERRIDE|TIMER_UNIQUE)
- addtimer(CALLBACK(src, .proc/spam_flag_false), cooldowntimehorn)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 30, TIMER_OVERRIDE|TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntimehorn)
/mob/living/simple_animal/bot/honkbot/proc/honk_attack(mob/living/carbon/C) // horn attack
if(!spam_flag)
playsound(loc, honksound, 50, TRUE, -1)
spam_flag = TRUE // prevent spam
sensor_blink()
- addtimer(CALLBACK(src, .proc/spam_flag_false), cooldowntimehorn)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntimehorn)
/mob/living/simple_animal/bot/honkbot/proc/stun_attack(mob/living/carbon/C) // airhorn stun
if(!spam_flag)
@@ -190,7 +190,7 @@
target = oldtarget_name
else // you really don't want to hit an emagged honkbot
threatlevel = 6 // will never let you go
- addtimer(CALLBACK(src, .proc/spam_flag_false), cooldowntime)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntime)
log_combat(src,C,"honked")
@@ -199,7 +199,7 @@
else
C.stuttering = 20
C.DefaultCombatKnockdown(80)
- addtimer(CALLBACK(src, .proc/spam_flag_false), cooldowntime)
+ addtimer(CALLBACK(src, PROC_REF(spam_flag_false)), cooldowntime)
/mob/living/simple_animal/bot/honkbot/handle_automated_action()
@@ -263,13 +263,13 @@
target = null
last_found = world.time
frustration = 0
- INVOKE_ASYNC(src, .proc/handle_automated_action) //responds quickly
+ INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) //responds quickly
/mob/living/simple_animal/bot/honkbot/proc/back_to_hunt()
anchored = FALSE
frustration = 0
mode = BOT_HUNT
- INVOKE_ASYNC(src, .proc/handle_automated_action) // responds quickly
+ INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) // responds quickly
/mob/living/simple_animal/bot/honkbot/proc/look_for_perp()
anchored = FALSE
@@ -299,7 +299,7 @@
speak("Honk!")
visible_message("[src] starts chasing [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/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 1bccdb1992..cde12d97e4 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -427,8 +427,8 @@
process_bot()
num_steps--
if(mode != BOT_IDLE)
- var/process_timer = addtimer(CALLBACK(src, .proc/process_bot), 2, TIMER_LOOP|TIMER_STOPPABLE)
- addtimer(CALLBACK(GLOBAL_PROC, /proc/deltimer, process_timer), (num_steps*2) + 1)
+ var/process_timer = addtimer(CALLBACK(src, PROC_REF(process_bot)), 2, TIMER_LOOP|TIMER_STOPPABLE)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(deltimer), process_timer), (num_steps*2) + 1)
/mob/living/simple_animal/bot/mulebot/proc/process_bot()
if(!on || client)
@@ -493,7 +493,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
@@ -506,7 +506,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)
@@ -555,7 +555,7 @@
/mob/living/simple_animal/bot/mulebot/proc/start_home()
if(!on)
return
- INVOKE_ASYNC(src, .proc/do_start_home)
+ INVOKE_ASYNC(src, PROC_REF(do_start_home))
update_icon()
/mob/living/simple_animal/bot/mulebot/proc/do_start_home()
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 4725ca6225..4a228e29a1 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -240,7 +240,7 @@
/mob/living/simple_animal/bot/secbot/proc/retaliate(mob/living/carbon/human/H)
var/judgement_criteria = judgement_criteria()
- threatlevel = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons))
+ threatlevel = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons)))
threatlevel += 6
if(threatlevel >= 4)
target = H
@@ -381,7 +381,7 @@
/mob/living/simple_animal/bot/secbot/proc/stun_attack(mob/living/carbon/C)
var/judgement_criteria = judgement_criteria()
icon_state = "secbot-c"
- addtimer(CALLBACK(src, /atom/.proc/update_icon), 2)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 2)
var/threat = 5
if(ishuman(C))
if(stored_fashion)
@@ -393,12 +393,12 @@
C.stuttering = 5
C.DefaultCombatKnockdown(100)
var/mob/living/carbon/human/H = C
- threat = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons))
+ threat = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons)))
else
playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1)
C.DefaultCombatKnockdown(100)
C.stuttering = 5
- threat = C.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons))
+ threat = C.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons)))
log_combat(src,C,"stunned")
if(declare_arrests)
@@ -500,13 +500,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()
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()
@@ -519,7 +519,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
@@ -531,7 +531,7 @@
playsound(loc, pick('sound/voice/beepsky/criminal.ogg', 'sound/voice/beepsky/justice.ogg', 'sound/voice/beepsky/freeze.ogg'), 50, FALSE)
visible_message(process_emote("TAUNT", target, threatlevel))
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/eldritch_demons.dm b/code/modules/mob/living/simple_animal/eldritch_demons.dm
index eafac41303..eb4d1eb023 100644
--- a/code/modules/mob/living/simple_animal/eldritch_demons.dm
+++ b/code/modules/mob/living/simple_animal/eldritch_demons.dm
@@ -85,7 +85,7 @@
var/datum/action/innate/mansus_speech/action = new(src)
linked_mobs[mob_linked] = action
action.Grant(mob_linked)
- RegisterSignal(mob_linked, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING) , .proc/unlink_mob)
+ RegisterSignal(mob_linked, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETING) , PROC_REF(unlink_mob))
return TRUE
/mob/living/simple_animal/hostile/eldritch/raw_prophet/proc/unlink_mob(mob/living/mob_linked)
@@ -143,7 +143,7 @@
stack_trace("Eldritch Armsy created with invalid len ([len]). Reverting to 3.")
len = 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_more)
return
allow_pulling = TRUE
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 45a3532359..8480e30bd2 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -493,7 +493,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
/mob/living/simple_animal/pet/dog/corgi/Ian/BiologicalLife()
if(!(. = ..()))
return
- INVOKE_ASYNC(src, .proc/corgi_ai_behavior)
+ INVOKE_ASYNC(src, PROC_REF(corgi_ai_behavior))
/mob/living/simple_animal/pet/dog/corgi/Ian/proc/corgi_ai_behavior()
//Feeding, chasing food, FOOOOODDDD
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 62d1116300..968a34520d 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -106,7 +106,7 @@
. = ..()
if(can_be_held)
//icon/item state is defined in mob_holder/drone_worn_icon()
- AddElement(/datum/element/mob_holder, null, 'icons/mob/clothing/head.dmi', 'icons/mob/inhands/clothing_righthand.dmi', 'icons/mob/inhands/clothing_lefthand.dmi', ITEM_SLOT_HEAD, /datum/element/mob_holder.proc/drone_worn_icon)
+ AddElement(/datum/element/mob_holder, null, 'icons/mob/clothing/head.dmi', 'icons/mob/inhands/clothing_righthand.dmi', 'icons/mob/inhands/clothing_lefthand.dmi', ITEM_SLOT_HEAD, TYPE_PROC_REF(/datum/element/mob_holder, drone_worn_icon))
/mob/living/simple_animal/drone/med_hud_set_health()
var/image/holder = hud_list[DIAG_HUD]
diff --git a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm
index da6fed4051..117cb50717 100644
--- a/code/modules/mob/living/simple_animal/gremlin/gremlin.dm
+++ b/code/modules/mob/living/simple_animal/gremlin/gremlin.dm
@@ -173,7 +173,7 @@ GLOBAL_LIST(bad_gremlin_items)
loc = exit_vent
var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
- addtimer(CALLBACK(src, .proc/exit_vents), travel_time) //come out at exit vent in 2 to 20 seconds
+ addtimer(CALLBACK(src, PROC_REF(exit_vents)), travel_time) //come out at exit vent in 2 to 20 seconds
if(world.time > min_next_vent && !entry_vent && !in_vent && prob(GREMLIN_VENT_CHANCE)) //small chance to go into a vent
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 9715d4f63c..d116ac0f72 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 39a7bfaebd..73fa1d7b24 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
@@ -37,7 +37,7 @@
return
if(isobj(A) && Adjacent(A))
if(bomb_cooldown <= world.time && !stat)
- var/datum/component/killerqueen/K = A.AddComponent(/datum/component/killerqueen, EXPLODE_HEAVY, CALLBACK(src, .proc/on_explode), CALLBACK(src, .proc/on_failure), \
+ var/datum/component/killerqueen/K = A.AddComponent(/datum/component/killerqueen, EXPLODE_HEAVY, CALLBACK(src, PROC_REF(on_explode)), CALLBACK(src, PROC_REF(on_failure)), \
examine_message = "It glows with a strange light!")
QDEL_IN(K, 1 MINUTES)
to_chat(src, "Success! Bomb armed!")
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 d2dd1b73cc..1bd2f40b06 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm
@@ -58,7 +58,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/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 1f0efddd8d..d245b68348 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -312,4 +312,4 @@
/mob/living/simple_animal/hostile/poison/bees/short/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/death), 50 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(death)), 50 SECONDS)
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 6db5250469..82a6b837e0 100644
--- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm
@@ -69,7 +69,7 @@
var/minions_chosen = pick(minions)
var/mob/living/simple_animal/hostile/stickman/S = new minions_chosen (get_step(boss,pick_n_take(directions)), 1)
S.faction = boss.faction
- RegisterSignal(S, COMSIG_PARENT_QDELETING, .proc/remove_from_list)
+ RegisterSignal(S, COMSIG_PARENT_QDELETING, PROC_REF(remove_from_list))
summoned_minions += S
/datum/action/boss/wizard_summon_minions/proc/remove_from_list(datum/source, forced)
diff --git a/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
index d52da8f095..650c470aaa 100644
--- a/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
+++ b/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm
@@ -94,7 +94,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
Acquire_Victim()
if(stage && !manifested)
- INVOKE_ASYNC(src, .proc/On_Stage)
+ INVOKE_ASYNC(src, PROC_REF(On_Stage))
if(stage == STAGE_ATTACK)
playsound(src, 'sound/misc/cluwne_breathing.ogg', 75, 1)
@@ -190,7 +190,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
mobility_flags &= ~MOBILITY_MOVE
update_mobility()
cluwnehole = new(src.loc)
- addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Appear), MANIFEST_DELAY)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/simple_animal/hostile/floor_cluwne, Appear)), MANIFEST_DELAY)
else
layer = GAME_PLANE
invisibility = INVISIBILITY_OBSERVER
@@ -262,7 +262,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
to_chat(H, "yalp ot tnaw I")
Appear()
manifested = FALSE
- addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Manifest), 1)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/simple_animal/hostile/floor_cluwne, Manifest)), 1)
if(STAGE_TORMENT)
@@ -315,7 +315,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
H.reagents.add_reagent(/datum/reagent/mercury, 3)
Appear()
manifested = FALSE
- addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Manifest), 2)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/simple_animal/hostile/floor_cluwne, Manifest)), 2)
for(var/obj/machinery/light/L in range(8, H))
L.flicker()
@@ -335,12 +335,12 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
forceMove(H.loc)
to_chat(H, "You feel the floor closing in on your feet!")
H.Paralyze(300)
- INVOKE_ASYNC(H, /mob.proc/emote, "scream")
+ INVOKE_ASYNC(H, TYPE_PROC_REF(/mob, emote), "scream")
H.adjustBruteLoss(10)
manifested = TRUE
Manifest()
if(!eating)
- addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Grab, H), 50, TIMER_OVERRIDE|TIMER_UNIQUE)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/simple_animal/hostile/floor_cluwne, Grab), H), 50, TIMER_OVERRIDE|TIMER_UNIQUE)
for(var/turf/open/O in RANGE_TURFS(6, src))
O.MakeSlippery(TURF_WET_LUBE, 20)
playsound(src, 'sound/effects/meteorimpact.ogg', 30, 1)
@@ -370,7 +370,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0)
H.invisibility = INVISIBILITY_OBSERVER
H.density = FALSE
H.anchored = TRUE
- addtimer(CALLBACK(src, /mob/living/simple_animal/hostile/floor_cluwne/.proc/Kill, H), 100, TIMER_OVERRIDE|TIMER_UNIQUE)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/simple_animal/hostile/floor_cluwne, Kill), H), 100, TIMER_OVERRIDE|TIMER_UNIQUE)
visible_message("[src] pulls [H] under!")
to_chat(H, "[src] drags you underneath the floor!")
else
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 337334e15c..5f41cb6b13 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -430,7 +430,7 @@
if(target_atom.anchored)
return
user.cocoon_target = target_atom
- INVOKE_ASYNC(user, /mob/living/simple_animal/hostile/poison/giant_spider/nurse/.proc/cocoon)
+ INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living/simple_animal/hostile/poison/giant_spider/nurse, cocoon))
remove_ranged_ability()
return TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index f1a3bdfd94..8885bb52a1 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, "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 d9a2894218..1b9a8853c5 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -103,7 +103,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)
@@ -278,7 +278,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)
@@ -431,7 +431,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
@@ -561,7 +561,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()
@@ -572,7 +572,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)
@@ -625,14 +625,14 @@
if(!(COOLDOWN_FINISHED(src, charge_cooldown)) || !has_gravity() || !target.has_gravity())
return FALSE
Shake(15, 15, 1 SECONDS)
- addtimer(CALLBACK(src, .proc/handle_charge_target, target), 1.5 SECONDS, TIMER_STOPPABLE)
+ addtimer(CALLBACK(src, PROC_REF(handle_charge_target), target), 1.5 SECONDS, TIMER_STOPPABLE)
/**
* Proc that throws the mob at the target after the windup.
*/
/mob/living/simple_animal/hostile/proc/handle_charge_target(var/atom/target)
charge_state = TRUE
- throw_at(target, charge_distance, 1, src, FALSE, TRUE, callback = CALLBACK(src, .proc/charge_end))
+ throw_at(target, charge_distance, 1, src, FALSE, TRUE, callback = CALLBACK(src, PROC_REF(charge_end)))
COOLDOWN_START(src, charge_cooldown, charge_frequency)
return TRUE
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 f3676e752a..68f3ce92b4 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm
@@ -80,7 +80,7 @@
/obj/structure/leaper_bubble/Initialize(mapload)
. = ..()
- INVOKE_ASYNC(src, /atom/movable.proc/float, TRUE)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, float), TRUE)
QDEL_IN(src, 100)
/obj/structure/leaper_bubble/Destroy()
@@ -205,7 +205,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()
density = TRUE
@@ -215,18 +215,18 @@
playsound(src.loc, 'sound/effects/meteorimpact.ogg', 100, 1)
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
mob_transforming = 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)
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 baa0fe4649..4f6893c0e4 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
@@ -71,9 +71,9 @@
walk(src,0)
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()
@@ -83,9 +83,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)
@@ -113,7 +113,7 @@
playsound(src, 'sound/weapons/thudswoosh.ogg', 25, 1)
playsound(src, 'sound/voice/mook_leap_yell.ogg', 100, 1)
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()
@@ -132,11 +132,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 2d773c67bb..63fa1b621a 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
@@ -132,7 +132,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)
@@ -143,7 +143,7 @@
if(get_dist(src,living_target) > 7)
playsound(living_target,'sound/effects/seedling_chargeup.ogg', 100, 0)
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)
@@ -163,7 +163,7 @@
living_target.adjust_fire_stacks(0.2)//Just here for the showmanship
living_target.IgniteMob()
playsound(living_target,'sound/weapons/sear.ogg', 50, 1)
- addtimer(CALLBACK(src, .proc/AttackRecovery), 5)
+ addtimer(CALLBACK(src, PROC_REF(AttackRecovery)), 5)
return
AttackRecovery()
@@ -171,10 +171,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)
@@ -194,7 +194,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 0f6c10d817..d3aa02c9e7 100644
--- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
@@ -65,7 +65,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)
@@ -233,7 +233,7 @@
if(LAZYACCESSASSOC(mecha.occupant_actions, src, /datum/action/vehicle/sealed/mecha/mech_defense_mode) && !mecha.defense_mode)
var/datum/action/action = mecha.occupant_actions[src][/datum/action/vehicle/sealed/mecha/mech_defense_mode]
action.Trigger(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
@@ -241,7 +241,7 @@
var/datum/action/action = mecha.occupant_actions[src][/datum/action/vehicle/sealed/mecha/mech_overload_mode]
mecha.leg_overload_mode = FALSE
action.Trigger(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 16d380064d..e931e615c0 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
@@ -181,7 +181,7 @@ Difficulty: Medium
wander = TRUE
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/dash_attack()
- INVOKE_ASYNC(src, .proc/dash, target)
+ INVOKE_ASYNC(src, PROC_REF(dash), target)
shoot_ka()
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/shoot_ka()
@@ -263,7 +263,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
@@ -290,7 +290,7 @@ Difficulty: Medium
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/hunter/AttackingTarget()
. = ..()
if(. && prob(12))
- INVOKE_ASYNC(src, .proc/dash)
+ INVOKE_ASYNC(src, PROC_REF(dash))
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/doom
name = "hostile-environment miner"
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 18e1b08f86..810ada537a 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -78,15 +78,15 @@ Difficulty: Hard
blood_warp()
if(prob(25))
- INVOKE_ASYNC(src, .proc/blood_spray)
+ INVOKE_ASYNC(src, PROC_REF(blood_spray))
else if(prob(5+anger_modifier/2))
slaughterlings()
else
if(health > maxHealth/2 && !client)
- INVOKE_ASYNC(src, .proc/charge)
+ INVOKE_ASYNC(src, PROC_REF(charge))
else
- INVOKE_ASYNC(src, .proc/triple_charge)
+ INVOKE_ASYNC(src, PROC_REF(triple_charge))
/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize()
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 2f2fcda03c..04f381b2c0 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -81,7 +81,7 @@ Difficulty: Very Hard
double_spiral()
else
visible_message("\"Judgement.\"")
- INVOKE_ASYNC(src, .proc/spiral_shoot, pick(TRUE, FALSE))
+ INVOKE_ASYNC(src, PROC_REF(spiral_shoot), pick(TRUE, FALSE))
else if(prob(20))
ranged_cooldown = world.time + 2
@@ -92,7 +92,7 @@ Difficulty: Very Hard
blast()
else
ranged_cooldown = world.time + 20
- INVOKE_ASYNC(src, .proc/alternating_dir_shots)
+ INVOKE_ASYNC(src, PROC_REF(alternating_dir_shots))
/mob/living/simple_animal/hostile/megafauna/colossus/Initialize()
@@ -144,8 +144,8 @@ Difficulty: Very Hard
visible_message("\"Die.\"")
sleep(10)
- INVOKE_ASYNC(src, .proc/spiral_shoot)
- INVOKE_ASYNC(src, .proc/spiral_shoot, TRUE)
+ INVOKE_ASYNC(src, PROC_REF(spiral_shoot))
+ INVOKE_ASYNC(src, PROC_REF(spiral_shoot), TRUE)
/mob/living/simple_animal/hostile/megafauna/colossus/proc/spiral_shoot(negative = FALSE, counter_start = 8)
var/turf/start_turf = get_step(src, pick(GLOB.alldirs))
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 098cbb3add..3848992024 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
@@ -104,7 +104,7 @@ Difficulty: Extremely Hard
if(easy_attack)
snowball_machine_gun()
else
- INVOKE_ASYNC(src, .proc/ice_shotgun, 5, list(list(-180, -140, -100, -60, -20, 20, 60, 100, 140), list(-160, -120, -80, -40, 0, 40, 80, 120, 160)))
+ INVOKE_ASYNC(src, PROC_REF(ice_shotgun), 5, list(list(-180, -140, -100, -60, -20, 20, 60, 100, 140), list(-160, -120, -80, -40, 0, 40, 80, 120, 160)))
snowball_machine_gun(5 * 8, 5)
if(3)
if(easy_attack)
@@ -288,7 +288,7 @@ Difficulty: Extremely Hard
return
forceMove(user)
to_chat(user, "You feel a bit safer... but a demonic presence lurks in the back of your head...")
- RegisterSignal(user, COMSIG_MOB_DEATH, .proc/resurrect)
+ RegisterSignal(user, COMSIG_MOB_DEATH, PROC_REF(resurrect))
/// Resurrects the target when they die by cloning them into a new duplicate body and transferring their mind to the clone on a safe station turf
/obj/item/resurrection_crystal/proc/resurrect(mob/living/carbon/user, gibbed)
@@ -349,7 +349,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, "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 b8b94adab2..23eccb72af 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -111,15 +111,15 @@ Difficulty: Medium
if(prob(15 + anger_modifier) && !client)
if(health < maxHealth/2)
- INVOKE_ASYNC(src, .proc/swoop_attack, TRUE, null, 50)
+ INVOKE_ASYNC(src, PROC_REF(swoop_attack), TRUE, null, 50)
else
fire_rain()
else if(prob(10+anger_modifier) && !client)
if(health > maxHealth/2)
- INVOKE_ASYNC(src, .proc/swoop_attack)
+ INVOKE_ASYNC(src, PROC_REF(swoop_attack))
else
- INVOKE_ASYNC(src, .proc/triple_swoop)
+ INVOKE_ASYNC(src, PROC_REF(triple_swoop))
else
fire_walls()
@@ -135,7 +135,7 @@ Difficulty: Medium
playsound(get_turf(src),'sound/magic/fireball.ogg', 200, 1)
for(var/d in GLOB.cardinals)
- INVOKE_ASYNC(src, .proc/fire_wall, d)
+ INVOKE_ASYNC(src, PROC_REF(fire_wall), d)
/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_wall(dir)
var/list/hit_things = list(src)
@@ -309,7 +309,7 @@ Difficulty: Medium
/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/dragon_swoop
@@ -333,7 +333,7 @@ Difficulty: Medium
/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/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index ab25c3be05..a4c9f2e24b 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -156,10 +156,10 @@ Difficulty: Normal
if(ranged_cooldown <= world.time)
calculate_rage()
ranged_cooldown = world.time + max(5, ranged_cooldown_time - anger_modifier * 0.75)
- 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
if(L.stat == CONSCIOUS && L.health >= 30)
OpenFire()
else
@@ -258,9 +258,9 @@ Difficulty: Normal
while(health && !QDELETED(target) && cross_counter)
cross_counter--
if(prob(60))
- INVOKE_ASYNC(src, .proc/cardinal_blasts, target)
+ INVOKE_ASYNC(src, PROC_REF(cardinal_blasts), target)
else
- INVOKE_ASYNC(src, .proc/diagonal_blasts, target)
+ INVOKE_ASYNC(src, PROC_REF(diagonal_blasts), target)
sleep(6 + target_slowness)
animate(src, color = oldcolor, time = 8)
addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8)
@@ -306,13 +306,13 @@ Difficulty: Normal
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/alldir_blasts, target)
+ INVOKE_ASYNC(src, PROC_REF(alldir_blasts), target)
else if(prob(60))
- INVOKE_ASYNC(src, .proc/cardinal_blasts, target)
+ INVOKE_ASYNC(src, PROC_REF(cardinal_blasts), target)
else
- INVOKE_ASYNC(src, .proc/diagonal_blasts, target)
+ INVOKE_ASYNC(src, PROC_REF(diagonal_blasts), target)
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/diagonal_blasts(mob/victim) //fire diagonal cross blasts with a delay
var/turf/T = get_turf(victim)
@@ -323,7 +323,7 @@ Difficulty: Normal
sleep(2)
new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
for(var/d in GLOB.diagonals)
- 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/cardinal_blasts(mob/victim) //fire cardinal cross blasts with a delay
var/turf/T = get_turf(victim)
@@ -334,7 +334,7 @@ Difficulty: Normal
sleep(2)
new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
for(var/d in GLOB.cardinals)
- 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/alldir_blasts(mob/victim) //fire alldir cross blasts with a delay
var/turf/T = get_turf(victim)
@@ -345,7 +345,7 @@ Difficulty: Normal
sleep(2)
new /obj/effect/temp_visual/hierophant/blast(T, src, FALSE)
for(var/d in GLOB.alldirs)
- 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
@@ -364,13 +364,13 @@ Difficulty: Normal
return
arena_cooldown = world.time + initial(arena_cooldown)
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(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
@@ -523,7 +523,7 @@ Difficulty: Normal
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)
@@ -611,7 +611,7 @@ Difficulty: Normal
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))
/obj/effect/temp_visual/hierophant/blast/proc/blast()
var/turf/T = get_turf(src)
@@ -684,7 +684,7 @@ Difficulty: Normal
if(H.beacon == src)
to_chat(user, "You start removing your hierophant beacon...")
H.timer = world.time + 51
- INVOKE_ASYNC(H, /obj/item/hierophant_club.proc/prepare_icon_update)
+ INVOKE_ASYNC(H, TYPE_PROC_REF(/obj/item/hierophant_club, prepare_icon_update))
if(do_after(user, 50, target = src))
playsound(src,'sound/magic/blind.ogg', 200, 1, -4)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(get_turf(src), user)
@@ -694,7 +694,7 @@ Difficulty: Normal
qdel(src)
else
H.timer = world.time
- INVOKE_ASYNC(H, /obj/item/hierophant_club.proc/prepare_icon_update)
+ INVOKE_ASYNC(H, TYPE_PROC_REF(/obj/item/hierophant_club, prepare_icon_update))
else
to_chat(user, "You touch the beacon with the club, but nothing happens.")
else
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 c65698b862..3e529459c1 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
@@ -126,15 +126,15 @@ SHITCODE AHEAD. BE ADVISED. Also comment extravaganza
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, 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)
@@ -349,7 +349,7 @@ SHITCODE AHEAD. BE ADVISED. Also comment extravaganza
/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)
///Handles an extremely basic AI
/obj/structure/legionturret/proc/set_up_shot()
@@ -373,7 +373,7 @@ SHITCODE AHEAD. BE ADVISED. Also comment extravaganza
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/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
index d071209b64..b770e535a7 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
@@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
/mob/living/simple_animal/hostile/swarmer/ai/proc/StartAction(deci = 0)
stop_automated_movement = TRUE
AIStatus = AI_OFF
- addtimer(CALLBACK(src, .proc/EndAction), deci)
+ addtimer(CALLBACK(src, PROC_REF(EndAction)), deci)
/mob/living/simple_animal/hostile/swarmer/ai/proc/EndAction()
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 3a9ad12cab..aada622930 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm
@@ -114,7 +114,7 @@ Difficulty: Hard
. = ..()
stored_move_dirs &= ~direct
if(!stored_move_dirs)
- INVOKE_ASYNC(src, .proc/ground_slam, stomp_range, 1)
+ INVOKE_ASYNC(src, PROC_REF(ground_slam), stomp_range, 1)
/// Slams the ground around the wendigo throwing back enemies caught nearby
/mob/living/simple_animal/hostile/megafauna/wendigo/proc/ground_slam(range, delay)
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 1f5cace824..23305ca8d0 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
@@ -159,15 +159,15 @@ 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)
activity = TUMOR_ACTIVE
var/mob/elitemind = null
visible_message("[src] begins to convulse. Your instincts tell you to step back.")
activator = user
if(!boosted)
- addtimer(CALLBACK(src, .proc/spawn_elite), 30)
+ addtimer(CALLBACK(src, PROC_REF(spawn_elite)), 30)
return
visible_message("Something within [src] stirs...")
var/list/candidates = pollCandidatesForMob("Do you want to play as a lavaland elite?", ROLE_SENTIENCE, null, ROLE_SENTIENCE, 50, src, POLL_IGNORE_SENTIENCE_POTION)
@@ -182,7 +182,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
to_chat(elitemind, "
!!READ THIS!!
The following is server-specific policy configuration and overrides anything said above if conflicting.")
to_chat(elitemind, "
")
to_chat(elitemind, "[policy]")
- addtimer(CALLBACK(src, .proc/spawn_elite, elitemind), 100)
+ addtimer(CALLBACK(src, PROC_REF(spawn_elite), elitemind), 100)
else
visible_message("The stirring stops, and nothing emerges. Perhaps try again later.")
activity = TUMOR_INACTIVE
@@ -198,7 +198,7 @@ While using this makes the system rely on OnFire, it still gives options for tim
mychild.key = elitemind.key
mychild.sentience_act()
icon_state = "tumor_popped"
- INVOKE_ASYNC(src, .proc/arena_checks)
+ INVOKE_ASYNC(src, PROC_REF(arena_checks))
/obj/structure/elite_tumor/proc/return_elite()
mychild.forceMove(loc)
@@ -245,11 +245,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(activator != null && activator.stat == DEAD || activity == TUMOR_ACTIVE && QDELETED(activator))
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 d7b7dc3dae..d218f0daaf 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 fae2e1fedf..47b1f39ba3 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)
@@ -143,13 +143,13 @@
var/target_turf = get_turf(target)
var/angle_to_target = Get_Angle(src, target_turf)
shoot_projectile(target_turf, angle_to_target, FALSE)
- addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE), 2)
- addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE), 4)
+ addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE), 2)
+ addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE), 4)
if(health < maxHealth * 0.5)
playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE)
- addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE), 10)
- addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE), 12)
- addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE), 14)
+ addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE), 10)
+ addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE), 12)
+ addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE), 14)
/mob/living/simple_animal/hostile/asteroid/elite/herald/proc/herald_circleshot()
var/static/list/directional_shot_angles = list(0, 45, 90, 135, 180, 225, 270, 315)
@@ -166,11 +166,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), 5)
+ addtimer(CALLBACK(src, PROC_REF(herald_circleshot)), 5)
if(health < maxHealth * 0.5)
playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE)
- addtimer(CALLBACK(src, .proc/herald_circleshot), 15)
- addtimer(CALLBACK(src, .proc/unenrage), 20)
+ addtimer(CALLBACK(src, PROC_REF(herald_circleshot)), 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
@@ -272,4 +272,4 @@
return
owner.visible_message("[owner]'s [src] emits a loud noise as [owner] is struck!")
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 c744d4ed58..ad6a810e55 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
@@ -105,7 +105,7 @@
T = get_step(T, dir_to_target)
playsound(src,'sound/magic/demon_attack1.ogg', 200, 1)
visible_message("[src] prepares to charge!")
- addtimer(CALLBACK(src, .proc/legionnaire_charge_2, dir_to_target, 0), 5)
+ addtimer(CALLBACK(src, PROC_REF(legionnaire_charge_2), dir_to_target, 0), 5)
/mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/legionnaire_charge_2(var/move_dir, var/times_ran)
if(times_ran >= 4)
@@ -134,7 +134,7 @@
//L.Paralyze(20)
L.Stun(20) //substituting this for the Paralyze from the line above, because we don't have tg paralysis stuff
L.adjustBruteLoss(50)
- addtimer(CALLBACK(src, .proc/legionnaire_charge_2, move_dir, (times_ran + 1)), 2)
+ addtimer(CALLBACK(src, PROC_REF(legionnaire_charge_2), move_dir, (times_ran + 1)), 2)
/mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/head_detach(target)
ranged_cooldown = world.time + 10
@@ -162,7 +162,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
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 5daeaff9e8..22ddf6141b 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
@@ -119,7 +119,7 @@
new /obj/effect/temp_visual/hierophant/blast/pandora(T, src, null, null, list(owner))
T = get_step(T, angleused)
procsleft = procsleft - 1
- addtimer(CALLBACK(src, .proc/singular_shot_line, procsleft, angleused, T), 2)
+ addtimer(CALLBACK(src, PROC_REF(singular_shot_line), procsleft, angleused, T), 2)
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/magic_box(target)
ranged_cooldown = world.time + cooldown_time
@@ -135,7 +135,7 @@
new /obj/effect/temp_visual/hierophant/telegraph(T, 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, T, source), 2)
+ addtimer(CALLBACK(src, PROC_REF(pandora_teleport_2), T, source), 2)
/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_2(var/turf/T, var/turf/source)
new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src)
@@ -147,7 +147,7 @@
animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out
visible_message("[src] fades out!")
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(var/turf/T)
forceMove(T)
@@ -160,7 +160,7 @@
var/turf/T = get_turf(target)
new /obj/effect/temp_visual/hierophant/blast/pandora(T, src, null, null, list(owner))
var/max_size = 2
- 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(var/turf/T, var/ring, var/max_size)
if(ring > max_size)
@@ -168,7 +168,7 @@
for(var/t in spiral_range_turfs(ring, T))
if(get_dist(t, T) == ring)
new /obj/effect/temp_visual/hierophant/blast/pandora(t, src, null, null, list(owner))
- addtimer(CALLBACK(src, .proc/aoe_squares_2, T, (ring + 1), max_size), 2)
+ addtimer(CALLBACK(src, PROC_REF(aoe_squares_2), T, (ring + 1), max_size), 2)
//The specific version of hiero's squares pandora uses
/obj/effect/temp_visual/hierophant/blast/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 2017d75c36..46bb3a9fa2 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
@@ -53,7 +53,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 f33bd6a3b7..d29de07532 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
@@ -168,7 +168,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)
. = ..()
@@ -182,7 +182,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
@@ -206,7 +206,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/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm
index 0844cf988a..61578dedfc 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 @@
. = ..()
if(swarming)
AddComponent(/datum/component/swarming) //oh god not the bees
- addtimer(CALLBACK(src, .proc/death), 100)
+ addtimer(CALLBACK(src, PROC_REF(death)), 100)
//Legion
/mob/living/simple_animal/hostile/asteroid/hivelord/legion
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 36b772b6d2..368cc33597 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 = 1)
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/plaguerat.dm b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm
index 73dace85cd..d67064a447 100644
--- a/code/modules/mob/living/simple_animal/hostile/plaguerat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/plaguerat.dm
@@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(plague_rats)
loc = exit_vent
var/travel_time = round(get_dist(loc, exit_vent.loc) / 2)
- addtimer(CALLBACK(src, .proc/exit_vents), travel_time) //come out at exit vent in 2 to 20 seconds
+ addtimer(CALLBACK(src, PROC_REF(exit_vents)), travel_time) //come out at exit vent in 2 to 20 seconds
if(world.time > min_next_vent && !entry_vent && !in_vent && prob(RAT_VENT_CHANCE)) //small chance to go into a vent
diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
index f90fb55424..8419271d57 100644
--- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -36,7 +36,7 @@
riot = new /datum/action/cooldown/riot
riot.Grant(src)
AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
- INVOKE_ASYNC(src, .proc/poll_for_player)
+ INVOKE_ASYNC(src, PROC_REF(poll_for_player))
/mob/living/simple_animal/hostile/regalrat/proc/poll_for_player()
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as the Royal Rat, cheesey be his crown?", ROLE_SENTIENCE, null, FALSE, 100, POLL_IGNORE_SENTIENCE_POTION)
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 51f395207f..98bc2fb122 100644
--- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm
@@ -301,7 +301,7 @@
if(D.density)
return
delayFire += 1.0
- 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.
@@ -381,7 +381,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.
@@ -437,7 +437,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"
@@ -459,7 +459,7 @@
var/throwtarget = get_edge_target_turf(target, dir_to_target)
L.safe_throw_at(throwtarget, 10, 1, src)
L.drop_all_held_items()
- 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/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm
index e724da5cc3..ddc8ce8d4f 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
@@ -31,7 +31,7 @@
for(var/turf/T in anchors)
var/datum/beam/B = Beam(T, "vine", time=INFINITY, maxdistance=5, beam_type=/obj/effect/ebeam/vine)
B.sleep_time = 10 //these shouldn't move, so let's slow down updates to 1 second (any slower and the deletion of the vines would be too slow)
- addtimer(CALLBACK(src, .proc/bear_fruit), growth_time)
+ addtimer(CALLBACK(src, PROC_REF(bear_fruit)), growth_time)
/**
* Spawns a venus human trap, then qdels itself.
@@ -128,7 +128,7 @@
return
var/datum/beam/newVine = Beam(the_target, "vine", time=INFINITY, 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/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm
index 4cfba0c74c..c2b7bad5b6 100644
--- a/code/modules/mob/living/simple_animal/hostile/wizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm
@@ -68,7 +68,7 @@
/mob/living/simple_animal/hostile/wizard/handle_automated_action()
. = ..()
- INVOKE_ASYNC(src, .proc/AutomatedCast)
+ INVOKE_ASYNC(src, PROC_REF(AutomatedCast))
/mob/living/simple_animal/hostile/wizard/proc/AutomatedCast()
if(target && next_cast < world.time)
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 516ffa1085..47fdbf0917 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -455,7 +455,7 @@ GLOBAL_LIST_INIT(strippable_parrot_items, create_strippable_list(list(
newspeak.Add(possible_phrase)
speak = newspeak
- INVOKE_ASYNC(src, .proc/attempt_item_theft)
+ INVOKE_ASYNC(src, PROC_REF(attempt_item_theft))
return
//-----WANDERING - This is basically a 'I dont know what to do yet' state
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index 274af333fc..df8d825f58 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -391,7 +391,7 @@
else if(CHECK_MOBILITY(src, MOBILITY_MOVE) && 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/mob.dm b/code/modules/mob/mob.dm
index ded4367de2..096b9ee15c 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -347,8 +347,8 @@
if(isnull(client.recent_examines[A]) || client.recent_examines[A] < world.time)
result = A.examine(src)
client.recent_examines[A] = world.time + EXAMINE_MORE_TIME // set the value to when the examine cooldown ends
- RegisterSignal(A, COMSIG_PARENT_QDELETING, .proc/clear_from_recent_examines, override=TRUE) // to flush the value if deleted early
- addtimer(CALLBACK(src, .proc/clear_from_recent_examines, A), EXAMINE_MORE_TIME)
+ RegisterSignal(A, COMSIG_PARENT_QDELETING, PROC_REF(clear_from_recent_examines), override=TRUE) // to flush the value if deleted early
+ addtimer(CALLBACK(src, PROC_REF(clear_from_recent_examines), A), EXAMINE_MORE_TIME)
handle_eye_contact(A)
else
result = A.examine_more(src)
@@ -446,13 +446,13 @@
if(!istype(examined_carbon) || (!(examined_carbon.wear_mask && examined_carbon.wear_mask.flags_inv & HIDEFACE) && !(examined_carbon.head && examined_carbon.head.flags_inv & HIDEFACE)))
if(SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT)
var/msg = "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, PROC_REF(to_chat), src, msg), 3) // so the examine signal has time to fire and this will print after
var/mob/living/carbon/us_as_carbon = src // i know >casting as subtype, but this isn't really an inheritable check
if(!istype(us_as_carbon) || (!(us_as_carbon.wear_mask && us_as_carbon.wear_mask.flags_inv & HIDEFACE) && !(us_as_carbon.head && us_as_carbon.head.flags_inv & HIDEFACE)))
if(SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT)
var/msg = "[src] makes eye contact with you."
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, examined_mob, msg), 3)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), examined_mob, msg), 3)
/mob/proc/can_resist()
return FALSE //overridden in living.dm
@@ -539,7 +539,7 @@
if(send_signal)
SEND_SIGNAL(src, COMSIG_MOB_KEY_CHANGE, new_mob, src)
//splurt changeh
- INVOKE_ASYNC(GLOBAL_PROC, .proc/_paci_check, new_mob, src)
+ INVOKE_ASYNC(GLOBAL_PROC, PROC_REF(_paci_check), new_mob, src)
//
return TRUE
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 775b66ecb5..cd08010313 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -19,7 +19,7 @@
new /obj/effect/temp_visual/monkeyify(loc)
- transformation_timer = addtimer(CALLBACK(src, .proc/finish_monkeyize, tr_flags), TRANSFORMATION_DURATION, TIMER_UNIQUE)
+ transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_monkeyize), tr_flags), TRANSFORMATION_DURATION, TIMER_UNIQUE)
/mob/living/carbon/proc/finish_monkeyize(tr_flags)
transformation_timer = null
diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm
index 570f01f5d9..7c87596184 100644
--- a/code/modules/mob/typing_indicator.dm
+++ b/code/modules/mob/typing_indicator.dm
@@ -36,7 +36,7 @@ GLOBAL_LIST_EMPTY(typing_indicator_overlays)
return
typing_indicator_current = state_override
add_overlay(state_override)
- typing_indicator_timerid = addtimer(CALLBACK(src, .proc/clear_typing_indicator), timeout_override, TIMER_STOPPABLE)
+ typing_indicator_timerid = addtimer(CALLBACK(src, PROC_REF(clear_typing_indicator)), timeout_override, TIMER_STOPPABLE)
/**
* Removes typing indicator.
diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm
index 46da99f052..fac561bb03 100644
--- a/code/modules/mod/mod_ai.dm
+++ b/code/modules/mod/mod_ai.dm
@@ -178,7 +178,7 @@
return wearer.loc.relaymove(wearer, direction)
else if(wearer)
ADD_TRAIT(wearer, TRAIT_MOBILITY_NOREST, 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)
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 35f4b3cfe3..40f7fa1a93 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -139,7 +139,7 @@
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_ATOM_EXITED, PROC_REF(on_exit))
movedelay = CONFIG_GET(number/movedelay/run_delay)
/obj/item/mod/control/Destroy()
@@ -394,8 +394,8 @@
/obj/item/mod/control/proc/set_wearer(mob/user)
wearer = user
- RegisterSignal(wearer, COMSIG_ATOM_EXITED, .proc/on_exit)
- RegisterSignal(wearer, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, .proc/on_borg_charge)
+ RegisterSignal(wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit))
+ RegisterSignal(wearer, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge))
update_cell_alert()
for(var/obj/item/mod/module/module as anything in modules)
module.on_equip()
@@ -575,7 +575,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_borg_charge(datum/source, amount)
diff --git a/code/modules/mod/mod_paint.dm b/code/modules/mod/mod_paint.dm
index 44f4923002..d98705100e 100644
--- a/code/modules/mod/mod_paint.dm
+++ b/code/modules/mod/mod_paint.dm
@@ -155,7 +155,7 @@
var/list/skins = list()
for(var/mod_skin in mod.theme.skins)
skins[mod_skin] = image(icon = mod.icon, icon_state = "[mod_skin]-control")
- var/pick = show_radial_menu(user, mod, skins, custom_check = CALLBACK(src, .proc/check_menu, mod, user), require_near = TRUE)
+ var/pick = show_radial_menu(user, mod, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), mod, user), require_near = TRUE)
if(!pick)
balloon_alert(user, "no skin picked!")
return
diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm
index 2d008cad1c..e8ded6a61d 100644
--- a/code/modules/mod/modules/_module.dm
+++ b/code/modules/mod/modules/_module.dm
@@ -52,8 +52,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)
@@ -125,7 +125,7 @@
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_ATOM_EXITED, PROC_REF(on_exit))
else
balloon_alert(mod.wearer, "can't extend [device]!")
return
@@ -163,7 +163,7 @@
to_chat(mod.wearer, span_warning("You cannot activate this right now."))
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()
return TRUE
@@ -268,7 +268,7 @@
/// Updates the signal used by active modules to be activated
/obj/item/mod/module/proc/update_signal()
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))
/obj/item/mod/module/anomaly_locked
name = "MOD anomaly locked module"
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index cc0a6812f1..fc6024e667 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -107,7 +107,7 @@
tether.preparePixelProjectile(target, mod.wearer)
tether.firer = mod.wearer
playsound(src, 'sound/weapons/batonextend.ogg', 25, TRUE)
- INVOKE_ASYNC(tether, /obj/item/projectile.proc/fire)
+ INVOKE_ASYNC(tether, TYPE_PROC_REF(/obj/item/projectile, fire))
drain_power(use_power_cost)
/obj/item/projectile/tether
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index 1fa49f57e9..47aebc455b 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -108,7 +108,7 @@
if(!.)
return
ion_trail.start()
- RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/move_react)
+ RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
if(full_speed)
mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed)
else
@@ -332,10 +332,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(deleting = FALSE)
UnregisterSignal(mod, COMSIG_MOD_ACTIVATE)
diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm
index 65a5be5dc6..16c6627b4b 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(deleting = FALSE)
UnregisterSignal(mod.wearer, COMSIG_ATOM_EXPOSE_REAGENTS)
@@ -33,8 +33,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)
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
index c7e1510152..5de1788972 100644
--- a/code/modules/mod/modules/modules_medical.dm
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -109,7 +109,7 @@
/obj/item/mod/module/defibrillator/Initialize(mapload)
. = ..()
- RegisterSignal(device, COMSIG_DEFIBRILLATOR_SUCCESS, .proc/on_defib_success)
+ RegisterSignal(device, COMSIG_DEFIBRILLATOR_SUCCESS, PROC_REF(on_defib_success))
/obj/item/mod/module/defibrillator/Destroy()
UnregisterSignal(device, COMSIG_DEFIBRILLATOR_SUCCESS)
diff --git a/code/modules/mod/modules/modules_science.dm b/code/modules/mod/modules/modules_science.dm
index 7208210b76..3e9c1a236f 100644
--- a/code/modules/mod/modules/modules_science.dm
+++ b/code/modules/mod/modules/modules_science.dm
@@ -38,7 +38,7 @@
return
had_research_scanner = mod.wearer.research_scanner
mod.wearer.research_scanner = TRUE
- 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, deleting = FALSE)
. = ..()
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index 098abf8015..9980aba9f8 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_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW), .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_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW), PROC_REF(unstealth))
animate(mod.wearer, alpha = stealth_alpha, time = 1.5 SECONDS)
drain_power(use_power_cost)
@@ -91,7 +91,7 @@
mod.chestplate.allowed -= (guns_typecache - already_allowed_guns)
/obj/item/mod/module/magnetic_harness/on_suit_activation()
- RegisterSignal(mod.wearer, COMSIG_MOB_UNEQUIPPED_ITEM, .proc/check_dropped_item)
+ RegisterSignal(mod.wearer, COMSIG_MOB_UNEQUIPPED_ITEM, PROC_REF(check_dropped_item))
/obj/item/mod/module/magnetic_harness/on_suit_deactivation(deleting = FALSE)
UnregisterSignal(mod.wearer, COMSIG_MOB_UNEQUIPPED_ITEM)
@@ -103,7 +103,7 @@
return
if(new_location != get_turf(src))
return
- addtimer(CALLBACK(src, .proc/pick_up_item, dropped_item), magnet_delay)
+ addtimer(CALLBACK(src, PROC_REF(pick_up_item), dropped_item), magnet_delay)
/obj/item/mod/module/magnetic_harness/proc/pick_up_item(obj/item/item)
if(!isturf(item.loc) || !item.Adjacent(mod.wearer))
@@ -184,7 +184,7 @@
. = ..()
if(!.)
return
- RegisterSignal(mod.wearer, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(mod.wearer, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/obj/item/mod/module/megaphone/on_deactivation(display_message = TRUE, deleting = FALSE)
. = ..()
diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm
index e3c70fa570..57d2b39db8 100644
--- a/code/modules/mod/modules/modules_supply.dm
+++ b/code/modules/mod/modules/modules_supply.dm
@@ -188,7 +188,7 @@
stored = holding
balloon_alert(mod.wearer, "mining satchel stored")
playsound(src, 'sound/weapons/revolverempty.ogg', 100, TRUE)
- RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/Pickup_ores)
+ RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(Pickup_ores))
else if(mod.wearer.put_in_active_hand(stored, forced = FALSE, ignore_animation = TRUE))
UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED)
balloon_alert(mod.wearer, "mining satchel retrieved")
@@ -203,7 +203,7 @@
/obj/item/mod/module/orebag/on_equip()
if(stored)
- RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/Pickup_ores)
+ RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(Pickup_ores))
/obj/item/mod/module/orebag/on_unequip()
if(stored)
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 4e5afa32a7..825283bf9c 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/signaler.dm b/code/modules/modular_computers/file_system/programs/signaler.dm
index bf309ecdf4..52e14d63e0 100644
--- a/code/modules/modular_computers/file_system/programs/signaler.dm
+++ b/code/modules/modular_computers/file_system/programs/signaler.dm
@@ -38,7 +38,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 9038c71a88..83e8cb2122 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 (!isturf(S.loc) || !(is_station_level(S.z) || is_mining_level(S.z) || S.z == T.z))
continue
supermatters.Add(S)
- RegisterSignal(S, COMSIG_PARENT_QDELETING, .proc/react_to_del)
+ RegisterSignal(S, 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 4a268c2911..ed48c36ad4 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/newscaster/newscaster_machine.dm b/code/modules/newscaster/newscaster_machine.dm
index 5bc0929465..c2c826a26e 100644
--- a/code/modules/newscaster/newscaster_machine.dm
+++ b/code/modules/newscaster/newscaster_machine.dm
@@ -687,7 +687,7 @@ GLOBAL_LIST_EMPTY(allCasters)
say("Breaking news from [channel]!")
alert = TRUE
update_icon()
- 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)
playsound(loc, 'sound/machines/twobeep.ogg', 75, 1)
else
say("Attention! Wanted issue distributed!")
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 0b64f35f0c..4dc9e738ec 100644
--- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm
+++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_adrenaline.dm
@@ -24,7 +24,7 @@
ninja.say(pick("A CORNERED FOX IS MORE DANGEROUS THAN A JACKAL!","HURT ME MOOORRREEE!","IMPRESSIVE!"), forced = "ninjaboost")
a_boost = FALSE
to_chat(ninja, "You have used the adrenaline boost.")
- 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 c1a3c77814..cedb13c0ae 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
@@ -80,7 +80,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
@@ -109,7 +109,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 ed83a0f67b..2f11627acd 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -103,7 +103,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/contract.dm b/code/modules/paperwork/contract.dm
index d19fe23da6..fc49ce6488 100644
--- a/code/modules/paperwork/contract.dm
+++ b/code/modules/paperwork/contract.dm
@@ -241,7 +241,7 @@
user.visible_message("With a sudden blaze, [H] stands back up.")
H.fakefire()
fulfillContract(H, 1)//Revival contracts are always signed in blood
- addtimer(CALLBACK(H, /mob/living/carbon/human.proc/fakefireextinguish), 5, TIMER_UNIQUE)
+ addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon/human, fakefireextinguish)), 5, TIMER_UNIQUE)
addtimer(CALLBACK(src, "resetcooldown"), 300, TIMER_UNIQUE)
else
..()
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 8079950aff..08c7a4a47a 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -98,23 +98,23 @@
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
// Devil contract paper.
if(istype(paper_copy, /obj/item/paper/contract/employment))
- do_copy_loop(CALLBACK(src, .proc/make_devil_paper_copy), usr)
+ do_copy_loop(CALLBACK(src, PROC_REF(make_devil_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.
@@ -193,7 +193,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 6022853fad..86cf6f8ff9 100644
--- a/code/modules/paperwork/ticketmachine.dm
+++ b/code/modules/paperwork/ticketmachine.dm
@@ -190,7 +190,7 @@
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 c2acb46ff3..9cbee3b0a3 100644
--- a/code/modules/photography/camera/camera.dm
+++ b/code/modules/photography/camera/camera.dm
@@ -130,11 +130,11 @@
var/mob/living/carbon/human/H = user
if (HAS_TRAIT(H, TRAIT_PHOTOGRAPHER))
realcooldown *= 0.5
- addtimer(CALLBACK(src, .proc/cooldown), realcooldown)
+ addtimer(CALLBACK(src, PROC_REF(cooldown)), realcooldown)
icon_state = state_off
- INVOKE_ASYNC(src, .proc/captureimage, target, user, flag, picture_size_x - 1, picture_size_y - 1)
+ INVOKE_ASYNC(src, PROC_REF(captureimage), target, user, flag, picture_size_x - 1, picture_size_y - 1)
/obj/item/camera/proc/cooldown()
diff --git a/code/modules/plumbing/plumbers/_plumb_machinery.dm b/code/modules/plumbing/plumbers/_plumb_machinery.dm
index 0566945e3b..0ec95af2b9 100644
--- a/code/modules/plumbing/plumbers/_plumb_machinery.dm
+++ b/code/modules/plumbing/plumbers/_plumb_machinery.dm
@@ -26,7 +26,7 @@
. = ..()
anchored = bolt
create_reagents(buffer, reagent_flags)
- AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
+ AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, PROC_REF(can_be_rotated)))
/obj/machinery/plumbing/proc/can_be_rotated(mob/user,rotation_type)
return TRUE
diff --git a/code/modules/plumbing/plumbers/medipenrefill.dm b/code/modules/plumbing/plumbers/medipenrefill.dm
index 140114673a..4bb8a80b9f 100644
--- a/code/modules/plumbing/plumbers/medipenrefill.dm
+++ b/code/modules/plumbing/plumbers/medipenrefill.dm
@@ -57,7 +57,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, "There aren't enough reagents to finish this operation.")
diff --git a/code/modules/pool/pool_structures.dm b/code/modules/pool/pool_structures.dm
index ec5d455958..4d10b3a578 100644
--- a/code/modules/pool/pool_structures.dm
+++ b/code/modules/pool/pool_structures.dm
@@ -77,7 +77,7 @@
jumper.AddElement(/datum/element/swimming)
sleep(1)
jumper.forceMove(T)
- addtimer(CALLBACK(src, .proc/dive, jumper, original_layer, original_px, original_py), 10)
+ addtimer(CALLBACK(src, PROC_REF(dive), jumper, original_layer, original_px, original_py), 10)
/obj/structure/pool/Lboard/proc/dive(mob/living/carbon/jumper, original_layer, original_px, original_py)
switch(rand(1, 100))
@@ -87,7 +87,7 @@
sleep(15)
backswim()
var/atom/throw_target = get_edge_target_turf(src, dir)
- jumper.throw_at(throw_target, 1, 1, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ jumper.throw_at(throw_target, 1, 1, callback = CALLBACK(src, PROC_REF(on_finish_jump), jumper))
if(21 to 40)
jumper.visible_message("[jumper] goes for a dive!", \
@@ -95,7 +95,7 @@
sleep(20)
backswim()
var/atom/throw_target = get_edge_target_turf(src, dir)
- jumper.throw_at(throw_target, 2, 1, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ jumper.throw_at(throw_target, 2, 1, callback = CALLBACK(src, PROC_REF(on_finish_jump), jumper))
if(41 to 60)
jumper.visible_message("[jumper] goes for a long dive! Stay far away!", \
@@ -103,7 +103,7 @@
sleep(25)
backswim()
var/atom/throw_target = get_edge_target_turf(src, dir)
- jumper.throw_at(throw_target, 3, 1, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ jumper.throw_at(throw_target, 3, 1, callback = CALLBACK(src, PROC_REF(on_finish_jump), jumper))
if(61 to 80)
jumper.visible_message("[jumper] goes for an awesome dive! Don't stand in [jumper.p_their()] way!", \
@@ -111,14 +111,14 @@
sleep(30)
backswim()
var/atom/throw_target = get_edge_target_turf(src, dir)
- jumper.throw_at(throw_target, 4, 1, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ jumper.throw_at(throw_target, 4, 1, callback = CALLBACK(src, PROC_REF(on_finish_jump), jumper))
if(81 to 91)
sleep(20)
backswim()
jumper.visible_message("[jumper] misses [jumper.p_their()] step!", \
"You misstep!")
var/atom/throw_target = get_edge_target_turf(src, dir)
- jumper.throw_at(throw_target, 0, 1, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ jumper.throw_at(throw_target, 0, 1, callback = CALLBACK(src, PROC_REF(on_finish_jump), jumper))
jumper.DefaultCombatKnockdown(100)
jumper.adjustBruteLoss(10)
@@ -133,7 +133,7 @@
jumper.visible_message("[jumper] fails!", \
"You can't quite do it!")
var/atom/throw_target = get_edge_target_turf(src, dir)
- jumper.throw_at(throw_target, 1, 1, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
+ jumper.throw_at(throw_target, 1, 1, callback = CALLBACK(src, PROC_REF(on_finish_jump), jumper))
else
jumper.fire_stacks = min(1,jumper.fire_stacks + 1)
jumper.IgniteMob()
@@ -142,8 +142,8 @@
jumper.visible_message("[jumper] bursts into flames of pure awesomness!", \
"No one can stop you now!")
var/atom/throw_target = get_edge_target_turf(src, dir)
- jumper.throw_at(throw_target, 6, 1, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
- addtimer(CALLBACK(src, .proc/togglejumping), 35)
+ jumper.throw_at(throw_target, 6, 1, callback = CALLBACK(src, PROC_REF(on_finish_jump), jumper))
+ addtimer(CALLBACK(src, PROC_REF(togglejumping)), 35)
reset_position(jumper, original_layer, original_px, original_py)
/obj/structure/pool/Lboard/proc/togglejumping()
diff --git a/code/modules/pool/pool_wires.dm b/code/modules/pool/pool_wires.dm
index d9b3d28b84..730381ca2b 100644
--- a/code/modules/pool/pool_wires.dm
+++ b/code/modules/pool/pool_wires.dm
@@ -35,7 +35,7 @@
P.temperature_unlocked = FALSE
if(WIRE_SHOCK)
P.shocked = !P.shocked
- addtimer(CALLBACK(P, /obj/machinery/autolathe.proc/reset, wire), 60)
+ addtimer(CALLBACK(P, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60)
/datum/wires/poolcontroller/on_cut(wire, mend)
var/obj/machinery/pool/controller/P = holder
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 5b9bf71a9b..66289a1e01 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -240,12 +240,12 @@
if(AMS.processing)
AMS.shutdown_core()
AMS.control_unit = null
- addtimer(CALLBACK(AMS, /obj/machinery/am_shielding.proc/controllerscan), 10)
+ addtimer(CALLBACK(AMS, TYPE_PROC_REF(/obj/machinery/am_shielding, controllerscan)), 10)
linked_shielding = list()
else
for(var/obj/machinery/am_shielding/AMS in linked_shielding)
AMS.update_icon()
- addtimer(CALLBACK(src, .proc/reset_shield_icon_delay), 20)
+ addtimer(CALLBACK(src, PROC_REF(reset_shield_icon_delay)), 20)
/obj/machinery/power/am_control_unit/proc/reset_shield_icon_delay()
shield_icon_delay = 0
@@ -258,7 +258,7 @@
for(var/obj/machinery/am_shielding/AMS in linked_cores)
stored_core_stability += AMS.stability
stored_core_stability/=linked_cores.len
- addtimer(CALLBACK(src, .proc/reset_stored_core_stability_delay), 40)
+ addtimer(CALLBACK(src, PROC_REF(reset_stored_core_stability_delay)), 40)
/obj/machinery/power/am_control_unit/proc/reset_stored_core_stability_delay()
stored_core_stability_delay = 0
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index e9ee1e70d0..89621514c8 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -30,7 +30,7 @@
/obj/machinery/am_shielding/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/controllerscan), 10)
+ addtimer(CALLBACK(src, PROC_REF(controllerscan)), 10)
/obj/machinery/am_shielding/proc/overheat()
visible_message("[src] melts!")
@@ -65,7 +65,7 @@
if(!control_unit)
if(!priorscan)
- addtimer(CALLBACK(src, .proc/controllerscan, 1), 20)
+ addtimer(CALLBACK(src, PROC_REF(controllerscan), 1), 20)
return
collapse()
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index e944779b91..e8f03cc4e2 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -253,7 +253,7 @@
set_machine_stat(stat | MAINT)
update_appearance()
- addtimer(CALLBACK(src, .proc/update), 5)
+ addtimer(CALLBACK(src, PROC_REF(update)), 5)
GLOB.apcs_list += src
@@ -289,7 +289,7 @@
name = "\improper [get_area_name(area, TRUE)] APC"
set_machine_stat(stat | MAINT)
update_appearance()
- addtimer(CALLBACK(src, .proc/update), 5)
+ addtimer(CALLBACK(src, PROC_REF(update)), 5)
register_context()
/obj/machinery/power/apc/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
@@ -1145,8 +1145,8 @@
return
for (var/obj/machinery/door/D in GLOB.airlocks)
if (get_area(D) == area)
- INVOKE_ASYNC(D,/obj/machinery/door.proc/hostile_lockdown,usr, FALSE)
- addtimer(CALLBACK(D,/obj/machinery/door.proc/disable_lockdown, FALSE), 30 SECONDS)
+ INVOKE_ASYNC(D,TYPE_PROC_REF(/obj/machinery/door, hostile_lockdown),usr, FALSE)
+ addtimer(CALLBACK(D,TYPE_PROC_REF(/obj/machinery/door, disable_lockdown), FALSE), 30 SECONDS)
var/obj/item/implant/hijack/H = usr.getImplant(/obj/item/implant/hijack)
H.stealthcooldown = world.time + 3 MINUTES
if("occupy")
@@ -1165,7 +1165,7 @@
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
@@ -1234,7 +1234,7 @@
return
to_chat(malf, "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("hackingapc", /atom/movable/screen/alert/hackingapc)
@@ -1582,7 +1582,7 @@
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()
@@ -1608,7 +1608,7 @@
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 c1439e773c..a8fe07ea25 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -468,7 +468,7 @@ By design, d1 is the smallest direction and d2 is the highest
moveToNullspace()
powernet.remove_cable(src) //remove the cut cable from its powernet
- addtimer(CALLBACK(O, .proc/auto_propogate_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_propogate_cut_cable), O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
// Disconnect machines connected to nodes
if(d1 == 0) // if we cut a node (O-X) cable
diff --git a/code/modules/power/multiz.dm b/code/modules/power/multiz.dm
index 9a012991f7..73e772b52d 100644
--- a/code/modules/power/multiz.dm
+++ b/code/modules/power/multiz.dm
@@ -38,13 +38,13 @@
icon_state = "cablerelay-off"
to_chat(user, "Powernet connection lost. Attempting to re-establish. Ensure the relays below this one are connected too.")
find_relays()
- addtimer(CALLBACK(src, .proc/refresh), 20) //Wait a bit so we can find the one below, then get powering
+ addtimer(CALLBACK(src, PROC_REF(refresh)), 20) //Wait a bit so we can find the one below, then get powering
return TRUE
/obj/machinery/power/deck_relay/Initialize(mapload)
. = ..()
- addtimer(CALLBACK(src, .proc/find_relays), 30)
- addtimer(CALLBACK(src, .proc/refresh), 50) //Wait a bit so we can find the one below, then get powering
+ addtimer(CALLBACK(src, PROC_REF(find_relays)), 30)
+ addtimer(CALLBACK(src, PROC_REF(refresh)), 50) //Wait a bit so we can find the one below, then get powering
///Handles re-acquiring + merging powernets found by find_relays()
/obj/machinery/power/deck_relay/proc/refresh()
diff --git a/code/modules/power/reactor/rbmk.dm b/code/modules/power/reactor/rbmk.dm
index 18f9a9cf55..2b3f7d886f 100644
--- a/code/modules/power/reactor/rbmk.dm
+++ b/code/modules/power/reactor/rbmk.dm
@@ -550,7 +550,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
/obj/machinery/computer/reactor/Initialize(mapload, obj/item/circuitboard/C)
. = ..()
- addtimer(CALLBACK(src, .proc/link_to_reactor), 10 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(link_to_reactor)), 10 SECONDS)
/obj/machinery/computer/reactor/Destroy()
reactor = null
diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm
index 618dbb2120..015f82a692 100644
--- a/code/modules/power/rtg.dm
+++ b/code/modules/power/rtg.dm
@@ -103,7 +103,7 @@
"You hear a loud electrical crack!")
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, 1, extrarange = 5)
tesla_zap(src, 5, power_gen * 0.05)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, get_turf(src), 2, 3, 4, 8), 100) // Not a normal explosion.
+ addtimer(CALLBACK(GLOBAL_PROC, 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/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index f9ed50bb98..c2e0e5acdd 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -137,4 +137,4 @@
do_sparks(5, TRUE, AM.loc)
var/atom/target = get_edge_target_turf(AM, get_dir(src, get_step_away(AM, src)))
AM.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/emitter.dm b/code/modules/power/singularity/emitter.dm
index d871c3570a..ea67115abe 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -95,7 +95,7 @@
/obj/machinery/power/emitter/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
+ AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, PROC_REF(can_be_rotated)))
/obj/machinery/power/emitter/proc/can_be_rotated(mob/user,rotation_type)
if (anchored)
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 0f58805976..328972f599 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -36,7 +36,7 @@
if(A)
var/mutable_appearance/alert_overlay = mutable_appearance('icons/effects/cult_effects.dmi', "ghostalertsie")
notify_ghosts("Nar'Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.", source = src, alert_overlay = alert_overlay, action=NOTIFY_ATTACK)
- INVOKE_ASYNC(src, .proc/narsie_spawn_animation)
+ INVOKE_ASYNC(src, PROC_REF(narsie_spawn_animation))
/obj/singularity/narsie/large/cult // For the new cult ending, guaranteed to end the round within 3 minutes
var/list/souls_needed = list()
@@ -62,12 +62,12 @@
for(var/datum/mind/cult_mind in SSticker.mode.cult)
if(isliving(cult_mind.current))
var/mob/living/L = cult_mind.current
- INVOKE_ASYNC(L, /atom.proc/narsie_act)
+ INVOKE_ASYNC(L, TYPE_PROC_REF(/atom, narsie_act))
for(var/mob/living/player in GLOB.player_list)
if(player.stat != DEAD && player.loc && is_station_level(player.loc.z) && !iscultist(player) && !isanimal(player))
souls_needed[player] = TRUE
soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75)
- INVOKE_ASYNC(src, .proc/begin_the_end)
+ INVOKE_ASYNC(src, PROC_REF(begin_the_end))
/obj/singularity/narsie/large/cult/proc/begin_the_end()
sleep(50)
@@ -86,7 +86,7 @@
if(resolved == FALSE)
resolved = TRUE
sound_to_playing_players('sound/machines/alarm.ogg')
- addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper), 120)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(cult_ending_helper)), 120)
/obj/singularity/narsie/large/cult/Destroy()
GLOB.cult_narsie = null
@@ -97,9 +97,9 @@
/proc/cult_ending_helper(var/no_explosion = 0)
if(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
- Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper))
+ Cinematic(CINEMATIC_CULT_NUKE,world,CALLBACK(GLOBAL_PROC,GLOBAL_PROC_REF(ending_helper)))
//ATTACK GHOST IGNORING PARENT RETURN VALUE
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm
index 58c338e44a..b046bc3000 100644
--- a/code/modules/power/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle.dm
@@ -25,7 +25,7 @@
/obj/effect/accelerated_particle/New(loc)
..()
- addtimer(CALLBACK(src, .proc/move), 1)
+ addtimer(CALLBACK(src, PROC_REF(move)), 1)
/obj/effect/accelerated_particle/Bump(atom/A)
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 0f0f853036..3ce38db3c2 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -35,7 +35,7 @@
panel.layer = FLY_LAYER
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
@@ -303,7 +303,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 69011e658d..adb641e306 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -208,7 +208,7 @@ 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))
soundloop = new(src, TRUE)
diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm
index c0505e2a9b..b2d6745a2f 100644
--- a/code/modules/power/tesla/coil.dm
+++ b/code/modules/power/tesla/coil.dm
@@ -92,7 +92,7 @@
D.adjust_money(min(power_produced, 1))
if(istype(linked_techweb))
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 1)) // x4 coils = ~240/m point bonus for R&D
- addtimer(CALLBACK(src, .proc/reset_shocked), 10)
+ addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
zap_buckle_check(power)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
return power_produced
@@ -130,7 +130,7 @@
D.adjust_money(min(power_produced, 3))
if(istype(linked_techweb))
linked_techweb.add_point_type(TECHWEB_POINT_TYPE_DEFAULT, min(power_produced, 3)) // x4 coils with a pulse per second or so = ~720/m point bonus for R&D
- addtimer(CALLBACK(src, .proc/reset_shocked), 10)
+ addtimer(CALLBACK(src, PROC_REF(reset_shocked)), 10)
zap_buckle_check(power)
playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5)
return power_produced
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 2c8583b447..9b8b775395 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -132,7 +132,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
diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm
index 86168979c2..8345da01a2 100644
--- a/code/modules/power/tracker.dm
+++ b/code/modules/power/tracker.dm
@@ -21,7 +21,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 323f74d0ef..0a20668f7e 100644
--- a/code/modules/procedural_mapping/mapGenerator.dm
+++ b/code/modules/procedural_mapping/mapGenerator.dm
@@ -108,7 +108,7 @@
if(!modules || !modules.len)
return
for(var/datum/mapGeneratorModule/mod in modules)
- INVOKE_ASYNC(mod, /datum/mapGeneratorModule.proc/generate)
+ INVOKE_ASYNC(mod, TYPE_PROC_REF(/datum/mapGeneratorModule, generate))
//Requests the mapGeneratorModule(s) to (re)generate this one turf
@@ -119,7 +119,7 @@
if(!modules || !modules.len)
return
for(var/datum/mapGeneratorModule/mod in modules)
- INVOKE_ASYNC(mod, /datum/mapGeneratorModule.proc/place, T)
+ INVOKE_ASYNC(mod, TYPE_PROC_REF(/datum/mapGeneratorModule, 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 4794aa6c10..f3777186b7 100644
--- a/code/modules/projectiles/ammunition/_ammunition.dm
+++ b/code/modules/projectiles/ammunition/_ammunition.dm
@@ -85,6 +85,6 @@
pixel_y = rand(-12, 12)
var/turf/T = get_turf(src)
if(still_warm && T && 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, 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 && T.bullet_bounce_sound)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, T.bullet_bounce_sound, 60, 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, PROC_REF(playsound), src, T.bullet_bounce_sound, 60, 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/gun.dm b/code/modules/projectiles/gun.dm
index a86e67de1b..69cd5f9e61 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -140,7 +140,7 @@
burst_size = 1
- sort_list(fire_select_modes, /proc/cmp_numeric_asc)
+ sort_list(fire_select_modes, GLOBAL_PROC_REF(cmp_numeric_asc))
if(fire_select_modes.len > 1)
firemode_action = new(src)
@@ -353,7 +353,7 @@
bonus_spread += 24 * G.weapon_weight * G.dualwield_spread_mult
loop_counter++
var/stam_cost = G.getstamcost(user)
- addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread, stam_cost), loop_counter)
+ addtimer(CALLBACK(G, TYPE_PROC_REF(/obj/item/gun, process_fire), target, user, TRUE, params, null, bonus_spread, stam_cost), loop_counter)
var/stam_cost = getstamcost(user)
process_fire(target, user, TRUE, params, null, bonus_spread, stam_cost)
@@ -807,7 +807,7 @@
zoomed = !zoomed
if(zoomed)
- RegisterSignal(user, COMSIG_ATOM_DIR_CHANGE, .proc/rotate)
+ RegisterSignal(user, COMSIG_ATOM_DIR_CHANGE, PROC_REF(rotate))
user.client.view_size.zoomOut(zoom_out_amt, zoom_amt, direct)
else
UnregisterSignal(user, COMSIG_ATOM_DIR_CHANGE)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 5c6aff5564..6d56b2b10c 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -63,7 +63,7 @@
playsound(src, "gun_insert_full_magazine", 70, 1)
if(!chambered)
chamber_round()
- addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/weapons/gun_chamber_round.ogg', 100, 1), 3)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(playsound), src, 'sound/weapons/gun_chamber_round.ogg', 100, 1), 3)
else
playsound(src, "gun_insert_empty_magazine", 70, 1)
A.update_icon()
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 9c9ccd2b8d..eb7f294bde 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -137,7 +137,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) && !istype(loc, /obj/item/integrated_circuit))
@@ -168,7 +168,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/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm
index 41bff2ece4..8e44a42501 100644
--- a/code/modules/projectiles/guns/misc/beam_rifle.dm
+++ b/code/modules/projectiles/guns/misc/beam_rifle.dm
@@ -266,7 +266,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))
/obj/item/gun/energy/beam_rifle/onMouseDrag(src_object, over_object, src_location, over_location, params, mob)
if(aiming)
diff --git a/code/modules/projectiles/guns/misc/grenade_launcher.dm b/code/modules/projectiles/guns/misc/grenade_launcher.dm
index 86dd0c6ce4..5a1fb207c6 100644
--- a/code/modules/projectiles/guns/misc/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/misc/grenade_launcher.dm
@@ -43,4 +43,4 @@
F.active = 1
F.icon_state = initial(F.icon_state) + "_active"
playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
- addtimer(CALLBACK(F, /obj/item/grenade.proc/prime), 15)
+ addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade, prime)), 15)
diff --git a/code/modules/projectiles/guns/misc/medbeam.dm b/code/modules/projectiles/guns/misc/medbeam.dm
index 4a64317fd9..5522e43291 100644
--- a/code/modules/projectiles/guns/misc/medbeam.dm
+++ b/code/modules/projectiles/guns/misc/medbeam.dm
@@ -53,7 +53,7 @@
current_target = target
active = TRUE
current_beam = new(user,current_target,time=6000,beam_icon_state="medbeam",btype=/obj/effect/ebeam/medical)
- INVOKE_ASYNC(current_beam, /datum/beam.proc/Start)
+ INVOKE_ASYNC(current_beam, TYPE_PROC_REF(/datum/beam, Start))
SSblackbox.record_feedback("tally", "gun_fired", 1, type)
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 0aee51bb84..e2594dbdb3 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -723,7 +723,7 @@
trajectory = new(starting.x, starting.y, starting.z, pixel_x, pixel_y, Angle, pixel_increment_amount)
fired = TRUE
if(hitscan)
- INVOKE_ASYNC(src, .proc/process_hitscan)
+ INVOKE_ASYNC(src, PROC_REF(process_hitscan))
return
if(!(datum_flags & DF_ISPROCESSING))
START_PROCESSING(SSprojectiles, src)
diff --git a/code/modules/projectiles/projectile/energy/net_snare.dm b/code/modules/projectiles/projectile/energy/net_snare.dm
index 7ecf48cf6a..4cad4555aa 100644
--- a/code/modules/projectiles/projectile/energy/net_snare.dm
+++ b/code/modules/projectiles/projectile/energy/net_snare.dm
@@ -37,7 +37,7 @@
if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
teletarget = com.target
- 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 d2e9482807..5519d83dc1 100644
--- a/code/modules/projectiles/projectile/energy/stun.dm
+++ b/code/modules/projectiles/projectile/energy/stun.dm
@@ -30,7 +30,7 @@
C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk")
else if(tase_duration && (C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE) && !HAS_TRAIT(C, TRAIT_TASED_RESISTANCE))
C.apply_status_effect(strong_tase? STATUS_EFFECT_TASED : STATUS_EFFECT_TASED_WEAK, tase_duration)
- 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)
else if(iscyborg(target))
target.visible_message(span_danger("A shower of sparks emit from [target] on impact from [src]!"))
do_sparks(1, TRUE, target)
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index c47a6e85ee..c6ed9cc602 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -383,8 +383,8 @@
/obj/structure/closet/decay/Initialize(mapload)
. = ..()
if(auto_destroy)
- addtimer(CALLBACK(src, .proc/bust_open), 5 MINUTES)
- addtimer(CALLBACK(src, .proc/magicly_lock), 5)
+ addtimer(CALLBACK(src, PROC_REF(bust_open)), 5 MINUTES)
+ addtimer(CALLBACK(src, PROC_REF(magicly_lock)), 5)
/obj/structure/closet/decay/proc/magicly_lock()
if(!welded)
@@ -398,7 +398,7 @@
/obj/structure/closet/decay/proc/decay()
animate(src, alpha = 0, time = 30)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, src), 30)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(qdel), src), 30)
/obj/structure/closet/decay/open(mob/living/user)
. = ..()
@@ -406,12 +406,12 @@
if(icon_state == magic_icon) //check if we used the magic icon at all before giving it the lesser magic icon
unmagify()
else
- addtimer(CALLBACK(src, .proc/decay), 15 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(decay)), 15 SECONDS)
/obj/structure/closet/decay/proc/unmagify()
icon_state = weakened_icon
update_icon()
- addtimer(CALLBACK(src, .proc/decay), 15 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(decay)), 15 SECONDS)
icon_welded = "welded"
/obj/item/projectile/magic/aoe
@@ -502,7 +502,7 @@
return BULLET_ACT_BLOCK
var/turf/T = get_turf(target)
for(var/i=0, i<50, i+=10)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, T, -1, exp_heavy, exp_light, exp_flash, FALSE, FALSE, exp_fire), i)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(explosion), T, -1, exp_heavy, exp_light, exp_flash, FALSE, FALSE, exp_fire), i)
/obj/item/projectile/magic/nuclear
name = "\proper blazing manliness"
diff --git a/code/modules/projectiles/projectile/special/hallucination.dm b/code/modules/projectiles/projectile/special/hallucination.dm
index 8ad149c8d5..bd7d939e34 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/item/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(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/item/projectile/hallucination/disabler
name = "disabler beam"
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index a337855497..34e151f4d3 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -532,7 +532,7 @@
if(total_matching_reagents == total_required_reagents && total_matching_catalysts == total_required_catalysts && matching_container && matching_other && meets_temp_requirement && can_special_react)
possible_reactions += C
- sortTim(possible_reactions, /proc/cmp_chemical_reactions_default, FALSE)
+ sortTim(possible_reactions, GLOBAL_PROC_REF(cmp_chemical_reactions_default), FALSE)
if(possible_reactions.len)
var/datum/chemical_reaction/selected_reaction = possible_reactions[1]
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index b3471fc123..6c067d51bf 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -94,18 +94,18 @@
/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(upgrade_reagents2)
- upgrade_reagents2 = sort_list(upgrade_reagents2, /proc/cmp_reagents_asc)
+ upgrade_reagents2 = sort_list(upgrade_reagents2, GLOBAL_PROC_REF(cmp_reagents_asc))
if(upgrade_reagents3)
- upgrade_reagents3 = sort_list(upgrade_reagents3, /proc/cmp_reagents_asc)
+ upgrade_reagents3 = sort_list(upgrade_reagents3, GLOBAL_PROC_REF(cmp_reagents_asc))
if(upgrade_reagents4)
- upgrade_reagents4 = sort_list(upgrade_reagents4, /proc/cmp_reagents_asc)
- dispensable_reagents = sort_list(dispensable_reagents, /proc/cmp_reagents_asc)
+ upgrade_reagents4 = sort_list(upgrade_reagents4, GLOBAL_PROC_REF(cmp_reagents_asc))
+ dispensable_reagents = sort_list(dispensable_reagents, GLOBAL_PROC_REF(cmp_reagents_asc))
create_reagents(200, NO_REACT)
update_icon()
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 9fd2313484..39f198fc79 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -221,7 +221,7 @@
update_icon()
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)
@@ -233,7 +233,7 @@
B.reagents.add_reagent(/datum/reagent/vaccine, 15, list(id))
wait = TRUE
update_icon()
- 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 b3c4cc8908..f50f5604bc 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -234,7 +234,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)
@@ -248,7 +248,7 @@
playsound(src, 'sound/machines/blender.ogg', 50, 1)
else
playsound(src, 'sound/machines/juicer.ogg', 20, 1)
- 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/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
index e601e9f551..f99d07e70b 100644
--- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm
+++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
@@ -38,7 +38,7 @@
/obj/machinery/smoke_machine/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
+ AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, PROC_REF(can_be_rotated)))
/obj/machinery/smoke_machine/proc/can_be_rotated(mob/user, rotation_type)
return !anchored
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index e9c01dca56..0c65a13d82 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2588,7 +2588,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/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 500445042e..f3ddf4c7d1 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -346,7 +346,7 @@
victim.damageoverlaytemp = 60
victim.DefaultCombatKnockdown(80, override_hardstun = 0.1, override_stamdmg = min(reac_volume * 3, 15))
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)
return
else if ( eyes_covered ) // Eye cover is better than mouth cover
victim.blur_eyes(3)
@@ -361,7 +361,7 @@
victim.damageoverlaytemp = 75
victim.DefaultCombatKnockdown(80, override_hardstun = 0.1, override_stamdmg = min(reac_volume * 5, 25))
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()
/datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/M)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 44500ade1f..9aaca286dd 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -1012,8 +1012,8 @@
M.visible_message("[M]'s body starts convulsing!")
M.notify_ghost_cloning(source = M)
M.do_jitter_animation(10)
- addtimer(CALLBACK(M, /mob/living/carbon.proc/do_jitter_animation, 10), 40) //jitter immediately, then again after 4 and 8 seconds
- addtimer(CALLBACK(M, /mob/living/carbon.proc/do_jitter_animation, 10), 80)
+ addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 40) //jitter immediately, then again after 4 and 8 seconds
+ addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 80)
spawn(100) //so the ghost has time to re-enter
if(iscarbon(M))
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 3e1701be2a..96116b2419 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -677,7 +677,7 @@
to_chat(H, "You crumple in agony as your flesh wildly morphs into new forms!")
H.visible_message("[H] falls to the ground and screams as [H.p_their()] skin bubbles and froths!") //'froths' sounds painful when used with SKIN.
H.DefaultCombatKnockdown(60)
- addtimer(CALLBACK(src, .proc/mutate, H), 30)
+ addtimer(CALLBACK(src, PROC_REF(mutate), H), 30)
return
/datum/reagent/mutationtoxin/proc/mutate(mob/living/carbon/human/H)
@@ -2494,7 +2494,7 @@
/datum/reagent/gravitum/reaction_obj(obj/O, volume)
O.AddElement(/datum/element/forced_gravity, 0)
- addtimer(CALLBACK(O, .proc/_RemoveElement, /datum/element/forced_gravity, 0), volume * time_multiplier)
+ addtimer(CALLBACK(O, PROC_REF(_RemoveElement), /datum/element/forced_gravity, 0), volume * time_multiplier)
/datum/reagent/gravitum/on_mob_add(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/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 2301473c48..76bd16c657 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -434,13 +434,13 @@
var/T3 = multiplier * 120
var/added_delay = 0.5 SECONDS
if(multiplier >= 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(multiplier >= 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(multiplier >= 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_REF(zappy_zappy), holder, T3), added_delay)
..()
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 03b0e1b715..45d0df5580 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -123,11 +123,11 @@
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("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
name = "Slime Crit Lesser"
@@ -136,7 +136,7 @@
/datum/chemical_reaction/slime/slimemobspawn/lesser/summon_mobs(datum/reagents/holder, turf/T)
T.visible_message("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
name = "Slime Crit Friendly"
@@ -145,7 +145,7 @@
/datum/chemical_reaction/slime/slimemobspawn/friendly/summon_mobs(datum/reagents/holder, turf/T)
T.visible_message("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)
//Silver
/datum/chemical_reaction/slime/slimebork
@@ -225,11 +225,11 @@
/datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("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 && holder.my_atom)
@@ -268,11 +268,11 @@
/datum/chemical_reaction/slime/slimefire/on_reaction(datum/reagents/holder)
var/turf/T = get_turf(holder.my_atom)
T.visible_message("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 && holder.my_atom)
@@ -449,11 +449,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("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 && holder.my_atom)
@@ -572,7 +572,7 @@
required_other = TRUE
/datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder)
- 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
@@ -647,7 +647,7 @@
S.visible_message("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/prime), rand(15,60))
+ addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60))
qdel(holder.my_atom) //deleto
else
var/mob/living/simple_animal/slime/random/S = new (get_turf(holder.my_atom))
@@ -666,7 +666,7 @@
S.visible_message("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/prime), rand(15,60))
+ addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, prime)), rand(15,60))
qdel(holder.my_atom) //deleto
..()
diff --git a/code/modules/reagents/chemistry/recipes/special.dm b/code/modules/reagents/chemistry/recipes/special.dm
index 58dd37133a..4d5ebfcea1 100644
--- a/code/modules/reagents/chemistry/recipes/special.dm
+++ b/code/modules/reagents/chemistry/recipes/special.dm
@@ -182,7 +182,7 @@ GLOBAL_LIST_INIT(food_reagents, build_reagents_to_food()) //reagentid = related
if(SSpersistence.initialized)
UpdateInfo()
else
- SSticker.OnRoundstart(CALLBACK(src,.proc/UpdateInfo))
+ SSticker.OnRoundstart(CALLBACK(src,PROC_REF(UpdateInfo)))
/obj/item/paper/secretrecipe/proc/UpdateInfo()
var/datum/chemical_reaction/recipe = get_chemical_reaction(recipe_id)
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index df794f4842..bd2320c918 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -141,7 +141,7 @@
else if(bartender_check(target) && thrown)
visible_message("[src] lands without spilling a single drop.")
transform = initial(transform)
- addtimer(CALLBACK(src, .proc/ForceResetRotation), 1)
+ addtimer(CALLBACK(src, PROC_REF(ForceResetRotation)), 1)
else
if(isturf(target) && reagents.reagent_list.len && thrown_by)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 61c558142e..a1bc8332f9 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -132,7 +132,7 @@
reagents.maximum_volume = 0 //Makes them useless afterwards
reagent_flags = NONE
update_icon()
- addtimer(CALLBACK(src, .proc/cyborg_recharge, user), 80)
+ addtimer(CALLBACK(src, PROC_REF(cyborg_recharge), user), 80)
/obj/item/reagent_containers/hypospray/medipen/proc/cyborg_recharge(mob/living/silicon/robot/user)
if(!reagents.total_volume && iscyborg(user))
@@ -485,7 +485,7 @@
/obj/item/hypospray/mkii/afterattack(atom/target, mob/user, proximity)
. = ..()
- INVOKE_ASYNC(src, .proc/attempt_inject, target, user, proximity)
+ INVOKE_ASYNC(src, PROC_REF(attempt_inject), target, user, proximity)
/obj/item/hypospray/mkii/proc/attempt_inject(atom/target, mob/user, proximity)
if(!vial || !proximity || !isliving(target))
diff --git a/code/modules/reagents/reagent_containers/medspray.dm b/code/modules/reagents/reagent_containers/medspray.dm
index 8d30f25db2..e1520260ef 100644
--- a/code/modules/reagents/reagent_containers/medspray.dm
+++ b/code/modules/reagents/reagent_containers/medspray.dm
@@ -32,7 +32,7 @@
to_chat(user, "You will now apply the medspray's contents in [squirt_mode ? "short bursts":"extended sprays"]. You'll now use [amount_per_transfer_from_this] units per use.")
/obj/item/reagent_containers/medspray/attack(mob/living/L, mob/user, def_zone)
- INVOKE_ASYNC(src, .proc/attempt_spray, L, user, def_zone) // this is shitcode because the params for attack aren't even right but i'm not in the mood to refactor right now.
+ INVOKE_ASYNC(src, PROC_REF(attempt_spray), L, user, def_zone) // this is shitcode because the params for attack aren't even right but i'm not in the mood to refactor right now.
/obj/item/reagent_containers/medspray/proc/attempt_spray(mob/living/L, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 02f77af17e..a0e6da3a96 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -29,7 +29,7 @@
return DEFAULT_VOLUME_TINY/2 + reagents.total_volume / reagents.maximum_volume * DEFAULT_VOLUME_TINY
/obj/item/reagent_containers/pill/attack(mob/living/M, mob/living/user, attackchain_flags = NONE, damage_multiplier = 1)
- INVOKE_ASYNC(src, .proc/attempt_feed, M, user)
+ INVOKE_ASYNC(src, PROC_REF(attempt_feed), M, user)
/obj/item/reagent_containers/pill/proc/attempt_feed(mob/living/M, mob/living/user)
if(!canconsume(M, user))
@@ -51,7 +51,7 @@
var/makes_me_think = pick(strings("redpill.json", "redpill_questions"))
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, "[makes_me_think]"), 50)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), M, "[makes_me_think]"), 50)
log_combat(user, M, "fed", reagents.log_list())
if(reagents.total_volume)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index c1812d9121..d53af5cec5 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -58,7 +58,7 @@
/obj/item/reagent_containers/syringe/afterattack(atom/target, mob/user, proximity)
. = ..()
- INVOKE_ASYNC(src, .proc/attempt_inject, target, user, proximity)
+ INVOKE_ASYNC(src, PROC_REF(attempt_inject), target, user, proximity)
/obj/item/reagent_containers/syringe/proc/attempt_inject(atom/target, mob/user, proximity)
if(busy)
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index b3ad29e637..3f45c6cce9 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -132,7 +132,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
return
use_power(6)
affecting = loc.contents - src // moved items will be all in loc
- addtimer(CALLBACK(src, .proc/convey, affecting), 1)
+ addtimer(CALLBACK(src, PROC_REF(convey), affecting), 1)
/obj/machinery/conveyor/proc/convey(list/affecting)
var/turf/T = get_step(src, movedir)
diff --git a/code/modules/recycling/conveyor_sorter.dm b/code/modules/recycling/conveyor_sorter.dm
index 0e42c79067..b4d74574ad 100644
--- a/code/modules/recycling/conveyor_sorter.dm
+++ b/code/modules/recycling/conveyor_sorter.dm
@@ -75,7 +75,7 @@
/obj/effect/decal/cleanable/conveyor_sorter/Initialize(mapload, list/datum/disease/diseases)
. = ..()
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/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm
index c6d015df34..ade0a37e8a 100644
--- a/code/modules/recycling/disposal/construction.dm
+++ b/code/modules/recycling/disposal/construction.dm
@@ -91,7 +91,7 @@
/obj/structure/disposalconstruct/ComponentInitialize()
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS ,null,CALLBACK(src, .proc/can_be_rotated), CALLBACK(src, .proc/after_rot))
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS ,null,CALLBACK(src, PROC_REF(can_be_rotated)), CALLBACK(src, PROC_REF(after_rot)))
/obj/structure/disposalconstruct/proc/after_rot(mob/user,rotation_type)
if(rotation_type == ROTATION_FLIP)
diff --git a/code/modules/recycling/disposal/outlet.dm b/code/modules/recycling/disposal/outlet.dm
index 7655988c8f..6e0894db50 100644
--- a/code/modules/recycling/disposal/outlet.dm
+++ b/code/modules/recycling/disposal/outlet.dm
@@ -44,9 +44,9 @@
if((start_eject + 30) < world.time)
start_eject = world.time
playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 0, 0)
- 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/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm
index 9c7ca5b999..9903da5e91 100644
--- a/code/modules/research/destructive_analyzer.dm
+++ b/code/modules/research/destructive_analyzer.dm
@@ -43,7 +43,7 @@ Note: Must be placed within 3 tiles of the R&D Console
loaded_item = O
to_chat(user, "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)
if (linked_console)
linked_console.updateUsrDialog()
@@ -74,7 +74,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 f23841a02f..c6085c145b 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -498,7 +498,7 @@
use_power(500000)
investigate_log("Experimentor has drained power from its APC", INVESTIGATE_EXPERIMENTOR)
- addtimer(CALLBACK(src, .proc/reset_exp), resetTime)
+ addtimer(CALLBACK(src, PROC_REF(reset_exp)), resetTime)
/obj/machinery/rnd/experimentor/proc/reset_exp()
update_icon()
@@ -564,7 +564,7 @@
cooldown = TRUE
call(src,realProc)(user)
if(!QDELETED(src))
- addtimer(CALLBACK(src, .proc/cd), cooldownMax)
+ addtimer(CALLBACK(src, PROC_REF(cd)), cooldownMax)
else
to_chat(user, "You aren't quite sure what to do with this yet.")
@@ -581,7 +581,7 @@
/obj/item/relic/proc/corgicannon(mob/user)
playsound(src, "sparks", rand(25,50), 1)
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)
@@ -631,7 +631,7 @@
/obj/item/relic/proc/explode(mob/user)
to_chat(user, "[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)
@@ -642,7 +642,7 @@
/obj/item/relic/proc/teleport(mob/user)
to_chat(user, "[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 30d0c70566..6fee01b38a 100644
--- a/code/modules/research/machinery/_production.dm
+++ b/code/modules/research/machinery/_production.dm
@@ -30,7 +30,7 @@
stored_research = new
host_research = SSresearch.science_tech
update_research()
- materials = AddComponent(/datum/component/remote_materials, "lathe", mapload, _after_insert=CALLBACK(src, .proc/AfterMaterialInsert))
+ materials = AddComponent(/datum/component/remote_materials, "lathe", mapload, _after_insert=CALLBACK(src, PROC_REF(AfterMaterialInsert)))
RefreshParts()
/obj/machinery/rnd/production/Destroy()
@@ -175,8 +175,8 @@
if(production_animation)
flick(production_animation, src)
var/timecoeff = D.lathe_time_factor * print_cost_coeff
- addtimer(CALLBACK(src, .proc/reset_busy), (20 * timecoeff * amount) ** 0.5)
- addtimer(CALLBACK(src, .proc/do_print, D.build_path, amount, efficient_mats, D.dangerous_construction, usr), (20 * timecoeff * amount) ** 0.5)
+ addtimer(CALLBACK(src, PROC_REF(reset_busy)), (20 * timecoeff * amount) ** 0.5)
+ addtimer(CALLBACK(src, PROC_REF(do_print), D.build_path, amount, efficient_mats, D.dangerous_construction, usr), (20 * timecoeff * amount) ** 0.5)
return TRUE
/obj/machinery/rnd/production/proc/search(string)
diff --git a/code/modules/research/nanites/nanite_chamber.dm b/code/modules/research/nanites/nanite_chamber.dm
index fe776e86c5..21879973e7 100644
--- a/code/modules/research/nanites/nanite_chamber.dm
+++ b/code/modules/research/nanites/nanite_chamber.dm
@@ -63,11 +63,11 @@
//TODO OMINOUS MACHINE SOUNDS
set_busy(TRUE, "Initializing injection protocol...", "[initial(icon_state)]_raising")
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "Analyzing host bio-structure...", "[initial(icon_state)]_active"),20)
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "Priming nanites...", "[initial(icon_state)]_active"),40)
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "Injecting...", "[initial(icon_state)]_active"),70)
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "Activating nanites...", "[initial(icon_state)]_falling"),110)
- addtimer(CALLBACK(src, .proc/complete_injection, locked_state),130)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "Analyzing host bio-structure...", "[initial(icon_state)]_active"),20)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "Priming nanites...", "[initial(icon_state)]_active"),40)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "Injecting...", "[initial(icon_state)]_active"),70)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "Activating nanites...", "[initial(icon_state)]_falling"),110)
+ addtimer(CALLBACK(src, PROC_REF(complete_injection), locked_state),130)
/obj/machinery/nanite_chamber/proc/complete_injection(locked_state)
//TODO MACHINE DING
@@ -90,11 +90,11 @@
//TODO OMINOUS MACHINE SOUNDS
set_busy(TRUE, "Initializing cleanup protocol...", "[initial(icon_state)]_raising")
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "Analyzing host bio-structure...", "[initial(icon_state)]_active"),20)
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "Pinging nanites...", "[initial(icon_state)]_active"),40)
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "Initiating graceful self-destruct sequence...", "[initial(icon_state)]_active"),70)
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "Removing debris...", "[initial(icon_state)]_falling"),110)
- addtimer(CALLBACK(src, .proc/complete_removal, locked_state),130)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "Analyzing host bio-structure...", "[initial(icon_state)]_active"),20)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "Pinging nanites...", "[initial(icon_state)]_active"),40)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "Initiating graceful self-destruct sequence...", "[initial(icon_state)]_active"),70)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "Removing debris...", "[initial(icon_state)]_falling"),110)
+ addtimer(CALLBACK(src, PROC_REF(complete_removal), locked_state),130)
/obj/machinery/nanite_chamber/proc/complete_removal(locked_state)
//TODO MACHINE DING
diff --git a/code/modules/research/nanites/nanite_programs/healing.dm b/code/modules/research/nanites/nanite_programs/healing.dm
index 4603b04b1d..83e7318743 100644
--- a/code/modules/research/nanites/nanite_programs/healing.dm
+++ b/code/modules/research/nanites/nanite_programs/healing.dm
@@ -226,7 +226,7 @@
/datum/nanite_program/defib/on_trigger(comm_message)
host_mob.notify_ghost_cloning("Your heart is being defibrillated by nanites. Re-enter your corpse if you want to be revived!")
- addtimer(CALLBACK(src, .proc/zap), 50)
+ addtimer(CALLBACK(src, PROC_REF(zap)), 50)
/datum/nanite_program/defib/proc/check_revivable()
if(!iscarbon(host_mob)) //nonstandard biology
diff --git a/code/modules/research/nanites/nanite_programs/sensor.dm b/code/modules/research/nanites/nanite_programs/sensor.dm
index 259b8ed842..4c3f978fb2 100644
--- a/code/modules/research/nanites/nanite_programs/sensor.dm
+++ b/code/modules/research/nanites/nanite_programs/sensor.dm
@@ -36,7 +36,7 @@
/datum/nanite_program/sensor/repeat/on_trigger(comm_message)
var/datum/nanite_extra_setting/ES = extra_settings[NES_DELAY]
- addtimer(CALLBACK(src, .proc/send_code), ES.get_value() * 10)
+ addtimer(CALLBACK(src, PROC_REF(send_code)), ES.get_value() * 10)
/datum/nanite_program/sensor/relay_repeat
name = "Relay Signal Repeater"
@@ -53,7 +53,7 @@
/datum/nanite_program/sensor/relay_repeat/on_trigger(comm_message)
var/datum/nanite_extra_setting/ES = extra_settings[NES_DELAY]
- addtimer(CALLBACK(src, .proc/send_code), ES.get_value() * 10)
+ addtimer(CALLBACK(src, PROC_REF(send_code)), ES.get_value() * 10)
/datum/nanite_program/sensor/relay_repeat/send_code()
var/datum/nanite_extra_setting/relay = extra_settings[NES_RELAY_CHANNEL]
@@ -246,7 +246,7 @@
/datum/nanite_program/sensor/voice/on_mob_add()
. = ..()
- RegisterSignal(host_mob, COMSIG_MOVABLE_HEAR, .proc/on_hear)
+ RegisterSignal(host_mob, COMSIG_MOVABLE_HEAR, PROC_REF(on_hear))
/datum/nanite_program/sensor/voice/on_mob_remove()
UnregisterSignal(host_mob, COMSIG_MOVABLE_HEAR)
diff --git a/code/modules/research/nanites/nanite_programs/suppression.dm b/code/modules/research/nanites/nanite_programs/suppression.dm
index 4e893d2a43..14b415e1ce 100644
--- a/code/modules/research/nanites/nanite_programs/suppression.dm
+++ b/code/modules/research/nanites/nanite_programs/suppression.dm
@@ -11,7 +11,7 @@
/datum/nanite_program/sleepy/on_trigger(comm_message)
to_chat(host_mob, "You start to feel very sleepy...")
host_mob.drowsyness += 20
- addtimer(CALLBACK(host_mob, /mob/living.proc/Sleeping, 200), rand(60,200))
+ addtimer(CALLBACK(host_mob, TYPE_PROC_REF(/mob/living, Sleeping), 200), rand(60,200))
/datum/nanite_program/paralyzing
name = "Paralysis"
diff --git a/code/modules/research/nanites/nanite_programs/utility.dm b/code/modules/research/nanites/nanite_programs/utility.dm
index feb726ded4..5dc258fad4 100644
--- a/code/modules/research/nanites/nanite_programs/utility.dm
+++ b/code/modules/research/nanites/nanite_programs/utility.dm
@@ -364,11 +364,11 @@
/datum/nanite_program/lockout/enable_passive_effect()
. = ..()
if(lock_console)
- RegisterSignal(src, COMSIG_NANITE_INTERNAL_CONSOLE_LOCK_CHECK, .proc/check_antivirus)
+ RegisterSignal(src, COMSIG_NANITE_INTERNAL_CONSOLE_LOCK_CHECK, PROC_REF(check_antivirus))
if(lock_host)
- RegisterSignal(src, COMSIG_NANITE_INTERNAL_HOST_LOCK_CHECK, .proc/check_antivirus)
+ RegisterSignal(src, COMSIG_NANITE_INTERNAL_HOST_LOCK_CHECK, PROC_REF(check_antivirus))
if(lock_virus)
- RegisterSignal(src, COMSIG_NANITE_INTERNAL_VIRAL_PREVENTION_CHECK, .proc/check_antivirus)
+ RegisterSignal(src, COMSIG_NANITE_INTERNAL_VIRAL_PREVENTION_CHECK, PROC_REF(check_antivirus))
/datum/nanite_program/lockout/disable_passive_effect()
. = ..()
diff --git a/code/modules/research/nanites/nanite_programs/weapon.dm b/code/modules/research/nanites/nanite_programs/weapon.dm
index 66f6c140f2..825a52f9e0 100644
--- a/code/modules/research/nanites/nanite_programs/weapon.dm
+++ b/code/modules/research/nanites/nanite_programs/weapon.dm
@@ -84,7 +84,7 @@
/datum/nanite_program/explosive/on_trigger(comm_message)
host_mob.visible_message("[host_mob] starts emitting a high-pitched buzzing, and [host_mob.p_their()] skin begins to glow...",\
"You start emitting a high-pitched buzzing, and your skin begins to glow...")
- addtimer(CALLBACK(src, .proc/boom), clamp((nanites.nanite_volume * 0.35), 25, 150))
+ addtimer(CALLBACK(src, PROC_REF(boom)), clamp((nanites.nanite_volume * 0.35), 25, 150))
/datum/nanite_program/explosive/proc/boom()
var/nanite_amount = nanites.nanite_volume
@@ -178,7 +178,7 @@
sent_directive = ES.get_value()
brainwash(host_mob, sent_directive)
log_game("A mind control nanite program brainwashed [key_name(host_mob)] with the objective '[sent_directive]'.")
- addtimer(CALLBACK(src, .proc/end_brainwashing), 600)
+ addtimer(CALLBACK(src, PROC_REF(end_brainwashing)), 600)
/datum/nanite_program/comm/mind_control/proc/end_brainwashing()
if(host_mob.mind && host_mob.mind.has_antag_datum(/datum/antagonist/brainwashed))
diff --git a/code/modules/research/nanites/public_chamber.dm b/code/modules/research/nanites/public_chamber.dm
index c6c53779a9..9d3f663949 100644
--- a/code/modules/research/nanites/public_chamber.dm
+++ b/code/modules/research/nanites/public_chamber.dm
@@ -45,9 +45,9 @@
//TODO OMINOUS MACHINE SOUNDS
set_busy(TRUE, "[initial(icon_state)]_raising")
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_active"),20)
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_falling"),60)
- addtimer(CALLBACK(src, .proc/complete_injection, locked_state, attacker),80)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_active"),20)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_falling"),60)
+ addtimer(CALLBACK(src, PROC_REF(complete_injection), locked_state, attacker),80)
/obj/machinery/public_nanite_chamber/proc/complete_injection(locked_state, mob/living/attacker)
//TODO MACHINE DING
@@ -72,9 +72,9 @@
locked = TRUE
set_busy(TRUE, "[initial(icon_state)]_raising")
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_active"),20)
- addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_falling"),40)
- addtimer(CALLBACK(src, .proc/complete_cloud_change, locked_state, attacker),60)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_active"),20)
+ addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_falling"),40)
+ addtimer(CALLBACK(src, PROC_REF(complete_cloud_change), locked_state, attacker),60)
/obj/machinery/public_nanite_chamber/proc/complete_cloud_change(locked_state, mob/living/attacker)
locked = locked_state
@@ -149,7 +149,7 @@
. = TRUE
- addtimer(CALLBACK(src, .proc/try_inject_nanites, attacker), 30) //If someone is shoved in give them a chance to get out before the injection starts
+ addtimer(CALLBACK(src, PROC_REF(try_inject_nanites), attacker), 30) //If someone is shoved in give them a chance to get out before the injection starts
/obj/machinery/public_nanite_chamber/proc/try_inject_nanites(mob/living/attacker)
if(occupant)
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 1794fd852b..92f3b760f5 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -44,7 +44,7 @@
if(. & EMP_PROTECT_SELF)
return
stat |= EMPED
- addtimer(CALLBACK(src, .proc/unemp), severity*9)
+ addtimer(CALLBACK(src, PROC_REF(unemp)), severity*9)
refresh_working()
/obj/machinery/rnd/server/proc/unemp()
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 429f556989..5d46329462 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -68,7 +68,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, "You feel a sudden tug from an unknown force, and feel a pull to bluespace!")
to_chat(owner, "Resist if you wish avoid the force!")
bluespace = icon('icons/effects/effects.dmi',"chronofield")
@@ -102,7 +102,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 3d159cddde..cc2df99785 100644
--- a/code/modules/research/xenobiology/crossbreeding/burning.dm
+++ b/code/modules/research/xenobiology/crossbreeding/burning.dm
@@ -242,7 +242,7 @@ Burning extracts:
/obj/item/slimecross/burning/oil/do_effect(mob/user)
user.visible_message("[src] begins to shake with rapidly increasing force!")
- addtimer(CALLBACK(src, .proc/boom), 50)
+ addtimer(CALLBACK(src, PROC_REF(boom)), 50)
/obj/item/slimecross/burning/oil/proc/boom()
explosion(get_turf(src), 2, 4, 4) //Same area as normal oils, but increased high-impact values by one each, then decreased light by 2.
diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm
index a51adfffe6..a6298f502c 100644
--- a/code/modules/research/xenobiology/crossbreeding/charged.dm
+++ b/code/modules/research/xenobiology/crossbreeding/charged.dm
@@ -178,7 +178,7 @@ Charged extracts:
/obj/item/slimecross/charged/gold/do_effect(mob/user)
user.visible_message("[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)
@@ -202,7 +202,7 @@ Charged extracts:
/obj/item/slimecross/charged/oil/do_effect(mob/user)
user.visible_message("[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(get_turf(src), 3, 2, 1) //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 7c129b8179..accf424df8 100644
--- a/code/modules/research/xenobiology/crossbreeding/chilling.dm
+++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm
@@ -264,7 +264,7 @@ Chilling extracts:
/obj/item/slimecross/chilling/oil/do_effect(mob/user)
user.visible_message("[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(get_turf(src), -1, -1, 10, 0) //Large radius, but mostly light damage, and no flash.
diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm
index 1d4c027125..424827a5e3 100644
--- a/code/modules/research/xenobiology/xenobio_camera.dm
+++ b/code/modules/research/xenobiology/xenobio_camera.dm
@@ -119,12 +119,12 @@
hotkey_help.Grant(user)
actions += hotkey_help
- RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, .proc/XenoSlimeClickCtrl)
- 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_TURF_CLICK_CTRL, .proc/XenoTurfClickCtrl)
- RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, .proc/XenoMonkeyClickCtrl)
+ RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, PROC_REF(XenoSlimeClickCtrl))
+ 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))
+ RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, PROC_REF(XenoTurfClickCtrl))
+ RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, PROC_REF(XenoMonkeyClickCtrl))
/obj/machinery/computer/camera_advanced/xenobio/remove_eye_control(mob/living/user)
UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL)
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 24a841a14f..96c627af79 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -252,7 +252,7 @@
to_chat(user, "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, "You start glowing brighter.")
if(SLIME_ACTIVATE_MAJOR)
@@ -458,7 +458,7 @@
return
to_chat(user, "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/hotsprings.dm b/code/modules/ruins/icemoonruin_code/hotsprings.dm
index 8cbd1b1f37..6eb3475184 100644
--- a/code/modules/ruins/icemoonruin_code/hotsprings.dm
+++ b/code/modules/ruins/icemoonruin_code/hotsprings.dm
@@ -23,7 +23,7 @@ GLOBAL_LIST_EMPTY(cursed_minds)
if(GLOB.cursed_minds[L.mind])
return
GLOB.cursed_minds[L.mind] = TRUE
- RegisterSignal(L.mind, COMSIG_PARENT_QDELETING, .proc/remove_from_cursed)
+ RegisterSignal(L.mind, COMSIG_PARENT_QDELETING, PROC_REF(remove_from_cursed))
L = wabbajack(L, "animal") // Appearance randomization removed so citadel players don't get randomized into some ungodly ugly creature and complain
var/turf/T = find_safe_turf()
L.forceMove(T)
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 d961b4b2bd..d074168b01 100644
--- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
+++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
@@ -62,7 +62,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 94abd1ef0a..2e2a9a0312 100644
--- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
@@ -311,7 +311,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 1de929fd22..613ef49840 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -24,7 +24,7 @@
know it'll be worth it.")
icon_state = "slots2"
playsound(src, 'sound/lavaland/cursed_slot_machine.ogg', 50, 0)
- 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_state = "slots1"
@@ -50,7 +50,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 111b72a6f0..bd81e28cf0 100644
--- a/code/modules/ruins/spaceruin_code/hilbertshotel.dm
+++ b/code/modules/ruins/spaceruin_code/hilbertshotel.dm
@@ -31,7 +31,7 @@ GLOBAL_VAR_INIT(hhmysteryRoomNumber, 1337)
/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()
diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm
index df66fac839..8dc3a6c0d7 100644
--- a/code/modules/security_levels/keycard_authentication.dm
+++ b/code/modules/security_levels/keycard_authentication.dm
@@ -28,7 +28,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
/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)
@@ -93,7 +93,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
event = event_type
waiting = 1
GLOB.keycard_events.fireEvent("triggerEvent", src, trigger_id)
- addtimer(CALLBACK(src, .proc/eventSent), 20)
+ addtimer(CALLBACK(src, PROC_REF(eventSent)), 20)
/obj/machinery/keycard_auth/proc/eventSent()
triggerer = null
@@ -104,7 +104,7 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new)
icon_state = "auth_on"
first_id = trigger_id
event_source = source
- addtimer(CALLBACK(src, .proc/eventTriggered), 20)
+ addtimer(CALLBACK(src, PROC_REF(eventTriggered)), 20)
/obj/machinery/keycard_auth/proc/eventTriggered()
icon_state = "auth_off"
diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm
index e0ca10db8a..29797ea16a 100644
--- a/code/modules/shuttle/arrivals.dm
+++ b/code/modules/shuttle/arrivals.dm
@@ -197,7 +197,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 9c7dd57973..d51007ab3d 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -540,7 +540,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 f061919b5c..50173cf5c3 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -182,7 +182,7 @@ All ShuttleMove procs go here
for(var/obj/machinery/door/airlock/A in range(1, src)) // includes src
A.shuttledocked = FALSE
A.air_tight = TRUE
- addtimer(CALLBACK(A, /obj/machinery/door/.proc/close), 0)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/door, close)), 0)
/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 4bf6eac0eb..824c1843ba 100644
--- a/code/modules/shuttle/ripple.dm
+++ b/code/modules/shuttle/ripple.dm
@@ -14,7 +14,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 5e034c0b52..78bbadd76c 100644
--- a/code/modules/shuttle/special.dm
+++ b/code/modules/shuttle/special.dm
@@ -94,7 +94,7 @@
L.visible_message("A strange purple glow wraps itself around [L] as [L.p_they()] suddenly fall[L.p_s()] unconscious.",
"[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)
diff --git a/code/modules/smithing/anvil.dm b/code/modules/smithing/anvil.dm
index 84aa252605..2ddb57a0de 100644
--- a/code/modules/smithing/anvil.dm
+++ b/code/modules/smithing/anvil.dm
@@ -166,7 +166,7 @@
user.visible_message("[user] works the metal on the anvil with their hammer with a loud clang!", \
"You [stepdone] the metal with a loud clang!")
playsound(src, 'sound/effects/clang2.ogg',40, 2)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/effects/clang2.ogg', 40, 2), 15)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(playsound), src, 'sound/effects/clang2.ogg', 40, 2), 15)
if(length(stepsdone) >= 3)
tryfinish(user)
busy = FALSE
diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm
index aa2a2e4083..82d858cfb1 100644
--- a/code/modules/spells/spell_types/aimed.dm
+++ b/code/modules/spells/spell_types/aimed.dm
@@ -147,7 +147,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, typecacheof(list(/mob/living)), 1, null, CALLBACK(src, .proc/on_lockon_component))
+ lockon_component = M.AddComponent(/datum/component/lockon_aiming, 5, typecacheof(list(/mob/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 50d5ee0ad6..eac5770f0c 100644
--- a/code/modules/spells/spell_types/area_teleport.dm
+++ b/code/modules/spells/spell_types/area_teleport.dm
@@ -15,7 +15,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 63bae4b7cf..cafa954daa 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 7a22d1498a..962330dd26 100644
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ b/code/modules/spells/spell_types/construct_spells.dm
@@ -213,7 +213,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)
target.adjust_bodytemperature(-200)
/obj/effect/proc_holder/spell/targeted/abyssal_gaze/proc/cure_blindness(mob/target)
diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm
index 3b76107905..8dd57df043 100644
--- a/code/modules/spells/spell_types/devil.dm
+++ b/code/modules/spells/spell_types/devil.dm
@@ -161,7 +161,7 @@
client.eye = src
visible_message("[src] appears in a fiery blaze!")
playsound(get_turf(src), 'sound/magic/exit_blood.ogg', 100, 1, -1)
- addtimer(CALLBACK(src, .proc/fakefireextinguish), 15, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(fakefireextinguish)), 15, TIMER_UNIQUE)
/obj/effect/proc_holder/spell/targeted/sintouch
name = "Sin Touch"
diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm
index 1bc3a054b7..4b02f9fbcd 100644
--- a/code/modules/spells/spell_types/ethereal_jaunt.dm
+++ b/code/modules/spells/spell_types/ethereal_jaunt.dm
@@ -19,7 +19,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.mob_transforming = 1
diff --git a/code/modules/spells/spell_types/genetic.dm b/code/modules/spells/spell_types/genetic.dm
index 8a71ac617e..98c641db53 100644
--- a/code/modules/spells/spell_types/genetic.dm
+++ b/code/modules/spells/spell_types/genetic.dm
@@ -28,7 +28,7 @@
for(var/A in traits)
ADD_TRAIT(target, A, GENETICS_SPELL)
active_on += target
- addtimer(CALLBACK(src, .proc/remove, target), duration)
+ addtimer(CALLBACK(src, PROC_REF(remove), target), duration)
/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 9cbaa5baa3..e9b1bebe5f 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(var/obj/machinery/door/door)
if(istype(door, /obj/machinery/door/airlock))
diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm
index c790902556..8e4f36e25f 100644
--- a/code/modules/spells/spell_types/lichdom.dm
+++ b/code/modules/spells/spell_types/lichdom.dm
@@ -96,7 +96,7 @@
active_phylacteries++
GLOB.poi_list |= src
START_PROCESSING(SSobj, src)
- RegisterSignal(SSactivity, COMSIG_THREAT_CALC, .proc/get_threat)
+ RegisterSignal(SSactivity, COMSIG_THREAT_CALC, PROC_REF(get_threat))
set_light(lon_range)
if(initial(SSticker.mode.round_ends_with_antag_death))
SSticker.mode.round_ends_with_antag_death = FALSE
@@ -116,7 +116,7 @@
return
if(!mind.current || (mind.current && mind.current.stat == DEAD))
- addtimer(CALLBACK(src, .proc/rise), respawn_time, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(rise)), respawn_time, TIMER_UNIQUE)
/obj/item/phylactery/proc/get_threat(list/threat_list)
if(mind?.current?.stat == DEAD)
diff --git a/code/modules/spells/spell_types/spacetime_distortion.dm b/code/modules/spells/spell_types/spacetime_distortion.dm
index 5a8776b16b..49854c01b5 100644
--- a/code/modules/spells/spell_types/spacetime_distortion.dm
+++ b/code/modules/spells/spell_types/spacetime_distortion.dm
@@ -36,7 +36,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()
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 215bd2370d..f133961248 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -36,7 +36,7 @@
items_list += I
// ayy only dropped signal for performance, we can't possibly have shitcode that doesn't call it when removing items from a mob, right?
// .. right??!
- RegisterSignal(I, COMSIG_ITEM_DROPPED, .proc/magnetic_catch)
+ RegisterSignal(I, COMSIG_ITEM_DROPPED, PROC_REF(magnetic_catch))
/obj/item/organ/cyberimp/arm/proc/magnetic_catch(datum/source, mob/user)
. = COMPONENT_DROPPED_RELOCATION
@@ -289,7 +289,7 @@
/obj/item/organ/cyberimp/arm/shield/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE)
. = ..()
if(.)
- RegisterSignal(M, COMSIG_LIVING_ACTIVE_BLOCK_START, .proc/on_signal)
+ RegisterSignal(M, COMSIG_LIVING_ACTIVE_BLOCK_START, PROC_REF(on_signal))
/obj/item/organ/cyberimp/arm/shield/Remove(special = FALSE)
UnregisterSignal(owner, COMSIG_LIVING_ACTIVE_BLOCK_START)
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index 420810d7d2..3e143ab923 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -28,7 +28,7 @@
synthesizing = TRUE
to_chat(owner, "You feel less hungry...")
owner.adjust_nutrition(50)
- 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
@@ -73,7 +73,7 @@
else if(!do_heal)
convalescence_time = world.time + DEF_CONVALESCENCE_TIME
if(. && (do_heal || world.time < convalescence_time))
- addtimer(CALLBACK(src, .proc/heal), 3 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(heal)), 3 SECONDS)
else
cooldown = revive_cost + world.time
reviving = FALSE
@@ -121,7 +121,7 @@
if(H.stat != DEAD && prob(severity/2) && H.can_heartattack())
H.set_heartattack(TRUE)
to_chat(H, "You feel a horrible agony in your chest!")
- addtimer(CALLBACK(src, .proc/undo_heart_attack), (60 * severity/100) SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(undo_heart_attack)), (60 * severity/100) SECONDS)
/obj/item/organ/cyberimp/chest/reviver/proc/undo_heart_attack()
var/mob/living/carbon/human/H = owner
@@ -170,7 +170,7 @@
on = TRUE
if(allow_thrust(0.01))
ion_trail.start()
- RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/move_react)
+ RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(move_react))
owner.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/cybernetic)
if(!silent)
to_chat(owner, "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 7af25d3f71..94b2529a3a 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -112,7 +112,7 @@
return
crit_fail = TRUE
organ_flags |= ORGAN_FAILING
- addtimer(CALLBACK(src, .proc/reboot), 0.9 * severity)
+ addtimer(CALLBACK(src, PROC_REF(reboot)), 0.9 * severity)
/obj/item/organ/cyberimp/brain/anti_stun/proc/reboot()
crit_fail = FALSE
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 526285f60d..037bf7f09d 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -331,7 +331,7 @@
if(!silent)
to_chat(owner, "Your [src] clicks and makes a whining noise, before shooting out a beam of light!")
active = TRUE
- RegisterSignal(owner, COMSIG_ATOM_DIR_CHANGE, .proc/update_visuals)
+ RegisterSignal(owner, COMSIG_ATOM_DIR_CHANGE, PROC_REF(update_visuals))
cycle_mob_overlay()
/obj/item/organ/eyes/robotic/glow/proc/deactivate(silent = FALSE)
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 6263284584..75fdbb20e8 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -31,7 +31,7 @@
/obj/item/organ/heart/Remove(special = FALSE)
if(!special)
- addtimer(CALLBACK(src, .proc/stop_if_unowned), 12 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 12 SECONDS)
return ..()
/obj/item/organ/heart/proc/stop_if_unowned()
@@ -44,7 +44,7 @@
user.visible_message("[user] squeezes [src] to \
make it beat again!","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 = 0
@@ -244,7 +244,7 @@
Stop()
owner.visible_message("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!", \
"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)
. = ..()
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 37955dabae..31d9548505 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -34,7 +34,7 @@
/obj/item/organ/Initialize(mapload)
. = ..()
if(organ_flags & ORGAN_EDIBLE)
- AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GROSS, null, 10, null, null, null, CALLBACK(src, .proc/OnEatFrom))
+ AddComponent(/datum/component/edible, food_reagents, null, RAW | MEAT | GROSS, null, 10, null, null, null, CALLBACK(src, PROC_REF(OnEatFrom)))
START_PROCESSING(SSobj, src)
/obj/item/organ/Destroy()
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index f38539a602..ac6eecc460 100644
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -164,8 +164,8 @@
/obj/item/organ/stomach/ethereal/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE)
..()
- 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))
/obj/item/organ/stomach/ethereal/Remove(mob/living/carbon/M, special = 0)
UnregisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT)
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index b1da1c5105..893a4b921c 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -70,15 +70,15 @@
if(say_mod && M.dna && M.dna.species)
M.dna.species.say_mod = say_mod
if(length(initial_accents) || length(accents))
- RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
M.UnregisterSignal(M, COMSIG_MOB_SAY)
/obj/item/organ/tongue/Remove(special = FALSE)
if(!QDELETED(owner))
if(say_mod && owner.dna?.species)
owner.dna.species.say_mod = initial(owner.dna.species.say_mod)
- UnregisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech)
- owner.RegisterSignal(owner, COMSIG_MOB_SAY, /mob/living/carbon/.proc/handle_tongueless_speech)
+ UnregisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+ owner.RegisterSignal(owner, COMSIG_MOB_SAY, TYPE_PROC_REF(/mob/living/carbon, handle_tongueless_speech))
return ..()
/obj/item/organ/tongue/could_speak_language(language)
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 733ff674c8..d34c1df1f8 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -404,7 +404,7 @@
for(var/iter in 1 to 5 * power_multiplier)
for(var/V in listeners)
var/mob/living/L = V
- addtimer(CALLBACK(GLOBAL_PROC, .proc/_step, L, direction? direction : pick(GLOB.cardinals)), 10 * (iter - 1))
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(_step), L, direction? direction : pick(GLOB.cardinals)), 10 * (iter - 1))
//WALK
else if((findtext(message, walk_words)))
@@ -508,7 +508,7 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- addtimer(CALLBACK(L, /mob/living/.proc/emote, "dance"), 5 * i)
+ addtimer(CALLBACK(L, TYPE_PROC_REF(/mob/living, emote), "dance"), 5 * i)
i++
//JUMP
@@ -518,7 +518,7 @@
var/mob/living/L = V
if(prob(25))
addtimer(CALLBACK(L, /atom/movable/proc/say, "HOW HIGH?!!"), 5 * i)
- addtimer(CALLBACK(L, /mob/living/.proc/emote, "jump"), 5 * i)
+ addtimer(CALLBACK(L, TYPE_PROC_REF(/mob/living, emote), "jump"), 5 * i)
i++
//SALUTE
@@ -526,7 +526,7 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- addtimer(CALLBACK(L, /mob/living/.proc/emote, "salute"), 5 * i)
+ addtimer(CALLBACK(L, TYPE_PROC_REF(/mob/living, emote), "salute"), 5 * i)
i++
//PLAY DEAD
@@ -534,7 +534,7 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- addtimer(CALLBACK(L, /mob/living/.proc/emote, "deathgasp"), 5 * i)
+ addtimer(CALLBACK(L, TYPE_PROC_REF(/mob/living, emote), "deathgasp"), 5 * i)
i++
//PLEASE CLAP
@@ -542,13 +542,13 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- addtimer(CALLBACK(L, /mob/living/.proc/emote, "clap"), 5 * i)
+ addtimer(CALLBACK(L, TYPE_PROC_REF(/mob/living, emote), "clap"), 5 * i)
i++
//HONK
else if((findtext(message, honk_words)))
cooldown = COOLDOWN_MEME
- addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 25)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(playsound), get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 25)
if(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY))
for(var/mob/living/carbon/C in listeners)
C.slip(140 * power_multiplier)
@@ -578,7 +578,7 @@
//BWOINK
else if((findtext(message, bwoink_words)))
cooldown = COOLDOWN_MEME
- addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/effects/adminhelp.ogg', 300, 1), 25)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(playsound), get_turf(user), 'sound/effects/adminhelp.ogg', 300, 1), 25)
//END CITADEL CHANGES
else
@@ -814,7 +814,7 @@
else
E.enthrallTally += power_multiplier*1.25 //thinking about it, I don't know how this can proc
if(E.lewd)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] is so nice to listen to."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "[E.enthrallGender] is so nice to listen to."), 5)
E.cooldown += 1
//REWARD mixable works
@@ -826,13 +826,13 @@
if(L == user)
continue
if (E.lewd)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[E.enthrallGender] has praised me!!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "[E.enthrallGender] has praised me!!"), 5)
if(HAS_TRAIT(L, TRAIT_MASO))
E.enthrallTally -= power_multiplier
E.resistanceTally += power_multiplier
E.cooldown += 1
else
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "I've been praised for doing a good job!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "I've been praised for doing a good job!"), 5)
E.resistanceTally -= power_multiplier
E.enthrallTally += power_multiplier
var/descmessage = "[(E.lewd?"I feel so happy! I'm a good pet who [E.enthrallGender] loves!":"I did a good job!")]"
@@ -855,11 +855,11 @@
descmessage += "And yet, it feels so good..!" //I don't really understand masco, is this the right sort of thing they like?
E.enthrallTally += power_multiplier
E.resistanceTally -= power_multiplier
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "I've let [E.enthrallGender] down...!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "I've let [E.enthrallGender] down...!"), 5)
else
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "I've let [E.enthrallGender] down..."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "I've let [E.enthrallGender] down..."), 5)
else
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "I've failed [E.master]..."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "I've failed [E.master]..."), 5)
E.resistanceTally += power_multiplier
E.enthrallTally += power_multiplier
E.cooldown += 1
@@ -893,9 +893,9 @@
E.status = null
user.emote("snap")
if(E.lewd)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "The snapping of your [E.enthrallGender]'s fingers brings you back to your enthralled state, obedient and ready to serve."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "The snapping of your [E.enthrallGender]'s fingers brings you back to your enthralled state, obedient and ready to serve."), 5)
else
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "The snapping of [E.master]'s fingers brings you back to being under their influence."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "The snapping of [E.master]'s fingers brings you back to being under their influence."), 5)
to_chat(user, "You wake up [L]!")
//tier 1
@@ -1043,7 +1043,7 @@
ADD_TRAIT(C, TRAIT_MUTE, "enthrall")
else
C.silent += ((10 * power_multiplier) * E.phase)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You are unable to speak!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), C, "You are unable to speak!"), 5)
to_chat(user, "You silence [C].")
E.cooldown += 3
@@ -1063,7 +1063,7 @@
var/mob/living/L = V
var/datum/status_effect/chem/enthrall/E = L.has_status_effect(/datum/status_effect/chem/enthrall)
E.status = "Antiresist"
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "Your mind clouds over, as you find yourself unable to resist!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "Your mind clouds over, as you find yourself unable to resist!"), 5)
E.statusStrength = (1 * power_multiplier * E.phase)
E.cooldown += 15//Too short? yes, made 15
to_chat(user, "You frustrate [L]'s attempts at resisting.")
@@ -1076,7 +1076,7 @@
E.deltaResist += (power_multiplier)
E.owner_resist()
E.cooldown += 2
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You are spurred into resisting from [user]'s words!'"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), C, "You are spurred into resisting from [user]'s words!'"), 5)
to_chat(user, "You spark resistance in [C].")
//FORGET (A way to cancel the process)
@@ -1084,9 +1084,9 @@
for(var/mob/living/carbon/C in listeners)
var/datum/status_effect/chem/enthrall/E = C.has_status_effect(/datum/status_effect/chem/enthrall)
if(E.phase == 4)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You're unable to forget about [(E.lewd?"the dominating presence of [E.enthrallGender]":"[E.master]")]!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), C, "You're unable to forget about [(E.lewd?"the dominating presence of [E.enthrallGender]":"[E.master]")]!"), 5)
continue
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You wake up, forgetting everything that just happened. You must've dozed off..? How embarassing!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), C, "You wake up, forgetting everything that just happened. You must've dozed off..? How embarassing!"), 5)
C.Sleeping(50)
switch(E.phase)
if(1 to 2)
@@ -1097,9 +1097,9 @@
E.phase = 0
E.cooldown = 0
if(E.lewd)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You revert to yourself before being enthralled by your [E.enthrallGender], with no memory of what happened."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), C, "You revert to yourself before being enthralled by your [E.enthrallGender], with no memory of what happened."), 5)
else
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You revert to who you were before, with no memory of what happened with [E.master]."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), C, "You revert to who you were before, with no memory of what happened with [E.master]."), 5)
to_chat(user, "You put [C] into a sleeper state, ready to turn them back at the snap of your fingers.")
//ATTRACT
@@ -1109,7 +1109,7 @@
var/datum/status_effect/chem/enthrall/E = L.has_status_effect(/datum/status_effect/chem/enthrall)
L.throw_at(get_step_towards(user,L), 3 * power_multiplier, 1 * power_multiplier)
E.cooldown += 3
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You are drawn towards [user]!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "You are drawn towards [user]!"), 5)
to_chat(user, "You draw [L] towards you!")
//awoo
@@ -1144,7 +1144,7 @@
for(var/obj/item/W in items)
if(W == H.wear_suit)
H.dropItemToGround(W, TRUE)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "Before you can even think about it, you quickly remove your clothes in response to [(E.lewd?"your [E.enthrallGender]'s command'":"[E.master]'s directive'")]."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), H, "Before you can even think about it, you quickly remove your clothes in response to [(E.lewd?"your [E.enthrallGender]'s command'":"[E.master]'s directive'")]."), 5)
E.cooldown += 10
//WALK
@@ -1157,7 +1157,7 @@
if(L.m_intent != MOVE_INTENT_WALK)
L.toggle_move_intent()
E.cooldown += 1
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You slow down to a walk."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "You slow down to a walk."), 5)
to_chat(user, "You encourage [L] to slow down.")
//RUN
@@ -1170,7 +1170,7 @@
if(L.m_intent != MOVE_INTENT_RUN)
L.toggle_move_intent()
E.cooldown += 1
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You speed up into a jog!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "You speed up into a jog!"), 5)
to_chat(user, "You encourage [L] to pick up the pace!")
//LIE DOWN
@@ -1182,7 +1182,7 @@
if(2 to INFINITY)
L.lay_down()
E.cooldown += 10
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "[(E.lewd?"You eagerly lie down!":"You suddenly lie down!")]"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "[(E.lewd?"You eagerly lie down!":"You suddenly lie down!")]"), 5)
to_chat(user, "You encourage [L] to lie down.")
//KNOCKDOWN
@@ -1194,7 +1194,7 @@
if(2 to INFINITY)
L.DefaultCombatKnockdown(30 * power_multiplier * E.phase)
E.cooldown += 8
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You suddenly drop to the ground!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "You suddenly drop to the ground!"), 5)
to_chat(user, "You encourage [L] to drop down to the ground.")
//tier3
@@ -1213,7 +1213,7 @@
for (var/trigger in E.customTriggers)
speaktrigger += "[trigger], "
to_chat(user, "[C] whispers, \"[speaktrigger] are my triggers.\"")//So they don't trigger themselves!
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "You whisper your triggers to [(E.lewd?"Your [E.enthrallGender]":"[E.master]")]."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), C, "You whisper your triggers to [(E.lewd?"Your [E.enthrallGender]":"[E.master]")]."), 5)
//CUSTOM TRIGGERS
@@ -1248,7 +1248,7 @@
E.customTriggers[trigger] = trigger2
log_reagent("FERMICHEM: [H] has been implanted by [user] with [trigger], triggering [trigger2].")
E.mental_capacity -= 5
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"your [E.enthrallGender]":"[E.master]")] whispers you a new trigger."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), H, "[(E.lewd?"your [E.enthrallGender]":"[E.master]")] whispers you a new trigger."), 5)
to_chat(user, "You sucessfully set the trigger word [trigger] in [H]")
else
to_chat(user, "Your pet looks at you confused, it seems they don't understand that effect!")
@@ -1310,7 +1310,7 @@
objective = replacetext(lowertext(objective), "suicide", "self-love")
message_admins("[H] has been implanted by [user] with the objective [objective].")
log_reagent("FERMICHEM: [H] has been implanted by [user] with the objective [objective] via MKUltra.")
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, H, "[(E.lewd?"Your [E.enthrallGender]":"[E.master]")] whispers you a new objective."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), H, "[(E.lewd?"Your [E.enthrallGender]":"[E.master]")] whispers you a new objective."), 5)
brainwash(H, objective)
E.mental_capacity -= 200
to_chat(user, "You sucessfully give an objective to [H]")
@@ -1354,7 +1354,7 @@
E.status = "heal"
E.statusStrength = (5 * power_multiplier)
E.cooldown += 5
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You begin to lick your wounds."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "You begin to lick your wounds."), 5)
L.Stun(15 * power_multiplier)
to_chat(user, "[L] begins to lick their wounds.")
@@ -1367,7 +1367,7 @@
if(3 to INFINITY)
L.Stun(40 * power_multiplier)
E.cooldown += 8
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "Your muscles freeze up!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "Your muscles freeze up!"), 5)
to_chat(user, "You cause [L] to freeze up!")
//HALLUCINATE
@@ -1388,7 +1388,7 @@
switch(E.phase)
if(3 to INFINITY)
L.adjust_bodytemperature(50 * power_multiplier)//This seems nuts, reduced it, but then it didn't do anything, so I reverted it.
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You feel your metabolism speed up!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "You feel your metabolism speed up!"), 5)
to_chat(user, "You speed [L]'s metabolism up!")
//COLD
@@ -1399,7 +1399,7 @@
switch(E.phase)
if(3 to INFINITY)
L.adjust_bodytemperature(-50 * power_multiplier)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You feel your metabolism slow down!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "You feel your metabolism slow down!"), 5)
to_chat(user, "You slow [L]'s metabolism down!")
//GET UP
@@ -1413,7 +1413,7 @@
L.SetAllImmobility(0)
L.SetUnconscious(0) //i said get up i don't care if you're being tased
E.cooldown += 10 //This could be really strong
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You jump to your feet from sheer willpower!"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "You jump to your feet from sheer willpower!"), 5)
to_chat(user, "You spur [L] to their feet!")
//PACIFY
@@ -1425,7 +1425,7 @@
if(3)//Tier 3 only
E.status = "pacify"
E.cooldown += 10
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You feel like never hurting anyone ever again."), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), L, "You feel like never hurting anyone ever again."), 5)
to_chat(user, "You remove any intent to harm from [L]'s mind.")
//CHARGE
diff --git a/code/modules/tcg/cards.dm b/code/modules/tcg/cards.dm
index 8308c6ca99..1ff88ba9a0 100644
--- a/code/modules/tcg/cards.dm
+++ b/code/modules/tcg/cards.dm
@@ -416,7 +416,7 @@
"Pickup" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup"),
"Flip" = image(icon = 'icons/mob/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)
diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm
index 54ee98b290..423fa3fa3d 100644
--- a/code/modules/tgui/tgui.dm
+++ b/code/modules/tgui/tgui.dm
@@ -195,7 +195,7 @@
return
if(!COOLDOWN_FINISHED(src, refresh_cooldown))
refreshing = TRUE
- addtimer(CALLBACK(src, .proc/send_full_update), TGUI_REFRESH_FULL_UPDATE_COOLDOWN, TIMER_UNIQUE)
+ addtimer(CALLBACK(src, PROC_REF(send_full_update)), TGUI_REFRESH_FULL_UPDATE_COOLDOWN, TIMER_UNIQUE)
return
refreshing = FALSE
var/should_update_data = force || status >= UI_UPDATE
diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm
index b98fbfbbdf..ba3f49ca79 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)
src.client = client
window = new(client, "browseroutput")
- window.subscribe(src, .proc/on_message)
+ window.subscribe(src, PROC_REF(on_message))
/datum/tgui_panel/Del()
window.unsubscribe(src)
@@ -50,7 +50,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 01c74122bd..c2cebe8e07 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()
@@ -141,7 +141,7 @@ Notes:
if(length(tooltip_data))
var/examine_data = tooltip_data.Join("
")
var/timedelay = max(usr.client.prefs.tip_delay * 0.01, 0.01) // I heard multiplying is faster, also runtimes from very low/negative numbers
- usr.client.tip_timer = addtimer(CALLBACK(GLOBAL_PROC, .proc/openToolTip, usr, src, params, name, examine_data), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. multiplying by 0.01 converts it.
+ usr.client.tip_timer = addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(openToolTip), usr, src, params, name, examine_data), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. multiplying by 0.01 converts it.
/atom/movable/MouseExited(location, control, params)
. = ..()
diff --git a/code/modules/unit_tests/combat.dm b/code/modules/unit_tests/combat.dm
index 30bad72175..0ad01c2cb9 100644
--- a/code/modules/unit_tests/combat.dm
+++ b/code/modules/unit_tests/combat.dm
@@ -53,9 +53,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.a_intent_change(INTENT_HARM)
diff --git a/code/modules/unit_tests/emoting.dm b/code/modules/unit_tests/emoting.dm
index 5795ab3437..7111107b70 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 4fc289a220..86fab01965 100644
--- a/code/modules/unit_tests/unit_test.dm
+++ b/code/modules/unit_tests/unit_test.dm
@@ -204,7 +204,7 @@ GLOBAL_VAR_INIT(focused_tests, focused_tests())
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/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm
index e3af269a23..28e31988e7 100644
--- a/code/modules/vehicles/cars/clowncar.dm
+++ b/code/modules/vehicles/cars/clowncar.dm
@@ -38,7 +38,7 @@
var/mob/living/carbon/human/H = M
if(H.mind && HAS_TRAIT(H.mind, TRAIT_CLOWN_MENTALITY)) //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)
@@ -55,7 +55,7 @@
message_admins("[ADMIN_LOOKUPFLW(forced_mob)] was taken into a clown car with [reagent_amount] unit(s) of Irish Car Bomb, causing an ejection.")
forced_mob.log_message("was taken into a clown car with [reagent_amount] unit(s) of Irish Car Bomb, causing an ejection.", 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()
@@ -159,7 +159,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)
@@ -171,8 +171,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)
@@ -203,7 +203,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
@@ -211,7 +211,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 18c7a96cd8..163bc13cf8 100644
--- a/code/modules/vehicles/mecha/_mecha.dm
+++ b/code/modules/vehicles/mecha/_mecha.dm
@@ -175,8 +175,8 @@
add_cabin()
if(enclosed)
add_airtank()
- RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE , .proc/disconnect_air)
- RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/play_stepsound)
+ RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE , PROC_REF(disconnect_air))
+ RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(play_stepsound))
spark_system.set_up(2, 0, src)
spark_system.attach(src)
smoke_system.set_up(3, src)
@@ -530,7 +530,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 ////
@@ -575,7 +575,7 @@
return
if(SEND_SIGNAL(src, COMSIG_MECHA_EQUIPMENT_CLICK, L, target) & COMPONENT_CANCEL_EQUIPMENT_CLICK)
return
- INVOKE_ASYNC(selected, /obj/item/mecha_parts/mecha_equipment.proc/action, user, target, params)
+ INVOKE_ASYNC(selected, TYPE_PROC_REF(/obj/item/mecha_parts/mecha_equipment, action), user, target, params)
return
if((selected.range & MECHA_MELEE) && Adjacent(target))
if(isliving(target) && selected.harmful && HAS_TRAIT(L, TRAIT_PACIFISM))
@@ -583,7 +583,7 @@
return
if(SEND_SIGNAL(src, COMSIG_MECHA_EQUIPMENT_CLICK, L, target) & COMPONENT_CANCEL_EQUIPMENT_CLICK)
return
- INVOKE_ASYNC(selected, /obj/item/mecha_parts/mecha_equipment.proc/action, user, target, params)
+ INVOKE_ASYNC(selected, TYPE_PROC_REF(/obj/item/mecha_parts/mecha_equipment, action), user, target, params)
return
if(!(L in return_controllers_with_flag(VEHICLE_CONTROL_MELEE)))
to_chat(L, "You're in the wrong seat to interact with your hands.")
@@ -1147,9 +1147,9 @@
/obj/vehicle/sealed/mecha/add_occupant(mob/M, control_flags)
- RegisterSignal(M, COMSIG_MOB_DEATH, .proc/mob_exit)
- RegisterSignal(M, COMSIG_MOB_CLICKON, .proc/on_mouseclick)
- RegisterSignal(M, COMSIG_MOB_SAY, .proc/display_speech_bubble)
+ RegisterSignal(M, COMSIG_MOB_DEATH, PROC_REF(mob_exit))
+ RegisterSignal(M, COMSIG_MOB_CLICKON, PROC_REF(on_mouseclick))
+ RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(display_speech_bubble))
return ..()
/obj/vehicle/sealed/mecha/after_add_occupant(mob/M)
diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm
index 52ab3560d7..68ac7e7372 100644
--- a/code/modules/vehicles/mecha/combat/durand.dm
+++ b/code/modules/vehicles/mecha/combat/durand.dm
@@ -16,8 +16,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()
@@ -37,7 +37,7 @@
var/mob/living/occupant = O
var/datum/action/action = LAZYACCESSASSOC(occupant_actions, occupant, /datum/action/vehicle/sealed/mecha/mech_defense_mode)
if(action)
- INVOKE_ASYNC(action, /datum/action.proc/Trigger)
+ INVOKE_ASYNC(action, TYPE_PROC_REF(/datum/action, Trigger))
break
/obj/vehicle/sealed/mecha/combat/durand/Move(direction)
@@ -54,7 +54,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.
@@ -156,7 +156,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()
@@ -204,7 +204,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/neovgre.dm b/code/modules/vehicles/mecha/combat/neovgre.dm
index 7e40a1c352..00cf6f4ae7 100644
--- a/code/modules/vehicles/mecha/combat/neovgre.dm
+++ b/code/modules/vehicles/mecha/combat/neovgre.dm
@@ -49,7 +49,7 @@
M.dust()
playsound(src, 'sound/effects/neovgre_exploding.ogg', 100, 0)
src.visible_message("The reactor has gone critical, its going to blow!")
- addtimer(CALLBACK(src,.proc/go_critical),breach_time)
+ addtimer(CALLBACK(src,PROC_REF(go_critical)),breach_time)
/obj/vehicle/sealed/mecha/combat/neovgre/proc/go_critical()
explosion(get_turf(loc), 3, 5, 10, 20, 30)
diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
index 97568057ec..fa379e2615 100644
--- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
+++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm
@@ -100,10 +100,10 @@
if(!chassis)
return FALSE
chassis.use_power(energy_drain)
- return do_after(user, equip_cooldown, target, extra_checks = CALLBACK(src, .proc/do_after_checks, target))
+ return do_after(user, equip_cooldown, target, extra_checks = CALLBACK(src, PROC_REF(do_after_checks), target))
/obj/item/mecha_parts/mecha_equipment/proc/do_after_mecha(atom/target, mob/user, delay)
- return do_after(user, delay, target, extra_checks = CALLBACK(src, .proc/do_after_checks, target))
+ return do_after(user, delay, target, extra_checks = CALLBACK(src, PROC_REF(do_after_checks), target))
/// do after checks for the mecha equipment do afters
/obj/item/mecha_parts/mecha_equipment/proc/do_after_checks(atom/target)
diff --git a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
index 348a4bb6ec..63109b0907 100644
--- a/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
+++ b/code/modules/vehicles/mecha/equipment/tools/other_tools.dm
@@ -122,7 +122,7 @@
var/mob/M = A
if(M.mob_negates_gravity())
continue
- INVOKE_ASYNC(src, .proc/do_scatter, A, target)
+ INVOKE_ASYNC(src, PROC_REF(do_scatter), A, target)
var/turf/T = get_turf(target)
log_game("[key_name(source)] used a Gravitational Catapult repulse wave on [AREACOORD(T)]")
diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
index b8818ef3f7..dbb5d23d20 100644
--- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
+++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm
@@ -398,7 +398,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/prime), det_time)
+ addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade/flashbang, prime)), 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 459794619f..722aabd360 100644
--- a/code/modules/vehicles/mecha/mech_fabricator.dm
+++ b/code/modules/vehicles/mecha/mech_fabricator.dm
@@ -68,7 +68,7 @@
/obj/machinery/mecha_part_fabricator/Initialize(mapload)
stored_research = new
- rmat = AddComponent(/datum/component/remote_materials, "mechfab", mapload && link_on_init, _after_insert=CALLBACK(src, .proc/AfterMaterialInsert))
+ rmat = AddComponent(/datum/component/remote_materials, "mechfab", mapload && link_on_init, _after_insert=CALLBACK(src, PROC_REF(AfterMaterialInsert)))
RefreshParts() //Recalculating local material sizes if the fab isn't linked
return ..()
diff --git a/code/modules/vehicles/mecha/mecha_topic.dm b/code/modules/vehicles/mecha/mecha_topic.dm
index eb7dcd01db..a4601e4cbd 100644
--- a/code/modules/vehicles/mecha/mecha_topic.dm
+++ b/code/modules/vehicles/mecha/mecha_topic.dm
@@ -408,7 +408,7 @@
if(href_list["repair_int_control_lost"])
to_chat(occupants, "[icon2html(src, occupants)]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/scooter.dm b/code/modules/vehicles/scooter.dm
index 13a614449a..3b3729848f 100644
--- a/code/modules/vehicles/scooter.dm
+++ b/code/modules/vehicles/scooter.dm
@@ -134,7 +134,7 @@
playsound(src, 'sound/vehicles/skateboard_roll.ogg', 50, TRUE)
if(prob (25))
sparks.start() //the most radical way to start plasma fires
- addtimer(CALLBACK(src, .proc/grind), 2)
+ addtimer(CALLBACK(src, PROC_REF(grind)), 2)
return
else
grinding = FALSE
diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm
index 96c24b9adc..2a975420fc 100644
--- a/code/modules/vehicles/vehicle_actions.dm
+++ b/code/modules/vehicles/vehicle_actions.dm
@@ -228,5 +228,5 @@
L.client.give_award(/datum/award/achievement/misc/tram_surfer, L)
V.grinding = TRUE
V.icon_state = "[V.board_icon]-grind"
- addtimer(CALLBACK(V, /obj/vehicle/ridden/scooter/skateboard/.proc/grind), 2)
+ addtimer(CALLBACK(V, TYPE_PROC_REF(/obj/vehicle/ridden/scooter/skateboard, grind)), 2)
next_ollie = world.time + 5
diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm
index cc432957f6..1ffc5c8d93 100644
--- a/code/modules/vehicles/wheelchair.dm
+++ b/code/modules/vehicles/wheelchair.dm
@@ -23,7 +23,7 @@
/obj/vehicle/ridden/wheelchair/ComponentInitialize() //Since it's technically a chair I want it to have chair properties
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, .proc/can_user_rotate),CALLBACK(src, .proc/can_be_rotated),null)
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate)),CALLBACK(src, PROC_REF(can_be_rotated)),null)
/obj/vehicle/ridden/wheelchair/obj_destruction(damage_flag)
new /obj/item/stack/rods(drop_location(), 8)
diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm
index f84ced508e..c114cace63 100644
--- a/code/modules/vending/_vending.dm
+++ b/code/modules/vending/_vending.dm
@@ -817,7 +817,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/vore/eating/belly_obj.dm b/code/modules/vore/eating/belly_obj.dm
index 07e01e4580..ba698b2eb4 100644
--- a/code/modules/vore/eating/belly_obj.dm
+++ b/code/modules/vore/eating/belly_obj.dm
@@ -338,7 +338,7 @@
// Setup the autotransfer checks if needed
if(transferlocation != null && autotransferchance > 0)
- addtimer(CALLBACK(src, /obj/belly/.proc/check_autotransfer, prey), autotransferwait)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/belly, check_autotransfer), prey), autotransferwait)
/obj/belly/proc/check_autotransfer(var/mob/prey, var/obj/belly/target)
// Some sanity checks
@@ -347,7 +347,7 @@
transfer_contents(prey, transferlocation)
else
// Didn't transfer, so wait before retrying
- addtimer(CALLBACK(src, /obj/belly/.proc/check_autotransfer, prey), autotransferwait)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/belly, check_autotransfer), prey), autotransferwait)
//Transfers contents from one belly to another
/obj/belly/proc/transfer_contents(var/atom/movable/content, var/obj/belly/target, silent = FALSE)
diff --git a/code/modules/wiremod/components/abstract/module.dm b/code/modules/wiremod/components/abstract/module.dm
index 970b893ac3..d884f86dad 100644
--- a/code/modules/wiremod/components/abstract/module.dm
+++ b/code/modules/wiremod/components/abstract/module.dm
@@ -155,9 +155,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/action/mmi.dm b/code/modules/wiremod/components/action/mmi.dm
index b67f48f559..3c7f776b27 100644
--- a/code/modules/wiremod/components/action/mmi.dm
+++ b/code/modules/wiremod/components/action/mmi.dm
@@ -80,7 +80,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)
@@ -103,8 +103,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
@@ -134,7 +134,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/hud/counter_overlay.dm b/code/modules/wiremod/components/hud/counter_overlay.dm
index 83d7acfd11..e7d9ed5c01 100644
--- a/code/modules/wiremod/components/hud/counter_overlay.dm
+++ b/code/modules/wiremod/components/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/hud/object_overlay.dm b/code/modules/wiremod/components/hud/object_overlay.dm
index 3b20e4f551..cf2f74f4a2 100644
--- a/code/modules/wiremod/components/hud/object_overlay.dm
+++ b/code/modules/wiremod/components/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/hud/target_intercept.dm b/code/modules/wiremod/components/hud/target_intercept.dm
index d04dc2c946..043b0ad965 100644
--- a/code/modules/wiremod/components/hud/target_intercept.dm
+++ b/code/modules/wiremod/components/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/ntnet/ntnet_receive.dm b/code/modules/wiremod/components/ntnet/ntnet_receive.dm
index 30bbaee855..3ffcba5c2e 100644
--- a/code/modules/wiremod/components/ntnet/ntnet_receive.dm
+++ b/code/modules/wiremod/components/ntnet/ntnet_receive.dm
@@ -25,7 +25,7 @@
data_package = add_output_port("Data Package", PORT_TYPE_ANY)
secondary_package = add_output_port("Secondary Package", 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/populate_options()
var/static/component_options = list(
diff --git a/code/modules/wiremod/components/utility/delay.dm b/code/modules/wiremod/components/utility/delay.dm
index 46d9e6f081..e67c1c3689 100644
--- a/code/modules/wiremod/components/utility/delay.dm
+++ b/code/modules/wiremod/components/utility/delay.dm
@@ -36,7 +36,7 @@
var/delay = delay_amount.value
if(delay > COMP_DELAY_MIN_VALUE)
// Convert delay into deciseconds
- addtimer(CALLBACK(output, /datum/port/output.proc/set_output, trigger.value), delay*10)
+ addtimer(CALLBACK(output, TYPE_PROC_REF(/datum/port/output, set_output), trigger.value), delay*10)
else
output.set_output(trigger.value)
diff --git a/code/modules/wiremod/components/utility/getter.dm b/code/modules/wiremod/components/utility/getter.dm
index 30c3cb2ac1..e97e7b9702 100644
--- a/code/modules/wiremod/components/utility/getter.dm
+++ b/code/modules/wiremod/components/utility/getter.dm
@@ -66,5 +66,5 @@
remove_current_variable()
current_variable = variable
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))
value.set_datatype(variable.datatype)
diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm
index 948ea080e7..032af8bf05 100644
--- a/code/modules/wiremod/core/component_printer.dm
+++ b/code/modules/wiremod/core/component_printer.dm
@@ -289,7 +289,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/obj/item/circuit_component/module/module = new(drop_location())
@@ -333,7 +333,7 @@
data["materials"] = list(/datum/material/glass = total_cost)
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 b767615e87..7c5e9ea0e5 100644
--- a/code/modules/wiremod/core/integrated_circuit.dm
+++ b/code/modules/wiremod/core/integrated_circuit.dm
@@ -74,7 +74,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)
. = ..()
@@ -148,7 +148,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
@@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
to_add.rel_y = rand(COMPONENT_MIN_RANDOM_POS, COMPONENT_MAX_RANDOM_POS) - screen_y
to_add.parent = src
attached_components += to_add
- 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)
@@ -545,7 +545,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit)
if(!add_component(component, usr))
qdel(component)
return
- 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++
if("move_screen")
screen_x = text2num(params["screen_x"])
diff --git a/code/modules/wiremod/core/marker.dm b/code/modules/wiremod/core/marker.dm
index 82d34be37a..193699dd08 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 a58016743f..6c814bf1ab 100644
--- a/code/modules/wiremod/core/port.dm
+++ b/code/modules/wiremod/core/port.dm
@@ -47,7 +47,7 @@
UnregisterSignal(value, COMSIG_PARENT_QDELETING)
src.value = datatype_handler.convert_value(src, value)
if(isatom(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)
/**
@@ -167,9 +167,9 @@
*/
/datum/port/input/proc/connect(datum/port/output/output)
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)
@@ -199,7 +199,7 @@
*/
/datum/port/input/proc/receive_value(datum/port/output/output, value)
SIGNAL_HANDLER
- SScircuit_component.add_callback(CALLBACK(src, .proc/set_input, value))
+ SScircuit_component.add_callback(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 ed0f1053a3..d38965a2a1 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/shell/airlock.dm b/code/modules/wiremod/shell/airlock.dm
index 6c342effa1..f0709df875 100644
--- a/code/modules/wiremod/shell/airlock.dm
+++ b/code/modules/wiremod/shell/airlock.dm
@@ -84,9 +84,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
@@ -128,6 +128,6 @@
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))
diff --git a/code/modules/wiremod/shell/bot.dm b/code/modules/wiremod/shell/bot.dm
index a7aee6a2c5..67f4dabb66 100644
--- a/code/modules/wiremod/shell/bot.dm
+++ b/code/modules/wiremod/shell/bot.dm
@@ -41,7 +41,7 @@
return ..()
/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 f9723e115c..4bed63c734 100644
--- a/code/modules/wiremod/shell/brain_computer_interface.dm
+++ b/code/modules/wiremod/shell/brain_computer_interface.dm
@@ -185,8 +185,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
@@ -224,9 +224,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
@@ -459,9 +459,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
@@ -513,7 +513,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 526567a92a..99ac2db30d 100644
--- a/code/modules/wiremod/shell/compact_remote.dm
+++ b/code/modules/wiremod/shell/compact_remote.dm
@@ -35,7 +35,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 9539a0521a..9f92067551 100644
--- a/code/modules/wiremod/shell/controller.dm
+++ b/code/modules/wiremod/shell/controller.dm
@@ -41,9 +41,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/moneybot.dm b/code/modules/wiremod/shell/moneybot.dm
index 133f0a5e59..a14b5b7951 100644
--- a/code/modules/wiremod/shell/moneybot.dm
+++ b/code/modules/wiremod/shell/moneybot.dm
@@ -105,8 +105,8 @@
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(shell, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_money_insert))
+ RegisterSignal(shell, COMSIG_MONEYBOT_ADD_MONEY, PROC_REF(handle_money_update))
/obj/item/circuit_component/money_bot/unregister_shell(atom/movable/shell)
UnregisterSignal(shell, list(
diff --git a/code/modules/wiremod/shell/scanner.dm b/code/modules/wiremod/shell/scanner.dm
index 3120ac192a..cb791d27b3 100644
--- a/code/modules/wiremod/shell/scanner.dm
+++ b/code/modules/wiremod/shell/scanner.dm
@@ -42,7 +42,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 b8484f3182..b081b18d66 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)
@@ -33,7 +33,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/item/circuit_component/scanner_gate
display_name = "Scanner Gate"
@@ -53,7 +53,7 @@
. = ..()
if(istype(shell, /obj/structure/scanner_gate_shell))
attached_gate = shell
- RegisterSignal(attached_gate, COMSIG_SCANGATE_SHELL_PASS, .proc/on_trigger)
+ RegisterSignal(attached_gate, COMSIG_SCANGATE_SHELL_PASS, PROC_REF(on_trigger))
/obj/item/circuit_component/scanner_gate/unregister_shell(atom/movable/shell)
UnregisterSignal(attached_gate, COMSIG_SCANGATE_SHELL_PASS)
diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm
index d8908ee21a..3011f9acd2 100644
--- a/code/modules/zombie/organs.dm
+++ b/code/modules/zombie/organs.dm
@@ -45,7 +45,7 @@
if(!owner)
return
if(!(src in owner.internal_organs))
- INVOKE_ASYNC(src,.proc/Remove,owner)
+ INVOKE_ASYNC(src,PROC_REF(Remove),owner)
if(owner.mob_biotypes & MOB_MINERAL)//does not process in inorganic things
return
if (causes_damage && !iszombie(owner) && owner.stat != DEAD)
@@ -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/modular_citadel/code/datums/components/souldeath.dm b/modular_citadel/code/datums/components/souldeath.dm
index 01e6acb795..9ac8dc2666 100644
--- a/modular_citadel/code/datums/components/souldeath.dm
+++ b/modular_citadel/code/datums/components/souldeath.dm
@@ -6,13 +6,13 @@
/datum/component/souldeath/Initialize()
if(!isitem(parent))
return COMPONENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/equip)
- RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/unequip)
+ RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(equip))
+ RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(unequip))
/datum/component/souldeath/proc/equip(datum/source, mob/living/equipper, slot)
if(!slot || equip_slot == slot)
wearer = equipper
- RegisterSignal(wearer, COMSIG_MOB_DEATH, .proc/die, TRUE)
+ RegisterSignal(wearer, COMSIG_MOB_DEATH, PROC_REF(die), TRUE)
signal = TRUE
else
if(signal)
diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm
index 0cef4b116f..ad3970908f 100644
--- a/modular_citadel/code/datums/status_effects/chems.dm
+++ b/modular_citadel/code/datums/status_effects/chems.dm
@@ -130,8 +130,8 @@
master = get_mob_by_key(enthrallID)
//if(M.ckey == enthrallID)
// owner.remove_status_effect(src)//At the moment, a user can enthrall themselves, toggle this back in if that should be removed.
- RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/owner_resist) //Do resistance calc if resist is pressed#
- RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/owner_hear)
+ RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(owner_resist)) //Do resistance calc if resist is pressed#
+ RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(owner_hear))
mental_capacity = 500 - M.getOrganLoss(ORGAN_SLOT_BRAIN)//It's their brain!
lewd = (owner.client?.prefs.cit_toggles & HYPNO) && (master.client?.prefs.cit_toggles & HYPNO)
var/message = "[(lewd ? "I am a good pet for [enthrallGender]." : "[master] is a really inspirational person!")]"
@@ -486,14 +486,14 @@
//Speak (Forces player to talk)
if (lowertext(customTriggers[trigger][1]) == "speak")//trigger2
var/saytext = "Your mouth moves on it's own before you can even catch it."
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "[saytext]"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), C, "[saytext]"), 5)
addtimer(CALLBACK(C, /atom/movable/proc/say, "[customTriggers[trigger][2]]"), 5)
log_reagent("FERMICHEM: MKULTRA: [owner] ckey: [owner.key] has been forced to say: \"[customTriggers[trigger][2]]\" from previous trigger.")
//Echo (repeats message!) allows customisation, but won't display var calls! Defaults to hypnophrase.
else if (lowertext(customTriggers[trigger][1]) == "echo")//trigger2
- addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, C, "[customTriggers[trigger][2]]"), 5)
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(to_chat), C, "[customTriggers[trigger][2]]"), 5)
//(to_chat(owner, "[customTriggers[trigger][2]]"))//trigger3
//Shocking truth!
diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm
index 097daa9f0e..dc5e559ee1 100644
--- a/modular_citadel/code/modules/client/preferences_savefile.dm
+++ b/modular_citadel/code/modules/client/preferences_savefile.dm
@@ -23,7 +23,7 @@
S["alt_titles_preferences"] >> alt_titles_preferences
alt_titles_preferences = SANITIZE_LIST(alt_titles_preferences)
if(SSjob)
- for(var/datum/job/job in sort_list(SSjob.occupations, /proc/cmp_job_display_asc))
+ for(var/datum/job/job in sort_list(SSjob.occupations, GLOBAL_PROC_REF(cmp_job_display_asc)))
if(alt_titles_preferences[job.title])
if(!(alt_titles_preferences[job.title] in job.alt_titles))
alt_titles_preferences.Remove(job.title)
diff --git a/modular_citadel/code/modules/festive/wheelchair.dm b/modular_citadel/code/modules/festive/wheelchair.dm
index 80f9156cdd..3ce96a827b 100644
--- a/modular_citadel/code/modules/festive/wheelchair.dm
+++ b/modular_citadel/code/modules/festive/wheelchair.dm
@@ -60,7 +60,7 @@
/obj/vehicle/sealed/vectorcraft/rideable/wheelchair/ComponentInitialize() //Since it's technically a chair I want it to have chair properties
. = ..()
- AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, .proc/can_user_rotate),CALLBACK(src, .proc/can_be_rotated),null)
+ AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, PROC_REF(can_user_rotate)),CALLBACK(src, PROC_REF(can_be_rotated)),null)
/obj/vehicle/sealed/vectorcraft/rideable/wheelchair/Destroy()
diff --git a/modular_citadel/code/modules/mentor/mentorhelp.dm b/modular_citadel/code/modules/mentor/mentorhelp.dm
index 54d63402db..5284f75abc 100644
--- a/modular_citadel/code/modules/mentor/mentorhelp.dm
+++ b/modular_citadel/code/modules/mentor/mentorhelp.dm
@@ -8,7 +8,7 @@
//remove out mentorhelp verb temporarily to prevent spamming of mentors.
remove_verb(src, /client/verb/mentorhelp)
- addtimer(CALLBACK(GLOBAL_PROC, /proc/add_verb, src, /client/verb/mentorhelp), 30 SECONDS)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(add_verb), src, /client/verb/mentorhelp), 30 SECONDS)
msg = sanitize(copytext_char(msg, 1, MAX_MESSAGE_LEN))
if(!msg || !mob)
diff --git a/modular_citadel/code/modules/reagents/objects/clothes.dm b/modular_citadel/code/modules/reagents/objects/clothes.dm
index 9b3b63d5af..e94511a1c5 100644
--- a/modular_citadel/code/modules/reagents/objects/clothes.dm
+++ b/modular_citadel/code/modules/reagents/objects/clothes.dm
@@ -38,14 +38,14 @@
/obj/item/clothing/head/hattip/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)
/obj/item/clothing/head/hattip/dropped(mob/M)
. = ..()
UnregisterSignal(M, COMSIG_MOB_SAY)
- addtimer(CALLBACK(GLOBAL_PROC, .proc/root_and_toot, src, src, 200))
+ addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(root_and_toot), src, src, 200))
/obj/item/clothing/head/hattip/proc/root_and_toot(obj/item/clothing/head/hattip/hat)
hat.animate_atom_living()
diff --git a/modular_sand/code/datums/components/container_item/container_item.dm b/modular_sand/code/datums/components/container_item/container_item.dm
index fda012cb0e..1bf3516bdf 100644
--- a/modular_sand/code/datums/components/container_item/container_item.dm
+++ b/modular_sand/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/modular_sand/code/datums/components/glory_kill.dm b/modular_sand/code/datums/components/glory_kill.dm
index 94267c23c0..cdd808389d 100644
--- a/modular_sand/code/datums/components/glory_kill.dm
+++ b/modular_sand/code/datums/components/glory_kill.dm
@@ -41,10 +41,10 @@
/datum/component/glory_kill/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/glory_kill)
- RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, .proc/health_modified)
- RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/on_death)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examined)
+ RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(glory_kill))
+ RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(health_modified))
+ RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(on_death))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examined))
/datum/component/glory_kill/UnregisterFromParent()
UnregisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_MOB_APPLY_DAMAGE, COMSIG_MOB_DEATH, COMSIG_MOB_EXAMINATE))
diff --git a/modular_sand/code/datums/components/interaction_menu_granter.dm b/modular_sand/code/datums/components/interaction_menu_granter.dm
index bd909310e8..3e57460f9c 100644
--- a/modular_sand/code/datums/components/interaction_menu_granter.dm
+++ b/modular_sand/code/datums/components/interaction_menu_granter.dm
@@ -34,7 +34,7 @@
/datum/component/interaction_menu_granter/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_MOB_CTRLSHIFTCLICKON, .proc/open_menu)
+ RegisterSignal(parent, COMSIG_MOB_CTRLSHIFTCLICKON, PROC_REF(open_menu))
/datum/component/interaction_menu_granter/Destroy(force, ...)
target = null
@@ -58,7 +58,7 @@
if(target)
UnregisterSignal(target, COMSIG_PARENT_QDELETING)
target = clicked
- RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/on_target_deleted)
+ RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_deleted))
ui_interact(clicker)
return COMSIG_MOB_CANCEL_CLICKON
diff --git a/modular_sand/code/datums/components/riding.dm b/modular_sand/code/datums/components/riding.dm
index 9c486d38f4..74ba5c2207 100644
--- a/modular_sand/code/datums/components/riding.dm
+++ b/modular_sand/code/datums/components/riding.dm
@@ -1,6 +1,6 @@
/datum/component/riding/human/Initialize()
. = ..()
- RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/update_dir)
+ RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(update_dir))
/datum/component/riding/human/proc/update_dir(mob/source, dir, newdir)
var/mob/living/carbon/human/H = source
diff --git a/modular_sand/code/datums/components/storage/concrete/dresser.dm b/modular_sand/code/datums/components/storage/concrete/dresser.dm
index 03233081ef..ec2d155543 100644
--- a/modular_sand/code/datums/components/storage/concrete/dresser.dm
+++ b/modular_sand/code/datums/components/storage/concrete/dresser.dm
@@ -9,8 +9,8 @@
/datum/component/storage/concrete/dresser/Initialize()
if(..())
return ELEMENT_INCOMPATIBLE
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/signal_show_attempt, TRUE)
- RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, .proc/signal_show_attempt, TRUE)
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(signal_show_attempt), TRUE)
+ RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, PROC_REF(signal_show_attempt), TRUE)
/datum/component/storage/concrete/dresser/user_show_to_mob(mob/M, force, trigger_on_found)
. = ..()
diff --git a/modular_sand/code/datums/elements/holder_micro.dm b/modular_sand/code/datums/elements/holder_micro.dm
index 6ed2ff7601..5fdf88e61c 100644
--- a/modular_sand/code/datums/elements/holder_micro.dm
+++ b/modular_sand/code/datums/elements/holder_micro.dm
@@ -3,9 +3,9 @@
/datum/element/mob_holder/micro/Attach(datum/target, worn_state, alt_worn, right_hand, left_hand, inv_slots = NONE, proctype, escape_on_find)
. = ..()
- RegisterSignal(target, COMSIG_CLICK_ALT, .proc/mob_try_pickup_micro, TRUE)
- RegisterSignal(target, COMSIG_MICRO_PICKUP_FEET, .proc/mob_pickup_micro_feet)
- RegisterSignal(target, COMSIG_MOB_RESIZED, .proc/on_resize)
+ RegisterSignal(target, COMSIG_CLICK_ALT, PROC_REF(mob_try_pickup_micro), TRUE)
+ RegisterSignal(target, COMSIG_MICRO_PICKUP_FEET, PROC_REF(mob_pickup_micro_feet))
+ RegisterSignal(target, COMSIG_MOB_RESIZED, PROC_REF(on_resize))
/datum/element/mob_holder/micro/Detach(datum/source, force)
. = ..()
diff --git a/modular_sand/code/datums/elements/skirt_peeking.dm b/modular_sand/code/datums/elements/skirt_peeking.dm
index 96207fbffa..a7a93a30d4 100644
--- a/modular_sand/code/datums/elements/skirt_peeking.dm
+++ b/modular_sand/code/datums/elements/skirt_peeking.dm
@@ -6,8 +6,8 @@
if(!ishuman(peeked))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(peeked, COMSIG_PARENT_EXAMINE, .proc/on_examine)
- RegisterSignal(peeked, COMSIG_PARENT_EXAMINE_MORE, .proc/on_closer_look)
+ RegisterSignal(peeked, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine))
+ RegisterSignal(peeked, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(on_closer_look))
/datum/element/skirt_peeking/proc/can_skirt_peek(mob/living/carbon/human/peeked, mob/peeker)
var/mob/living/living_peeker = peeker
@@ -105,7 +105,7 @@
examine_content += span_purple(string)
// Let's see if we caught them, addtimer so it appears after the peek.
- addtimer(CALLBACK(src, .proc/try_notice, peeked, peeker), 1)
+ addtimer(CALLBACK(src, PROC_REF(try_notice), peeked, peeker), 1)
/// Alright, they've peeked us and everything, did we notice it though?
/datum/element/skirt_peeking/proc/try_notice(mob/living/carbon/human/peeked, mob/living/peeker)
diff --git a/modular_sand/code/datums/traits/neutral.dm b/modular_sand/code/datums/traits/neutral.dm
index ea574d896b..1a84c6b40c 100644
--- a/modular_sand/code/datums/traits/neutral.dm
+++ b/modular_sand/code/datums/traits/neutral.dm
@@ -48,11 +48,11 @@
/datum/quirk/estrous_active/add()
// Add examine hook
- RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/quirk_examine_estrous_active)
+ RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, PROC_REF(quirk_examine_estrous_active))
// Add organ change hooks
- RegisterSignal(quirk_holder, COMSIG_MOB_ORGAN_ADD, .proc/update_heat_type)
- RegisterSignal(quirk_holder, COMSIG_MOB_ORGAN_REMOVE, .proc/update_heat_type)
+ RegisterSignal(quirk_holder, COMSIG_MOB_ORGAN_ADD, PROC_REF(update_heat_type))
+ RegisterSignal(quirk_holder, COMSIG_MOB_ORGAN_REMOVE, PROC_REF(update_heat_type))
/datum/quirk/estrous_active/remove()
// Remove signals
diff --git a/modular_sand/code/datums/wires/firealarm.dm b/modular_sand/code/datums/wires/firealarm.dm
index cb8ef5f71f..be29d6a821 100644
--- a/modular_sand/code/datums/wires/firealarm.dm
+++ b/modular_sand/code/datums/wires/firealarm.dm
@@ -37,7 +37,7 @@
A.detecting = !A.detecting
if(WIRE_FIRE_TRIGGER)
A.alarm()
- addtimer(CALLBACK(A, /obj/machinery/firealarm.proc/reset, wire), 1000)
+ addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/firealarm, reset), wire), 1000)
/datum/wires/firealarm/on_cut(index, mend)
var/obj/machinery/firealarm/A = holder
diff --git a/modular_sand/code/game/objects/items/borg_shapeshifter.dm b/modular_sand/code/game/objects/items/borg_shapeshifter.dm
index ca65c47ec8..188f65f060 100644
--- a/modular_sand/code/game/objects/items/borg_shapeshifter.dm
+++ b/modular_sand/code/game/objects/items/borg_shapeshifter.dm
@@ -136,7 +136,7 @@
"Clown" = image(icon = 'icons/mob/robots.dmi', icon_state = "clown"),
"Syndicate" = image(icon = 'icons/mob/robots.dmi', icon_state = "synd_sec")
))
- var/module_selection = show_radial_menu(R, R , module_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/module_selection = show_radial_menu(R, R , module_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!module_selection)
return FALSE
@@ -145,7 +145,7 @@
var/static/list/standard_icons = sort_list(list(
"Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "robot")
))
- var/borg_icon = show_radial_menu(R, R , standard_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/borg_icon = show_radial_menu(R, R , standard_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -171,7 +171,7 @@
wide.pixel_x = -16
med_icons[a] = wide
med_icons = sort_list(med_icons)
- var/borg_icon = show_radial_menu(R, R , med_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/borg_icon = show_radial_menu(R, R , med_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -235,7 +235,7 @@
wide.pixel_x = -16
engi_icons[a] = wide
engi_icons = sort_list(engi_icons)
- var/borg_icon = show_radial_menu(R, R , engi_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/borg_icon = show_radial_menu(R, R , engi_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -305,7 +305,7 @@
wide.pixel_x = -16
sec_icons[a] = wide
sec_icons = sort_list(sec_icons)
- var/borg_icon = show_radial_menu(R, R , sec_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/borg_icon = show_radial_menu(R, R , sec_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -380,7 +380,7 @@
wide.pixel_x = -16
service_icons[a] = wide
service_icons = sort_list(service_icons)
- var/borg_icon = show_radial_menu(R, R , service_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/borg_icon = show_radial_menu(R, R , service_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -464,7 +464,7 @@
wide.pixel_x = -16
mining_icons[a] = wide
mining_icons = sort_list(mining_icons)
- var/borg_icon = show_radial_menu(R, R , mining_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/borg_icon = show_radial_menu(R, R , mining_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -516,7 +516,7 @@
"Spider" = image(icon = 'modular_citadel/icons/mob/robots.dmi', icon_state = "whitespider"),
"Drake" = image(icon = 'modular_sand/icons/mob/cyborg/drakemech.dmi', icon_state = "drakepeacebox")
))
- var/borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/borg_icon = show_radial_menu(R, R , peace_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -540,7 +540,7 @@
var/static/list/clown_icons = sort_list(list(
"Default" = image(icon = 'icons/mob/robots.dmi', icon_state = "clown")
))
- var/borg_icon = show_radial_menu(R, R , clown_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/borg_icon = show_radial_menu(R, R , clown_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -555,7 +555,7 @@
"Medical" = image(icon = 'icons/mob/robots.dmi', icon_state = "synd_medical"),
"Assault" = image(icon = 'icons/mob/robots.dmi', icon_state = "synd_sec")
))
- var/borg_icon = show_radial_menu(R, R , syndicatejack_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/borg_icon = show_radial_menu(R, R , syndicatejack_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!borg_icon)
return FALSE
switch(borg_icon)
@@ -632,7 +632,7 @@
return
if(listeningTo)
UnregisterSignal(listeningTo, signalCache)
- RegisterSignal(user, signalCache, .proc/disrupt)
+ RegisterSignal(user, signalCache, PROC_REF(disrupt))
listeningTo = user
/obj/item/borg_shapeshifter/proc/deactivate(mob/living/silicon/robot/user)
diff --git a/modular_sand/code/game/objects/items/fleshlight.dm b/modular_sand/code/game/objects/items/fleshlight.dm
index 0b6ace77c0..1a464b575f 100644
--- a/modular_sand/code/game/objects/items/fleshlight.dm
+++ b/modular_sand/code/game/objects/items/fleshlight.dm
@@ -666,7 +666,7 @@
playsound(src, 'sound/machines/ping.ogg', 50, FALSE)
to_chat(user, "[P] has been linked up successfully.")
update_portal()
- RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/drop_out)
+ RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(drop_out))
else
to_chat(user, "One of these pieces has already been paired.")
else
@@ -710,7 +710,7 @@
to_chat(user, span_notice("The panties are not linked to a portal fleshlight."))
else
update_portal()
- RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/drop_out)
+ RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(drop_out))
else
update_portal()
UnregisterSignal(user, COMSIG_PARENT_QDELETING)
diff --git a/modular_sand/code/modules/clothing/spacesuits/chronosuit.dm b/modular_sand/code/modules/clothing/spacesuits/chronosuit.dm
index 945f95424d..f22b77ab00 100644
--- a/modular_sand/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/modular_sand/code/modules/clothing/spacesuits/chronosuit.dm
@@ -135,12 +135,12 @@
user.Stun(INFINITY)
animate(user, color = "#00ccee", time = 3)
- phase_timer_id = addtimer(CALLBACK(src, .proc/phase_2, user, to_turf, phase_in_ds), 3, TIMER_STOPPABLE)
+ phase_timer_id = addtimer(CALLBACK(src, PROC_REF(phase_2), user, to_turf, phase_in_ds), 3, TIMER_STOPPABLE)
/obj/item/clothing/suit/space/chronos/proc/phase_2(mob/living/carbon/human/user, turf/to_turf, phase_in_ds)
if(teleporting && activated && user)
animate(user, alpha = 0, time = 2)
- phase_timer_id = addtimer(CALLBACK(src, .proc/phase_3, user, to_turf, phase_in_ds), 2, TIMER_STOPPABLE)
+ phase_timer_id = addtimer(CALLBACK(src, PROC_REF(phase_3), user, to_turf, phase_in_ds), 2, TIMER_STOPPABLE)
else
finish_chronowalk(user, to_turf)
@@ -148,14 +148,14 @@
if(teleporting && activated && user)
user.forceMove(to_turf)
animate(user, alpha = 255, time = phase_in_ds)
- phase_timer_id = addtimer(CALLBACK(src, .proc/phase_4, user, to_turf), phase_in_ds, TIMER_STOPPABLE)
+ phase_timer_id = addtimer(CALLBACK(src, PROC_REF(phase_4), user, to_turf), phase_in_ds, TIMER_STOPPABLE)
else
finish_chronowalk(user, to_turf)
/obj/item/clothing/suit/space/chronos/proc/phase_4(mob/living/carbon/human/user, turf/to_turf)
if(teleporting && activated && user)
animate(user, color = "#ffffff", time = 3)
- phase_timer_id = addtimer(CALLBACK(src, .proc/finish_chronowalk, user, to_turf), 3, TIMER_STOPPABLE)
+ phase_timer_id = addtimer(CALLBACK(src, PROC_REF(finish_chronowalk), user, to_turf), 3, TIMER_STOPPABLE)
else
finish_chronowalk(user, to_turf)
diff --git a/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm b/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm
index a73639e808..da443581b7 100644
--- a/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/modular_sand/code/modules/clothing/spacesuits/hardsuit.dm
@@ -108,9 +108,9 @@
if(prob(explodioprobemp))
playsound(src.loc, 'sound/effects/fuse.ogg', 60, 1, 10)
visible_message("The power module on the [src] begins to smoke, glowing with an alarming warmth! Get away from it, now!")
- addtimer(CALLBACK(src, .proc/detonate),50)
+ addtimer(CALLBACK(src, PROC_REF(detonate)),50)
else
- addtimer(CALLBACK(src, .proc/revivemessage), rebootdelay)
+ addtimer(CALLBACK(src, PROC_REF(revivemessage)), rebootdelay)
return
/obj/item/clothing/suit/space/hardsuit/powerarmor/proc/revivemessage() //we use this proc to add a timer, so we can have it take a while to boot
diff --git a/modular_sand/code/modules/mining/equipment/kinetic_crusher.dm b/modular_sand/code/modules/mining/equipment/kinetic_crusher.dm
index 7cedccf6ff..7d22f6e329 100644
--- a/modular_sand/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/modular_sand/code/modules/mining/equipment/kinetic_crusher.dm
@@ -75,7 +75,7 @@
/obj/item/crusher_trophy/brokentech/on_projectile_fire(obj/item/projectile/destabilizer/marker, mob/living/user)
. = ..()
if(cooldowntime < world.time)
- INVOKE_ASYNC(src, .proc/invokesmoke, user)
+ INVOKE_ASYNC(src, PROC_REF(invokesmoke), user)
/obj/item/crusher_trophy/brokentech/proc/invokesmoke(mob/living/user)
cooldown = world.time + cooldowntime
@@ -207,7 +207,7 @@
D.fire()
charged = FALSE
update_icon()
- addtimer(CALLBACK(src, .proc/Recharge), charge_time)
+ addtimer(CALLBACK(src, PROC_REF(Recharge)), charge_time)
return
if(proximity_flag && isliving(target))
var/mob/living/L = target
@@ -397,7 +397,7 @@
D.fire()
charged = FALSE
update_icon()
- addtimer(CALLBACK(src, .proc/Recharge), charge_time)
+ addtimer(CALLBACK(src, PROC_REF(Recharge)), charge_time)
return
if(proximity_flag && isliving(target))
var/mob/living/L = target
diff --git a/modular_sand/code/modules/mining/lavaland/necropolis_chests.dm b/modular_sand/code/modules/mining/lavaland/necropolis_chests.dm
index f3b4cf3978..40e0811aff 100644
--- a/modular_sand/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/modular_sand/code/modules/mining/lavaland/necropolis_chests.dm
@@ -226,8 +226,8 @@
/obj/item/crucible/Initialize(mapload)
. = ..()
- RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/wield)
- RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/unwield)
+ RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(wield))
+ RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(unwield))
/obj/item/crucible/ComponentInitialize()
. = ..()
@@ -637,7 +637,7 @@
/obj/item/clothing/accessory/lavawalk/ComponentInitialize()
. = ..()
lavawalk = new(src)
- RegisterSignal(lavawalk, COMSIG_ACTION_TRIGGER, .proc/activate)
+ RegisterSignal(lavawalk, COMSIG_ACTION_TRIGGER, PROC_REF(activate))
/obj/item/clothing/accessory/lavawalk/Destroy()
. = ..()
@@ -673,7 +673,7 @@
L.balloon_alert(L, "activated")
ADD_TRAIT(L, TRAIT_ASHSTORM_IMMUNE, src)
ADD_TRAIT(L, TRAIT_LAVA_IMMUNE, src)
- timer = addtimer(CALLBACK(src, .proc/reset_user, L), effectduration)
+ timer = addtimer(CALLBACK(src, PROC_REF(reset_user), L), effectduration)
action.StartCooldown()
/obj/item/clothing/accessory/lavawalk/proc/reset_user(mob/living/user)
diff --git a/modular_sand/code/modules/mob/emote.dm b/modular_sand/code/modules/mob/emote.dm
index e725562c1c..caa12f509b 100644
--- a/modular_sand/code/modules/mob/emote.dm
+++ b/modular_sand/code/modules/mob/emote.dm
@@ -11,7 +11,7 @@
I.icon_state = state
M.vis_contents += I
animate(I, alpha = 255, time = 5, easing = BOUNCE_EASING, pixel_y = 10)
- addtimer(CALLBACK(GLOBAL_PROC, /proc/finish_flick, M, I), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(finish_flick), M, I), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME)
/proc/finish_flick(mob/M, I)
M.vis_contents -= I
diff --git a/modular_sand/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_sand/code/modules/mob/living/silicon/robot/robot_modules.dm
index 6b9545de0d..97880be5ad 100644
--- a/modular_sand/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/modular_sand/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -81,7 +81,7 @@
"BootyNukie" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "bootynukie"), // SPLURT Addon (Hyper Port)
"BootyGorlex" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "bootygorlex") // SPLURT Addon (Hyper Port)
))
- var/syndiejack_icon = show_radial_menu(R, R , syndicatejack_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/syndiejack_icon = show_radial_menu(R, R , syndicatejack_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(syndiejack_icon)
if("Saboteur")
cyborg_base_icon = "synd_engi"
diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index b4a8993f4e..2592a1b633 100644
--- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -36,13 +36,13 @@ Removes slaughterlings (because they are bullshit), instead replacing them with
blood_warp()
bloodsmacks()
if(prob(25))
- INVOKE_ASYNC(src, .proc/blood_spray)
- INVOKE_ASYNC(src, .proc/bloodsmacks)
+ INVOKE_ASYNC(src, PROC_REF(blood_spray))
+ INVOKE_ASYNC(src, PROC_REF(bloodsmacks))
else
if(health > maxHealth/2 && !client)
- INVOKE_ASYNC(src, .proc/charge)
+ INVOKE_ASYNC(src, PROC_REF(charge))
else
- INVOKE_ASYNC(src, .proc/triple_charge)
+ INVOKE_ASYNC(src, PROC_REF(triple_charge))
/mob/living/simple_animal/hostile/megafauna/bubblegum/charge()
bloodsmacks()
@@ -71,7 +71,7 @@ Removes slaughterlings (because they are bullshit), instead replacing them with
mobcount++
if(mobcount)
var/hand = rand(0,1)
- INVOKE_ASYNC(src, .proc/bloodsmack, T, hand)
+ INVOKE_ASYNC(src, PROC_REF(bloodsmack), T, hand)
/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/bloodsmack(turf/T, handedness)
if(handedness)
diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm
index 1e1efc4609..435cc3fad9 100644
--- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm
+++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/glaurung.dm
@@ -86,7 +86,7 @@ Difficulty: Medium
var/range = 20
var/list/turfs = list()
turfs = line_target(0, range, at)
- INVOKE_ASYNC(src, .proc/fire_line, turfs)
+ INVOKE_ASYNC(src, PROC_REF(fire_line), turfs)
/mob/living/simple_animal/hostile/megafauna/dragon/glaurung/OpenFire()
if(swooping)
diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/rogueprocess.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/rogueprocess.dm
index c392c9e0dd..c00b9f9f29 100644
--- a/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/rogueprocess.dm
+++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/megafauna/rogueprocess.dm
@@ -68,57 +68,57 @@
switch(anger_modifier)
if(0 to 25)
if(prob(50))
- INVOKE_ASYNC(src, .proc/plasmashot, target)
+ INVOKE_ASYNC(src, PROC_REF(plasmashot), target)
if(prob(80))
sleep(6)
- INVOKE_ASYNC(src, .proc/plasmashot, target)
+ INVOKE_ASYNC(src, PROC_REF(plasmashot), target)
if(prob(50))
sleep(6)
- INVOKE_ASYNC(src, .proc/plasmashot, target)
+ INVOKE_ASYNC(src, PROC_REF(plasmashot), target)
else
animate(src, color = "#ff0000", time = 3)
sleep(4)
- INVOKE_ASYNC(src, .proc/shockwave, src.dir, 7, 2.5)
+ INVOKE_ASYNC(src, PROC_REF(shockwave), src.dir, 7, 2.5)
if(25 to 50)
if(prob(60))
special = TRUE
- INVOKE_ASYNC(src, .proc/plasmaburst, target, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(plasmaburst), target, FALSE)
sleep(6)
- INVOKE_ASYNC(src, .proc/plasmaburst, target, TRUE)
+ INVOKE_ASYNC(src, PROC_REF(plasmaburst), target, TRUE)
if(prob(50))
sleep(6)
- INVOKE_ASYNC(src, .proc/plasmashot, target, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(plasmashot), target, FALSE)
if(prob(50))
sleep(6)
- INVOKE_ASYNC(src, .proc/plasmashot, target, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(plasmashot), target, FALSE)
special = FALSE
else
special = TRUE
animate(src, color = "#ff0000", time = 3)
sleep(4)
- INVOKE_ASYNC(src, .proc/shockwave, WEST, 10, TRUE)
- INVOKE_ASYNC(src, .proc/shockwave, EAST, 10, TRUE)
+ INVOKE_ASYNC(src, PROC_REF(shockwave), WEST, 10, TRUE)
+ INVOKE_ASYNC(src, PROC_REF(shockwave), EAST, 10, TRUE)
sleep(7)
- INVOKE_ASYNC(src, .proc/shockwave, NORTH, 10, TRUE)
- INVOKE_ASYNC(src, .proc/shockwave, SOUTH, 10, TRUE)
+ INVOKE_ASYNC(src, PROC_REF(shockwave), NORTH, 10, TRUE)
+ INVOKE_ASYNC(src, PROC_REF(shockwave), SOUTH, 10, TRUE)
animate(src, color = initial(color), time = 5)
special = FALSE
if(50 to INFINITY)
if(prob(75))
if(prob(60))
- INVOKE_ASYNC(src, .proc/plasmaburst, target)
+ INVOKE_ASYNC(src, PROC_REF(plasmaburst), target)
special = TRUE
animate(src, color = "#ff0000", time = 3)
sleep(5)
- INVOKE_ASYNC(src, .proc/shockwave, src.dir, 15)
+ INVOKE_ASYNC(src, PROC_REF(shockwave), src.dir, 15)
if(prob(60))
sleep(5)
- INVOKE_ASYNC(src, .proc/plasmaburst, target)
+ INVOKE_ASYNC(src, PROC_REF(plasmaburst), target)
sleep(5)
- INVOKE_ASYNC(src, .proc/plasmaburst, target)
+ INVOKE_ASYNC(src, PROC_REF(plasmaburst), target)
if(prob(50))
sleep(5)
- INVOKE_ASYNC(src, .proc/plasmaburst, target)
+ INVOKE_ASYNC(src, PROC_REF(plasmaburst), target)
animate(src, color = initial(color), time = 3)
special = FALSE
else
@@ -129,11 +129,11 @@
animate(src, color = "#ff0000", time = 3)
special = TRUE
sleep(3)
- INVOKE_ASYNC(src, .proc/plasmaburst, left, TRUE)
- INVOKE_ASYNC(src, .proc/plasmaburst, right, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(plasmaburst), left, TRUE)
+ INVOKE_ASYNC(src, PROC_REF(plasmaburst), right, FALSE)
sleep(3)
- INVOKE_ASYNC(src, .proc/plasmashot, up, FALSE)
- INVOKE_ASYNC(src, .proc/plasmashot, down, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(plasmashot), up, FALSE)
+ INVOKE_ASYNC(src, PROC_REF(plasmashot), down, FALSE)
sleep(10)
animate(src, color = initial(color), time = 3)
special = FALSE
@@ -142,13 +142,13 @@
sleep(3)
special = TRUE
for(var/dire in GLOB.cardinals)
- INVOKE_ASYNC(src, .proc/shockwave, dire, 7, TRUE, 3)
+ INVOKE_ASYNC(src, PROC_REF(shockwave), dire, 7, TRUE, 3)
sleep(6)
animate(src, color = initial(color), time = 3)
special = FALSE
else
special = TRUE
- INVOKE_ASYNC(src, .proc/ultishockwave, 7, 5)
+ INVOKE_ASYNC(src, PROC_REF(ultishockwave), 7, 5)
sleep(10)
special = FALSE
diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/candy.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/candy.dm
index 8372abd7a2..f90d59a45c 100644
--- a/modular_sand/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/candy.dm
+++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/candy.dm
@@ -116,7 +116,7 @@
new /obj/effect/temp_visual/dir_setting/bloodsplatter/candy(T, get_dir(T, target))
T = get_step(T, dir_to_target)
sleep(1)
- addtimer(CALLBACK(src, .proc/blood_charge_2, dir_to_target, 0), 5)
+ addtimer(CALLBACK(src, PROC_REF(blood_charge_2), dir_to_target, 0), 5)
/mob/living/simple_animal/hostile/asteroid/elite/candy/proc/bloodytrap(mob/target)
playsound(src,'sound/magic/Blind.ogg', 200, 1)
@@ -229,7 +229,7 @@
//L.Paralyze(20)
L.Stun(20) //substituting this for the Paralyze from the line above, because we don't have tg paralysis stuff
L.adjustBruteLoss(50)
- addtimer(CALLBACK(src, .proc/blood_charge_2, move_dir, (times_ran + 1)), 2)
+ addtimer(CALLBACK(src, PROC_REF(blood_charge_2), move_dir, (times_ran + 1)), 2)
/obj/effect/temp_visual/dir_setting/bloodsplatter/candy
duration = 10
diff --git a/modular_sand/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/drakeling.dm b/modular_sand/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/drakeling.dm
index d479633027..b9091a4c7c 100644
--- a/modular_sand/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/drakeling.dm
+++ b/modular_sand/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/drakeling.dm
@@ -114,7 +114,7 @@
/mob/living/simple_animal/hostile/asteroid/elite/drakeling/proc/lava_around()
ranged_cooldown = world.time + 50
for(var/d in GLOB.cardinals)
- INVOKE_ASYNC(src, .proc/lava_wall, d, 5)
+ INVOKE_ASYNC(src, PROC_REF(lava_wall), d, 5)
/mob/living/simple_animal/hostile/asteroid/elite/drakeling/proc/fire_spew()
ranged_cooldown = world.time + 25
@@ -129,7 +129,7 @@
visible_message(span_boldwarning("[src] violently puffs smoke!They're going to make a fire moat!"))
sleep(5)
for(var/d in GLOB.alldirs)
- INVOKE_ASYNC(src, .proc/fire_wall, d, 10)
+ INVOKE_ASYNC(src, PROC_REF(fire_wall), d, 10)
// Drakeling helpers
diff --git a/modular_sand/code/modules/resize/resizing.dm b/modular_sand/code/modules/resize/resizing.dm
index 913fcbb294..baa473188c 100644
--- a/modular_sand/code/modules/resize/resizing.dm
+++ b/modular_sand/code/modules/resize/resizing.dm
@@ -66,7 +66,7 @@
user.forceMove(target.loc)
user.sizediffStamLoss(target)
user.add_movespeed_modifier(/datum/movespeed_modifier/stomp, TRUE) //Full stop
- addtimer(CALLBACK(user, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP, TRUE), 3) //0.3 seconds
+ addtimer(CALLBACK(user, TYPE_PROC_REF(/mob, remove_movespeed_modifier), MOVESPEED_ID_STOMP, TRUE), 3) //0.3 seconds
if(iscarbon(user))
if(istype(user) && user.dna.features["taur"] == "Naga" || user.dna.features["taur"] == "Tentacle")
target.visible_message(span_danger("[src] carefully rolls their tail over [target]!"), span_danger("[src]'s huge tail rolls over you!"))
@@ -81,7 +81,7 @@
user.sizediffBruteloss(target)
playsound(loc, 'sound/misc/splort.ogg', 50, 1)
user.add_movespeed_modifier(/datum/movespeed_modifier/stomp, TRUE)
- addtimer(CALLBACK(user, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP, TRUE), 10) //1 second
+ addtimer(CALLBACK(user, TYPE_PROC_REF(/mob, remove_movespeed_modifier), MOVESPEED_ID_STOMP, TRUE), 10) //1 second
//user.Stun(20)
if(iscarbon(user))
if(istype(user) && (user.dna.features["taur"] == "Naga" || user.dna.features["taur"] == "Tentacle"))
@@ -96,7 +96,7 @@
user.sizediffStamLoss(target)
user.sizediffStun(target)
user.add_movespeed_modifier(/datum/movespeed_modifier/stomp, TRUE)
- addtimer(CALLBACK(user, /mob/.proc/remove_movespeed_modifier, MOVESPEED_ID_STOMP, TRUE), 7)//About 3/4th a second
+ addtimer(CALLBACK(user, TYPE_PROC_REF(/mob, remove_movespeed_modifier), MOVESPEED_ID_STOMP, TRUE), 7)//About 3/4th a second
if(iscarbon(user))
var/feetCover = (user.wear_suit && (user.wear_suit.body_parts_covered & FEET)) || (user.w_uniform && (user.w_uniform.body_parts_covered & FEET) || (user.shoes && (user.shoes.body_parts_covered & FEET)))
if(feetCover)
diff --git a/modular_sand/code/modules/ruins/lavalandruin_code/doom.dm b/modular_sand/code/modules/ruins/lavalandruin_code/doom.dm
index b693d9b840..ec389af312 100644
--- a/modular_sand/code/modules/ruins/lavalandruin_code/doom.dm
+++ b/modular_sand/code/modules/ruins/lavalandruin_code/doom.dm
@@ -78,8 +78,8 @@
for(var/mob/living/simple_animal/hostile/asteroid/elite/candy/C in view(15))
candylist += C
if(candylist.len)
- INVOKE_ASYNC(src, /obj/machinery/door/airlock/titanium/doomed/locked.proc/close)
- addtimer(CALLBACK(src, .proc/bolt), 5)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/machinery/door/airlock/titanium/doomed/locked, close))
+ addtimer(CALLBACK(src, PROC_REF(bolt)), 5)
/obj/machinery/door/airlock/titanium/doomed/locked/process()
. = ..()
diff --git a/modular_sand/code/modules/ruins/lavalandruin_code/misc.dm b/modular_sand/code/modules/ruins/lavalandruin_code/misc.dm
index d001b41fda..862f290bd3 100644
--- a/modular_sand/code/modules/ruins/lavalandruin_code/misc.dm
+++ b/modular_sand/code/modules/ruins/lavalandruin_code/misc.dm
@@ -73,7 +73,7 @@
/obj/effect/wrath/Initialize(mapload)
. = ..()
megalist = list("Cockblock", "Cockblock", "Cockblock") //cockblock just to be sure that no one goes through the wrath wall in the 10 minute grace period
- addtimer(CALLBACK(src, .proc/updatemegalist), 6000) //10 minutes delay so that all megafauna can spawn and etc.
+ addtimer(CALLBACK(src, PROC_REF(updatemegalist)), 6000) //10 minutes delay so that all megafauna can spawn and etc.
/obj/effect/wrath/proc/updatemegalist()
megalist = list()
diff --git a/modular_splurt/code/__HELPERS/icons.dm b/modular_splurt/code/__HELPERS/icons.dm
index 9a242ca805..8b1374c1be 100644
--- a/modular_splurt/code/__HELPERS/icons.dm
+++ b/modular_splurt/code/__HELPERS/icons.dm
@@ -38,7 +38,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.
diff --git a/modular_splurt/code/controllers/subsystem/shuttle.dm b/modular_splurt/code/controllers/subsystem/shuttle.dm
index 1f3079bf2a..3a403c9f77 100644
--- a/modular_splurt/code/controllers/subsystem/shuttle.dm
+++ b/modular_splurt/code/controllers/subsystem/shuttle.dm
@@ -1,6 +1,6 @@
/datum/controller/subsystem/shuttle/Initialize(timeofday)
. = ..(timeofday)
- SSticker.OnRoundend(CALLBACK(src, .proc/roundend_callback))
+ SSticker.OnRoundend(CALLBACK(src, PROC_REF(roundend_callback)))
/datum/controller/subsystem/shuttle/proc/roundend_callback()
SSshuttle.navigation_locked_traits.Remove(ZTRAIT_CENTCOM)
diff --git a/modular_splurt/code/controllers/subsystem/ticker.dm b/modular_splurt/code/controllers/subsystem/ticker.dm
index a2fd4a9be9..47143d49bf 100644
--- a/modular_splurt/code/controllers/subsystem/ticker.dm
+++ b/modular_splurt/code/controllers/subsystem/ticker.dm
@@ -3,4 +3,4 @@
for(var/mob/dead/new_player/player in GLOB.player_list)
if(player.ready == PLAYER_READY_TO_OBSERVE && player.mind && !(player.client?.prefs.toggles & TG_PLAYER_PANEL))
//Break chain since this has a sleep input in it
- addtimer(CALLBACK(player, /mob/dead/new_player.proc/make_me_an_observer), 1)
+ addtimer(CALLBACK(player, TYPE_PROC_REF(/mob/dead/new_player, make_me_an_observer)), 1)
diff --git a/modular_splurt/code/datums/components/dullahan.dm b/modular_splurt/code/datums/components/dullahan.dm
index 6fae1b981d..088183fa21 100644
--- a/modular_splurt/code/datums/components/dullahan.dm
+++ b/modular_splurt/code/datums/components/dullahan.dm
@@ -29,7 +29,7 @@
src.color = "#[fire_color]"
lit(color)
- RegisterSignal(parent, COMSIG_MOB_DEATH, .proc/unlit)
+ RegisterSignal(parent, COMSIG_MOB_DEATH, PROC_REF(unlit))
// RegisterSignal(parent, COMSIG_MOB_LIFE)
/datum/component/neckfire/proc/lit(fire_color)
@@ -91,8 +91,8 @@
/datum/component/dullahan/Initialize()
. = ..()
- RegisterSignal(dullahan_head, COMSIG_MOUSEDROPPED_ONTO, .proc/on_mouse_dropped)
- RegisterSignal(dullahan_head, COMSIG_MOUSEDROP_ONTO, .proc/on_mouse_drop)
+ RegisterSignal(dullahan_head, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(on_mouse_dropped))
+ RegisterSignal(dullahan_head, COMSIG_MOUSEDROP_ONTO, PROC_REF(on_mouse_drop))
/datum/component/dullahan/proc/add_head_accessory(obj/item/clothing/I, item_path)
head_accessory_MA = mutable_appearance(I.mob_overlay_icon || HEAD_ACCESSORIES_PATHS[item_path])
diff --git a/modular_splurt/code/datums/components/organ_inflation.dm b/modular_splurt/code/datums/components/organ_inflation.dm
index b6d3540032..9a855f8f7b 100644
--- a/modular_splurt/code/datums/components/organ_inflation.dm
+++ b/modular_splurt/code/datums/components/organ_inflation.dm
@@ -32,7 +32,7 @@
inflate_organ(size - old_size)
/datum/component/organ_inflation/RegisterWithParent()
- RegisterSignal(parent, COMSIG_ATOM_ENTERING, .proc/on_entering)
+ RegisterSignal(parent, COMSIG_ATOM_ENTERING, PROC_REF(on_entering))
if(container)
register_container()
@@ -42,8 +42,8 @@
unregister_container()
/datum/component/organ_inflation/proc/register_container()
- RegisterSignal(container, COMSIG_ORGAN_INSERTED, .proc/on_inserted)
- RegisterSignal(container, COMSIG_ORGAN_REMOVED, .proc/on_removed)
+ RegisterSignal(container, COMSIG_ORGAN_INSERTED, PROC_REF(on_inserted))
+ RegisterSignal(container, COMSIG_ORGAN_REMOVED, PROC_REF(on_removed))
/datum/component/organ_inflation/proc/unregister_container()
UnregisterSignal(container, COMSIG_ORGAN_REMOVED)
diff --git a/modular_splurt/code/datums/components/pregnancy.dm b/modular_splurt/code/datums/components/pregnancy.dm
index eb0e9398a5..118dea9246 100644
--- a/modular_splurt/code/datums/components/pregnancy.dm
+++ b/modular_splurt/code/datums/components/pregnancy.dm
@@ -97,11 +97,11 @@
/datum/component/pregnancy/RegisterWithParent()
if(carrier)
register_carrier()
- RegisterSignal(parent, COMSIG_ATOM_ENTERING, .proc/on_entering)
- RegisterSignal(parent, COMSIG_OBJ_BREAK, .proc/on_obj_break)
- RegisterSignal(parent, COMSIG_OBJ_WRITTEN_ON, .proc/name_egg)
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/handle_hatch)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/eg_status)
+ RegisterSignal(parent, COMSIG_ATOM_ENTERING, PROC_REF(on_entering))
+ RegisterSignal(parent, COMSIG_OBJ_BREAK, PROC_REF(on_obj_break))
+ RegisterSignal(parent, COMSIG_OBJ_WRITTEN_ON, PROC_REF(name_egg))
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_hatch))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(eg_status))
/datum/component/pregnancy/UnregisterFromParent()
if(carrier)
@@ -113,12 +113,12 @@
UnregisterSignal(parent, COMSIG_PARENT_EXAMINE)
/datum/component/pregnancy/proc/register_carrier()
- RegisterSignal(carrier, COMSIG_MOB_DEATH, .proc/fetus_mortus)
- RegisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE, .proc/handle_life)
- RegisterSignal(carrier, COMSIG_HEALTH_SCAN, .proc/on_scan)
- RegisterSignal(carrier, COMSIG_MOB_APPLY_DAMAGE, .proc/handle_damage)
+ RegisterSignal(carrier, COMSIG_MOB_DEATH, PROC_REF(fetus_mortus))
+ RegisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE, PROC_REF(handle_life))
+ RegisterSignal(carrier, COMSIG_HEALTH_SCAN, PROC_REF(on_scan))
+ RegisterSignal(carrier, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(handle_damage))
if(oviposition)
- RegisterSignal(carrier, COMSIG_MOB_CLIMAX, .proc/on_climax)
+ RegisterSignal(carrier, COMSIG_MOB_CLIMAX, PROC_REF(on_climax))
/datum/component/pregnancy/proc/unregister_carrier()
UnregisterSignal(carrier, COMSIG_MOB_DEATH)
@@ -227,7 +227,7 @@
if(stage < max_stage)
return
- INVOKE_ASYNC(src, .proc/hatch, source, I, user, params)
+ INVOKE_ASYNC(src, PROC_REF(hatch), source, I, user, params)
/datum/component/pregnancy/proc/hatch(datum/source, obj/item/I, mob/user, params)
if(!COOLDOWN_FINISHED(src, hatch_request_cooldown))
diff --git a/modular_splurt/code/datums/components/pregnancy_inert.dm b/modular_splurt/code/datums/components/pregnancy_inert.dm
index fa8ccbb358..5d8e264320 100644
--- a/modular_splurt/code/datums/components/pregnancy_inert.dm
+++ b/modular_splurt/code/datums/components/pregnancy_inert.dm
@@ -18,14 +18,14 @@
carrier = genital.owner
/datum/component/ovipositor/RegisterWithParent()
- RegisterSignal(parent, COMSIG_ORGAN_INSERTED, .proc/on_inserted)
- RegisterSignal(parent, COMSIG_ORGAN_REMOVED, .proc/on_removed)
+ RegisterSignal(parent, COMSIG_ORGAN_INSERTED, PROC_REF(on_inserted))
+ RegisterSignal(parent, COMSIG_ORGAN_REMOVED, PROC_REF(on_removed))
if(carrier)
register_carrier()
/datum/component/ovipositor/proc/register_carrier()
- RegisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE, .proc/handle_life)
- RegisterSignal(carrier, COMSIG_MOB_CLIMAX, .proc/on_climax)
+ RegisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE, PROC_REF(handle_life))
+ RegisterSignal(carrier, COMSIG_MOB_CLIMAX, PROC_REF(on_climax))
/datum/component/ovipositor/proc/unregister_carrier()
UnregisterSignal(carrier, COMSIG_LIVING_BIOLOGICAL_LIFE)
diff --git a/modular_splurt/code/datums/components/size_normalized.dm b/modular_splurt/code/datums/components/size_normalized.dm
index f3d675d187..bde5b16c7e 100644
--- a/modular_splurt/code/datums/components/size_normalized.dm
+++ b/modular_splurt/code/datums/components/size_normalized.dm
@@ -22,7 +22,7 @@
wearer.flash_lighting_fx(3, 3, LIGHT_COLOR_PURPLE)
wearer.visible_message(span_warning("A flash of purple light engulfs \the [wearer], before [wearer.p_they()] jump[wearer.p_s()] to a more average size!"),span_notice("You feel warm for a moment, before everything scales to your size..."))
wearer.update_size(normal_resize)
- RegisterSignal(wearer, COMSIG_MOB_RESIZED, .proc/normalize_size)
+ RegisterSignal(wearer, COMSIG_MOB_RESIZED, PROC_REF(normalize_size))
//Denormalize the mob when the component is destroyed (if needed)
/datum/component/size_normalized/UnregisterFromParent()
diff --git a/modular_splurt/code/datums/elements/crawl_under.dm b/modular_splurt/code/datums/elements/crawl_under.dm
index 42b31b7c7b..f4f741e6fc 100644
--- a/modular_splurt/code/datums/elements/crawl_under.dm
+++ b/modular_splurt/code/datums/elements/crawl_under.dm
@@ -11,9 +11,9 @@
if(!isstructure(target)) //it would work up to movable but no.
return ELEMENT_INCOMPATIBLE //if any machinery comes up feel free to move up to /obj
- RegisterSignal(target, COMSIG_MOUSEDROPPED_ONTO, .proc/check_crawl)
- RegisterSignal(target, COMVER_CRAWL_UNDER, .proc/Affirm)
- RegisterSignal(target, COMSIG_MOVABLE_UNCROSSED, .proc/uncrawl_from)
+ RegisterSignal(target, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(check_crawl))
+ RegisterSignal(target, COMVER_CRAWL_UNDER, PROC_REF(Affirm))
+ RegisterSignal(target, COMSIG_MOVABLE_UNCROSSED, PROC_REF(uncrawl_from))
/datum/element/crawl_under/Detach(datum/source, force)
var/obj/object = source //if src somehow changes type fuck you
@@ -42,7 +42,7 @@
if((user.pass_flags & PASSCRAWL) || HAS_TRAIT_FROM(user, TRAIT_FLOORED, ELEMENT_CRAWL_UNDER)) //already under
return
- INVOKE_ASYNC(src, .proc/do_crawl, source, user)
+ INVOKE_ASYNC(src, PROC_REF(do_crawl), source, user)
return COMSIG_MOB_CANCEL_CLICKON
/datum/element/crawl_under/proc/do_crawl(obj/structure/source, mob/living/user)
diff --git a/modular_splurt/code/datums/elements/smalltalk.dm b/modular_splurt/code/datums/elements/smalltalk.dm
index 9ffa626757..1ca6778c1d 100644
--- a/modular_splurt/code/datums/elements/smalltalk.dm
+++ b/modular_splurt/code/datums/elements/smalltalk.dm
@@ -7,7 +7,7 @@
if(!(isliving(target) || (force && istype(target, /atom/movable))))
return ELEMENT_INCOMPATIBLE
- RegisterSignal(target, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(target, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/element/smalltalk/Detach(datum/source, force)
. = ..()
diff --git a/modular_splurt/code/datums/traits/good.dm b/modular_splurt/code/datums/traits/good.dm
index bda66bb62f..71d0709476 100644
--- a/modular_splurt/code/datums/traits/good.dm
+++ b/modular_splurt/code/datums/traits/good.dm
@@ -68,8 +68,8 @@
/datum/quirk/dominant_aura/add()
. = ..()
- RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/on_examine_holder)
- RegisterSignal(quirk_holder, COMSIG_MOB_EMOTE, .proc/handle_snap)
+ RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine_holder))
+ RegisterSignal(quirk_holder, COMSIG_MOB_EMOTE, PROC_REF(handle_snap))
/datum/quirk/dominant_aura/remove()
. = ..()
@@ -219,7 +219,7 @@
quirk_mob.mind.isholy = TRUE
// Add examine text.
- RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/on_examine_holder)
+ RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine_holder))
/datum/quirk/hallowed/remove()
// Define quirk mob.
@@ -314,7 +314,7 @@
quirk_mob.grant_language(/datum/language/vampiric, TRUE, TRUE, LANGUAGE_BLOODSUCKER)
// Register examine text
- RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/quirk_examine_bloodfledge)
+ RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, PROC_REF(quirk_examine_bloodfledge))
/datum/quirk/bloodfledge/post_add()
// Define quirk mob
diff --git a/modular_splurt/code/datums/traits/negative.dm b/modular_splurt/code/datums/traits/negative.dm
index 3dbcb24d0a..ad7d617a34 100644
--- a/modular_splurt/code/datums/traits/negative.dm
+++ b/modular_splurt/code/datums/traits/negative.dm
@@ -6,7 +6,7 @@
/datum/quirk/social_anxiety/add()
. = ..()
- RegisterSignal(quirk_holder, COMSIG_MOB_SAY, .proc/handle_speech)
+ RegisterSignal(quirk_holder, COMSIG_MOB_SAY, PROC_REF(handle_speech))
/datum/quirk/social_anxiety/remove()
. = ..()
@@ -137,7 +137,7 @@
/datum/quirk/dumb4cum/add()
// Set timer
- timer = addtimer(CALLBACK(src, .proc/crave), timer_trigger, TIMER_STOPPABLE)
+ timer = addtimer(CALLBACK(src, PROC_REF(crave)), timer_trigger, TIMER_STOPPABLE)
/datum/quirk/dumb4cum/remove()
// Remove status trait
@@ -198,7 +198,7 @@
timer = null
// Add new timer
- timer = addtimer(CALLBACK(src, .proc/crave), timer_trigger, TIMER_STOPPABLE)
+ timer = addtimer(CALLBACK(src, PROC_REF(crave)), timer_trigger, TIMER_STOPPABLE)
// Small issue with this. If the quirk holder has NO_HUNGER or NO_THIRST, this trait can still be taken and they will still get the benefits of it.
// It's unlikely that someone will be both, especially at round start, but vampirism makes me wary of having these separate.
diff --git a/modular_splurt/code/datums/traits/neutral.dm b/modular_splurt/code/datums/traits/neutral.dm
index 71ce89550f..53ff566403 100644
--- a/modular_splurt/code/datums/traits/neutral.dm
+++ b/modular_splurt/code/datums/traits/neutral.dm
@@ -94,7 +94,7 @@
act_hypno.Grant(quirk_mob)
// Add examine text
- RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/on_examine_holder)
+ RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine_holder))
/datum/quirk/Hypnotic_gaze/remove()
// Define quirk mob
@@ -255,7 +255,7 @@
/datum/quirk/well_trained/add()
. = ..()
- RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/on_examine_holder)
+ RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine_holder))
/datum/quirk/well_trained/remove()
. = ..()
@@ -573,8 +573,8 @@
/datum/quirk/nudist/add()
// Register signal handlers
- RegisterSignal(quirk_holder, COMSIG_MOB_UPDATE_GENITALS, .proc/check_outfit)
- RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, .proc/quirk_examine_nudist)
+ RegisterSignal(quirk_holder, COMSIG_MOB_UPDATE_GENITALS, PROC_REF(check_outfit))
+ RegisterSignal(quirk_holder, COMSIG_PARENT_EXAMINE, PROC_REF(quirk_examine_nudist))
/datum/quirk/nudist/remove()
// Remove mood event
diff --git a/modular_splurt/code/game/atoms_movable.dm b/modular_splurt/code/game/atoms_movable.dm
index 8a492636a2..072c3a9178 100644
--- a/modular_splurt/code/game/atoms_movable.dm
+++ b/modular_splurt/code/game/atoms_movable.dm
@@ -1,6 +1,6 @@
/atom/movable/Initialize(mapload)
. = ..()
- RegisterSignal(src, COMSIG_MOVABLE_BARK, .proc/handle_special_bark) //There must be a better way to do this
+ RegisterSignal(src, COMSIG_MOVABLE_BARK, PROC_REF(handle_special_bark)) //There must be a better way to do this
/atom/movable/Destroy()
UnregisterSignal(src, COMSIG_MOVABLE_BARK)
diff --git a/modular_splurt/code/game/machinery/computer/slavery.dm b/modular_splurt/code/game/machinery/computer/slavery.dm
index a760384d4d..d931121ef4 100644
--- a/modular_splurt/code/game/machinery/computer/slavery.dm
+++ b/modular_splurt/code/game/machinery/computer/slavery.dm
@@ -281,7 +281,7 @@
editBalance(-SG.cost)
radioAnnounce("Supplies inbound: [SG.name]")
- addtimer(CALLBACK(src, .proc/dropSupplies, SG.build_path), rand(3,6) * 10)
+ addtimer(CALLBACK(src, PROC_REF(dropSupplies), SG.build_path), rand(3,6) * 10)
return TRUE
diff --git a/modular_splurt/code/game/machinery/research_table.dm b/modular_splurt/code/game/machinery/research_table.dm
index 50888edf76..b98266d797 100644
--- a/modular_splurt/code/game/machinery/research_table.dm
+++ b/modular_splurt/code/game/machinery/research_table.dm
@@ -109,7 +109,7 @@
return TRUE
/obj/machinery/research_table/buckle_mob(mob/living/buckled_mob, force, check_loc)
- RegisterSignal(buckled_mob, COMSIG_MOB_POST_CAME, .proc/on_cum)
+ RegisterSignal(buckled_mob, COMSIG_MOB_POST_CAME, PROC_REF(on_cum))
say("New user detected, tracking data.")
. = ..()
diff --git a/modular_splurt/code/game/objects/items/RCD.dm b/modular_splurt/code/game/objects/items/RCD.dm
index e8bc24ae5b..9a813dbbb9 100644
--- a/modular_splurt/code/game/objects/items/RCD.dm
+++ b/modular_splurt/code/game/objects/items/RCD.dm
@@ -30,7 +30,7 @@
"Glass" = image(icon = 'icons/obj/smooth_structures/glass_table.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)
diff --git a/modular_splurt/code/game/objects/items/RTL.dm b/modular_splurt/code/game/objects/items/RTL.dm
index 6db6eb7306..3e0cbc65b4 100644
--- a/modular_splurt/code/game/objects/items/RTL.dm
+++ b/modular_splurt/code/game/objects/items/RTL.dm
@@ -13,8 +13,8 @@
/obj/item/rtl/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))
update_icon()
/obj/item/rtl/ComponentInitialize()
@@ -97,7 +97,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/rtl/proc/trigger(mob/user)
diff --git a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/chastity_belt.dm b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/chastity_belt.dm
index b0e76c32e3..54e67ce3f1 100644
--- a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/chastity_belt.dm
+++ b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/chastity_belt.dm
@@ -109,7 +109,7 @@
ENABLE_BITFIELD(G.genital_flags, GENITAL_CHASTENED)
H.update_genitals()
- RegisterSignal(src, COMSIG_MOB_ITEM_DROPPING, .proc/mob_can_unequip)
+ RegisterSignal(src, COMSIG_MOB_ITEM_DROPPING, PROC_REF(mob_can_unequip))
/obj/item/clothing/underwear/chastity_belt/proc/mob_can_unequip(obj/item/source, force, newloc, no_move, invdrop, silent)
if(force)
diff --git a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/chastity_cage.dm b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/chastity_cage.dm
index 89ca149952..642d859fa9 100644
--- a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/chastity_cage.dm
+++ b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/chastity_cage.dm
@@ -99,8 +99,8 @@
is_overlay_on = TRUE
H.update_genitals()
- RegisterSignal(H, COMSIG_MOB_ITEM_EQUIPPED, .proc/mob_equipped_item)
- RegisterSignal(H, COMSIG_MOB_ITEM_DROPPED, .proc/mob_dropped_item)
+ RegisterSignal(H, COMSIG_MOB_ITEM_EQUIPPED, PROC_REF(mob_equipped_item))
+ RegisterSignal(H, COMSIG_MOB_ITEM_DROPPED, PROC_REF(mob_dropped_item))
/obj/item/genital_equipment/chastity_cage/item_removing(datum/source, obj/item/organ/genital/G, mob/user)
. = TRUE
diff --git a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/metal_chastity_cage.dm b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/metal_chastity_cage.dm
index d99f9a2674..db24db1962 100644
--- a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/metal_chastity_cage.dm
+++ b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/chastity/metal_chastity_cage.dm
@@ -13,7 +13,7 @@
. = ..() // Call the parent proc
var/mob/living/carbon/human/H = G.owner
- RegisterSignal(H, COMSIG_MOVABLE_MOVED, .proc/on_move)
+ RegisterSignal(H, COMSIG_MOVABLE_MOVED, PROC_REF(on_move))
skin_overlay = mutable_appearance(icon, "worn_[icon_state]_[cage_sprite]_skin", skin_overlay_layer)
skin_overlay.color = G.color
diff --git a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/genital_equipment.dm b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/genital_equipment.dm
index 428b16cafc..ba5817fd5a 100644
--- a/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/genital_equipment.dm
+++ b/modular_splurt/code/game/objects/items/lewd_items/genital_equipment/genital_equipment.dm
@@ -5,10 +5,10 @@
/obj/item/genital_equipment/ComponentInitialize()
. = ..()
var/list/procs_list = list(
- "before_inserting" = CALLBACK(src, .proc/item_inserting),
- "after_inserting" = CALLBACK(src, .proc/item_inserted),
- "before_removing" = CALLBACK(src, .proc/item_removing),
- "after_removing" = CALLBACK(src, .proc/item_removed)
+ "before_inserting" = CALLBACK(src, PROC_REF(item_inserting)),
+ "after_inserting" = CALLBACK(src, PROC_REF(item_inserted)),
+ "before_removing" = CALLBACK(src, PROC_REF(item_removing)),
+ "after_removing" = CALLBACK(src, PROC_REF(item_removed))
)
AddComponent(/datum/component/genital_equipment, genital_slot, procs_list)
equipment = GetComponent(/datum/component/genital_equipment)
diff --git a/modular_splurt/code/game/objects/items/lewd_items/leash.dm b/modular_splurt/code/game/objects/items/lewd_items/leash.dm
index 88ed837f87..bd661fd00c 100644
--- a/modular_splurt/code/game/objects/items/lewd_items/leash.dm
+++ b/modular_splurt/code/game/objects/items/lewd_items/leash.dm
@@ -45,8 +45,8 @@ Icons, maybe?
/datum/status_effect/leash_pet/on_apply()
- //redirect_component = WEAKREF(owner.AddComponent(/datum/component/redirect, list(COMSIG_LIVING_RESIST = CALLBACK(src, .proc/owner_resist))))
- RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/owner_resist)
+ //redirect_component = WEAKREF(owner.AddComponent(/datum/component/redirect, list(COMSIG_LIVING_RESIST = CALLBACK(src, PROC_REF(owner_resist)))))
+ RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(owner_resist))
redirect_component = owner
if(!owner.stat)
to_chat(owner, span_userdanger("You have been leashed!"))
@@ -103,11 +103,11 @@ Icons, maybe?
user.apply_status_effect(/datum/status_effect/leash_dom) //Is the leasher
leash_pet = C //Save pet reference for later
leash_master = user //Save dom reference for later
- //mobhook_leash_pet = leash_pet.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/on_pet_move)))
- RegisterSignal(leash_pet, COMSIG_MOVABLE_MOVED, .proc/on_pet_move)
+ //mobhook_leash_pet = leash_pet.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, PROC_REF(on_pet_move))))
+ RegisterSignal(leash_pet, COMSIG_MOVABLE_MOVED, PROC_REF(on_pet_move))
mobhook_leash_pet = leash_pet
- //mobhook_leash_master = leash_master.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/on_master_move)))
- RegisterSignal(leash_master, COMSIG_MOVABLE_MOVED, .proc/on_master_move)
+ //mobhook_leash_master = leash_master.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, PROC_REF(on_master_move))))
+ RegisterSignal(leash_master, COMSIG_MOVABLE_MOVED, PROC_REF(on_master_move))
mobhook_leash_master = leash_master
leash_used = 1
if(!leash_pet.has_status_effect(/datum/status_effect/leash_dom)) //Add slowdown if the pet didn't leash themselves
@@ -339,7 +339,7 @@ Icons, maybe?
if(leash_master == "null")
return
//Dropping procs any time the leash changes slots. So, we will wait a tick and see if the leash was actually dropped
- addtimer(CALLBACK(src, .proc/drop_effects, user, silent), 1)
+ addtimer(CALLBACK(src, PROC_REF(drop_effects), user, silent), 1)
/obj/item/leash/proc/drop_effects(mob/user, silent)
if(leash_master.is_holding_item_of_type(/obj/item/leash) || istype(leash_master.get_item_by_slot(ITEM_SLOT_BELT), /obj/item/leash))
@@ -348,8 +348,8 @@ Icons, maybe?
viewing.show_message(span_notice("[leash_master] has dropped the leash."), 1)
//DOM HAS DROPPED LEASH. PET IS FREE. SCP HAS BREACHED CONTAINMENT.
leash_pet.remove_movespeed_modifier(MOVESPEED_ID_LEASH)
- //mobhook_leash_freepet = leash_pet.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/on_freepet_move)))
- RegisterSignal(leash_pet, COMSIG_MOVABLE_MOVED, .proc/on_freepet_move)
+ //mobhook_leash_freepet = leash_pet.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, PROC_REF(on_freepet_move))))
+ RegisterSignal(leash_pet, COMSIG_MOVABLE_MOVED, PROC_REF(on_freepet_move))
mobhook_leash_freepet = leash_pet
leash_master.remove_status_effect(/datum/status_effect/leash_dom) //No dom with no leash. We will get a new dom if the leash is picked back up.
leash_master = "null"
@@ -360,7 +360,7 @@ Icons, maybe?
. = ..()
if(leash_used == 0) //Don't apply statuses with a fresh leash. Keeps things clean on the backend.
return
- addtimer(CALLBACK(src, .proc/equip_effects, user), 2)
+ addtimer(CALLBACK(src, PROC_REF(equip_effects), user), 2)
/obj/item/leash/proc/equip_effects(mob/user)
if(leash_pet == "null")
@@ -370,8 +370,8 @@ Icons, maybe?
leash_master = "null"
return
leash_master.apply_status_effect(/datum/status_effect/leash_dom)
- //mobhook_leash_master = leash_master.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/on_master_move)))
- RegisterSignal(leash_master, COMSIG_MOVABLE_MOVED, .proc/on_master_move)
+ //mobhook_leash_master = leash_master.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, PROC_REF(on_master_move))))
+ RegisterSignal(leash_master, COMSIG_MOVABLE_MOVED, PROC_REF(on_master_move))
mobhook_leash_master = leash_master
leash_pet.remove_status_effect(/datum/status_effect/leash_freepet)
//QDEL_NULL(mobhook_leash_freepet)
diff --git a/modular_splurt/code/game/objects/items/lewd_items/rope.dm b/modular_splurt/code/game/objects/items/lewd_items/rope.dm
index d950844904..c9ffa7d1b0 100644
--- a/modular_splurt/code/game/objects/items/lewd_items/rope.dm
+++ b/modular_splurt/code/game/objects/items/lewd_items/rope.dm
@@ -434,14 +434,14 @@ GLOBAL_LIST_INIT(bondage_rope_slowdowns, list(
roped_mob.clear_cuffs(roped_mob.legcuffed, 0)
roped_mob = new_mob
if(roped_mob != null)
- RegisterSignal(roped_mob, COMSIG_MOVABLE_MOVED, .proc/on_mob_move)
+ RegisterSignal(roped_mob, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_move))
/obj/item/restraints/bondage_rope/proc/set_roped_master(mob/living/carbon/new_master)
if(roped_master != null && roped_mob != roped_master)
UnregisterSignal(roped_master, COMSIG_MOVABLE_MOVED)
roped_master = new_master
if(roped_master != null && roped_mob != roped_master)
- RegisterSignal(roped_master, COMSIG_MOVABLE_MOVED, .proc/on_master_move)
+ RegisterSignal(roped_master, COMSIG_MOVABLE_MOVED, PROC_REF(on_master_move))
/obj/item/restraints/bondage_rope/proc/set_roped_object(obj/new_object, new_object_type)
if(roped_object != null)
@@ -450,7 +450,7 @@ GLOBAL_LIST_INIT(bondage_rope_slowdowns, list(
roped_object_type = new_object_type
set_rope_slowdown(roped_mob)
if(roped_object != null)
- RegisterSignal(roped_object, COMSIG_MOVABLE_MOVED, .proc/on_object_move)
+ RegisterSignal(roped_object, COMSIG_MOVABLE_MOVED, PROC_REF(on_object_move))
// Returns true, if roped mob can tug their object behind them
/obj/item/restraints/bondage_rope/proc/can_move_object()
diff --git a/modular_splurt/code/game/objects/items/lewd_items/vibrator.dm b/modular_splurt/code/game/objects/items/lewd_items/vibrator.dm
index be625903c6..7eeadd3888 100644
--- a/modular_splurt/code/game/objects/items/lewd_items/vibrator.dm
+++ b/modular_splurt/code/game/objects/items/lewd_items/vibrator.dm
@@ -21,8 +21,8 @@
/obj/item/electropack/vibrator/ComponentInitialize()
. = ..()
var/list/procs_list = list(
- "before_inserting" = CALLBACK(src, .proc/item_inserting),
- "after_inserting" = CALLBACK(src, .proc/item_inserted),
+ "before_inserting" = CALLBACK(src, PROC_REF(item_inserting)),
+ "after_inserting" = CALLBACK(src, PROC_REF(item_inserted)),
)
AddComponent(/datum/component/genital_equipment, list(ORGAN_SLOT_VAGINA, ORGAN_SLOT_ANUS, ORGAN_SLOT_PENIS, ORGAN_SLOT_BREASTS, ORGAN_SLOT_BUTT, ORGAN_SLOT_BELLY), procs_list)
diff --git a/modular_splurt/code/game/objects/items/oviposition.dm b/modular_splurt/code/game/objects/items/oviposition.dm
index 466c48b469..ae4458c5ea 100644
--- a/modular_splurt/code/game/objects/items/oviposition.dm
+++ b/modular_splurt/code/game/objects/items/oviposition.dm
@@ -47,8 +47,8 @@ GLOBAL_LIST_INIT(egg_skins, list( \
/obj/item/oviposition_egg/ComponentInitialize()
. = ..()
var/list/procs_list = list(
- "before_inserting" = CALLBACK(src, .proc/item_inserting),
- "after_inserting" = CALLBACK(src, .proc/item_inserted),
+ "before_inserting" = CALLBACK(src, PROC_REF(item_inserting)),
+ "after_inserting" = CALLBACK(src, PROC_REF(item_inserted)),
)
AddComponent(/datum/component/organ_inflation, 0)
AddComponent(/datum/component/genital_equipment, list(ORGAN_SLOT_PENIS, ORGAN_SLOT_WOMB, ORGAN_SLOT_VAGINA, ORGAN_SLOT_TESTICLES, ORGAN_SLOT_BREASTS, ORGAN_SLOT_BELLY, ORGAN_SLOT_BELLY, ORGAN_SLOT_ANUS), procs_list)
diff --git a/modular_splurt/code/game/objects/items/robot/robot_items.dm b/modular_splurt/code/game/objects/items/robot/robot_items.dm
index 125f733903..e1e919eb54 100644
--- a/modular_splurt/code/game/objects/items/robot/robot_items.dm
+++ b/modular_splurt/code/game/objects/items/robot/robot_items.dm
@@ -43,7 +43,7 @@
if(toppaper_ref)
var/obj/item/paper/toppaper = toppaper_ref?.resolve()
UnregisterSignal(toppaper, COMSIG_ATOM_UPDATED_ICON)
- RegisterSignal(new_paper, COMSIG_ATOM_UPDATED_ICON, .proc/on_top_paper_change)
+ RegisterSignal(new_paper, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_top_paper_change))
toppaper_ref = WEAKREF(new_paper)
update_appearance()
to_chat(user, span_notice("[src]'s integrated printer whirs to life, spitting out a fresh piece of paper and clipping it into place."))
diff --git a/modular_splurt/code/game/objects/structures/cannons/cannon.dm b/modular_splurt/code/game/objects/structures/cannons/cannon.dm
index a4e01395da..242606747b 100644
--- a/modular_splurt/code/game/objects/structures/cannons/cannon.dm
+++ b/modular_splurt/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/modular_splurt/code/game/objects/structures/micro_bricks.dm b/modular_splurt/code/game/objects/structures/micro_bricks.dm
index bbd5ad77f6..8728da6804 100644
--- a/modular_splurt/code/game/objects/structures/micro_bricks.dm
+++ b/modular_splurt/code/game/objects/structures/micro_bricks.dm
@@ -9,8 +9,8 @@
/obj/structure/micro_brick/Initialize()
. = ..()
- RegisterSignal(src, COMSIG_PARENT_ATTACKBY, .proc/on_attackby)
- RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, .proc/handatacc)
+ RegisterSignal(src, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, PROC_REF(handatacc))
/obj/structure/micro_brick/proc/on_attackby(datum/source, obj/item/item, mob/user, params)
if(try_crush_microbricks(user))
diff --git a/modular_splurt/code/modules/admin/Transform.dm b/modular_splurt/code/modules/admin/Transform.dm
index 239d17f774..482725bb49 100644
--- a/modular_splurt/code/modules/admin/Transform.dm
+++ b/modular_splurt/code/modules/admin/Transform.dm
@@ -124,4 +124,4 @@ GLOBAL_LIST_INIT(pp_transformables, list(
if (M == adminMob)
adminMob = newMob
- addtimer(CALLBACK(newMob.mob_panel, /datum.proc/ui_interact, adminMob), 0.1 SECONDS)
+ addtimer(CALLBACK(newMob.mob_panel, TYPE_PROC_REF(/datum, ui_interact), adminMob), 0.1 SECONDS)
diff --git a/modular_splurt/code/modules/admin/playtimes.dm b/modular_splurt/code/modules/admin/playtimes.dm
index fbf4217f5d..9fe7ab51ea 100644
--- a/modular_splurt/code/modules/admin/playtimes.dm
+++ b/modular_splurt/code/modules/admin/playtimes.dm
@@ -63,7 +63,7 @@
clients += list(client)
- clients = sort_list(clients, /proc/cmp_playtime)
+ clients = sort_list(clients, GLOBAL_PROC_REF(cmp_playtime))
data["clients"] = clients
return data
*/
diff --git a/modular_splurt/code/modules/antagonists/qareen/qareen.dm b/modular_splurt/code/modules/antagonists/qareen/qareen.dm
index c8087bdf2c..5b6063718e 100644
--- a/modular_splurt/code/modules/antagonists/qareen/qareen.dm
+++ b/modular_splurt/code/modules/antagonists/qareen/qareen.dm
@@ -122,7 +122,7 @@
if(stasis)
return
if(revealed && essence <= 0)
- INVOKE_ASYNC(src, .proc/death)
+ INVOKE_ASYNC(src, PROC_REF(death))
if(unreveal_time && world.time >= unreveal_time)
unreveal_time = 0
revealed = FALSE
@@ -204,7 +204,7 @@
adjustBruteLoss(25) //hella effective
inhibited = TRUE
update_action_buttons_icon()
- addtimer(CALLBACK(src, .proc/reset_inhibit), 30)
+ addtimer(CALLBACK(src, PROC_REF(reset_inhibit)), 30)
/mob/living/simple_animal/qareen/proc/reset_inhibit()
inhibited = FALSE
@@ -372,7 +372,7 @@
/obj/item/ectoplasm/qareen/New()
..()
- addtimer(CALLBACK(src, .proc/try_reform), 600)
+ addtimer(CALLBACK(src, PROC_REF(try_reform)), 600)
/obj/item/ectoplasm/qareen/proc/scatter()
qdel(src)
@@ -481,7 +481,7 @@
log_combat(throwable, over, "spooky telekinesised at", throwable)
var/obj/effect/temp_visual/telekinesis/T = new(get_turf(throwable))
T.color = "#8715b4"
- addtimer(CALLBACK(spooker, /mob/living/simple_animal/qareen.proc/telekinesis_cooldown_end), 50)
+ addtimer(CALLBACK(spooker, TYPE_PROC_REF(/mob/living/simple_animal/qareen, telekinesis_cooldown_end)), 50)
sleep(5)
throwable.float(FALSE, TRUE)
diff --git a/modular_splurt/code/modules/antagonists/qareen/qareen_abilities.dm b/modular_splurt/code/modules/antagonists/qareen/qareen_abilities.dm
index 439d1a2053..678f22e912 100644
--- a/modular_splurt/code/modules/antagonists/qareen/qareen_abilities.dm
+++ b/modular_splurt/code/modules/antagonists/qareen/qareen_abilities.dm
@@ -219,7 +219,7 @@
/obj/effect/proc_holder/spell/aoe_turf/qareen/overload/cast(list/targets, mob/living/simple_animal/qareen/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/qareen/overload/proc/overload(turf/T, mob/user)
for(var/obj/machinery/light/L in T)
@@ -232,7 +232,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/qareen/overload/proc/overload_shock(obj/machinery/light/L, mob/user)
if(!L.on) //wait, wait, don't shock me
@@ -264,7 +264,7 @@
/obj/effect/proc_holder/spell/aoe_turf/qareen/defile/cast(list/targets, mob/living/simple_animal/qareen/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/qareen/defile/proc/defile(turf/T)
for(var/obj/effect/blessing/B in T)
@@ -319,7 +319,7 @@
/obj/effect/proc_holder/spell/aoe_turf/qareen/malfunction/cast(list/targets, mob/living/simple_animal/qareen/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/qareen/malfunction/proc/malfunction(turf/T, mob/user)
for(var/mob/living/simple_animal/bot/bot in T)
@@ -372,7 +372,7 @@
/obj/effect/proc_holder/spell/aoe_turf/qareen/bliss/cast(list/targets, mob/living/simple_animal/qareen/user = usr)
if(attempt_cast(user))
for(var/turf/T in targets)
- INVOKE_ASYNC(src, .proc/bliss, T, user)
+ INVOKE_ASYNC(src, PROC_REF(bliss), T, user)
/obj/effect/proc_holder/spell/aoe_turf/qareen/bliss/proc/bliss(turf/T, mob/user)
for(var/mob/living/mob in T)
diff --git a/modular_splurt/code/modules/antagonists/qareen/qareen_bliss.dm b/modular_splurt/code/modules/antagonists/qareen/qareen_bliss.dm
index 4b9fd83cd6..b136e8d92b 100644
--- a/modular_splurt/code/modules/antagonists/qareen/qareen_bliss.dm
+++ b/modular_splurt/code/modules/antagonists/qareen/qareen_bliss.dm
@@ -66,7 +66,7 @@
affected_mob.visible_message(span_warning("[affected_mob] looks utterly depraved."), span_revennotice("You suddenly feel like your skin is tingling..."))
affected_mob.add_atom_colour("#ffdaf3", TEMPORARY_COLOUR_PRIORITY)
new /obj/effect/temp_visual/revenant(affected_mob.loc)
- // addtimer(CALLBACK(src, .proc/blessings), 150)
+ // addtimer(CALLBACK(src, PROC_REF(blessings)), 150)
if(7)
stage = 6
if (ishuman(affected_mob))
diff --git a/modular_splurt/code/modules/antagonists/slaver/slaver.dm b/modular_splurt/code/modules/antagonists/slaver/slaver.dm
index 7638cc11f3..5748968807 100644
--- a/modular_splurt/code/modules/antagonists/slaver/slaver.dm
+++ b/modular_splurt/code/modules/antagonists/slaver/slaver.dm
@@ -147,7 +147,7 @@ GLOBAL_LIST_INIT(slavers_ransom_values, list(
/datum/antagonist/slaver/get_admin_commands()
. = ..()
- .["Send to base"] = CALLBACK(src,.proc/admin_send_to_base)
+ .["Send to base"] = CALLBACK(src,PROC_REF(admin_send_to_base))
/datum/antagonist/slaver/proc/admin_send_to_base(mob/admin)
owner.current.forceMove(pick(GLOB.slaver_start))
@@ -166,7 +166,7 @@ GLOBAL_LIST_INIT(slavers_ransom_values, list(
if(istype(H))
H.set_antag_target_indicator() // Hide consent of this player, they are an antag and can't be a target
- addtimer(CALLBACK(src, .proc/slavers_name_assign), 1)
+ addtimer(CALLBACK(src, PROC_REF(slavers_name_assign)), 1)
/datum/antagonist/slaver/proc/spawnText()
to_chat(owner, "
You are tasked with infiltrating the station and kidnapping members of the crew. Once brought back to the hideout, they can be collared and priced using the console.")
diff --git a/modular_splurt/code/modules/arousal/arousal.dm b/modular_splurt/code/modules/arousal/arousal.dm
index 593bb9c2e0..21f107076a 100644
--- a/modular_splurt/code/modules/arousal/arousal.dm
+++ b/modular_splurt/code/modules/arousal/arousal.dm
@@ -142,7 +142,7 @@
. = ..()
if(!istype(owner))
return INITIALIZE_HINT_QDEL
- RegisterSignal(owner, COMSIG_MOB_LUST_UPDATED, .proc/update_lust)
+ RegisterSignal(owner, COMSIG_MOB_LUST_UPDATED, PROC_REF(update_lust))
/atom/movable/screen/arousal/Click()
if(!ishuman(usr))
diff --git a/modular_splurt/code/modules/arousal/organs/breasts.dm b/modular_splurt/code/modules/arousal/organs/breasts.dm
index 2be01daa3a..14e677f042 100644
--- a/modular_splurt/code/modules/arousal/organs/breasts.dm
+++ b/modular_splurt/code/modules/arousal/organs/breasts.dm
@@ -5,7 +5,7 @@
. = ..()
if(!.)
return
- RegisterSignal(owner, COMSIG_MOB_POST_CAME, .proc/splash_cum)
+ RegisterSignal(owner, COMSIG_MOB_POST_CAME, PROC_REF(splash_cum))
/obj/item/organ/genital/breasts/Remove(special)
. = ..()
diff --git a/modular_splurt/code/modules/arousal/organs/penis.dm b/modular_splurt/code/modules/arousal/organs/penis.dm
index 816548127b..d2ddfd7fd5 100644
--- a/modular_splurt/code/modules/arousal/organs/penis.dm
+++ b/modular_splurt/code/modules/arousal/organs/penis.dm
@@ -2,7 +2,7 @@
. = ..()
if(!.)
return
- RegisterSignal(owner, COMSIG_MOB_POST_CAME, .proc/splash_cum)
+ RegisterSignal(owner, COMSIG_MOB_POST_CAME, PROC_REF(splash_cum))
/obj/item/organ/genital/penis/Remove(special)
. = ..()
diff --git a/modular_splurt/code/modules/arousal/organs/vagina.dm b/modular_splurt/code/modules/arousal/organs/vagina.dm
index b01768498a..23446d9cec 100644
--- a/modular_splurt/code/modules/arousal/organs/vagina.dm
+++ b/modular_splurt/code/modules/arousal/organs/vagina.dm
@@ -2,7 +2,7 @@
. = ..()
if(!.)
return
- RegisterSignal(owner, COMSIG_MOB_POST_CAME, .proc/splash_cum)
+ RegisterSignal(owner, COMSIG_MOB_POST_CAME, PROC_REF(splash_cum))
/obj/item/organ/genital/vagina/Remove(special)
. = ..()
diff --git a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
index 9ba3db985e..c59682a02c 100644
--- a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -2,7 +2,7 @@
/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/Initialize()
. = ..()
- addtimer(CALLBACK(src, .proc/turn_on), 3 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(turn_on)), 3 SECONDS)
/obj/machinery/atmospherics/components/unary/outlet_injector/hilbertshotel/proc/turn_on()
on = TRUE
diff --git a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index 9fac7013a4..c256969330 100644
--- a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -3,7 +3,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel/Initialize()
. = ..()
- addtimer(CALLBACK(src, .proc/turn_on), 3 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(turn_on)), 3 SECONDS)
/obj/machinery/atmospherics/components/unary/vent_pump/hilbertshotel/proc/turn_on()
on = TRUE
diff --git a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index c779660408..0c4aa16bdd 100644
--- a/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/modular_splurt/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -3,7 +3,7 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/Initialize()
. = ..()
- addtimer(CALLBACK(src, .proc/turn_on), 3 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(turn_on)), 3 SECONDS)
/obj/machinery/atmospherics/components/unary/vent_scrubber/hilbertshotel/proc/turn_on()
on = TRUE
diff --git a/modular_splurt/code/modules/clothing/lewd_clothing/eyes/hypnogoggles.dm b/modular_splurt/code/modules/clothing/lewd_clothing/eyes/hypnogoggles.dm
index 641acf95b1..bb3d7f4917 100644
--- a/modular_splurt/code/modules/clothing/lewd_clothing/eyes/hypnogoggles.dm
+++ b/modular_splurt/code/modules/clothing/lewd_clothing/eyes/hypnogoggles.dm
@@ -61,7 +61,7 @@
. = ..()
if(.)
return
- var/choice = show_radial_menu(user,src, hypnogoggles_designs, custom_check = CALLBACK(src, .proc/check_menu, user, I), radius = 36, require_near = TRUE)
+ var/choice = show_radial_menu(user,src, hypnogoggles_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user, I), radius = 36, require_near = TRUE)
if(!choice)
return FALSE
current_hypnogoggles_color = choice
diff --git a/modular_splurt/code/modules/clothing/lewd_clothing/head/deprivation_helmet.dm b/modular_splurt/code/modules/clothing/lewd_clothing/head/deprivation_helmet.dm
index 4376d2c773..96878d13c9 100644
--- a/modular_splurt/code/modules/clothing/lewd_clothing/head/deprivation_helmet.dm
+++ b/modular_splurt/code/modules/clothing/lewd_clothing/head/deprivation_helmet.dm
@@ -149,7 +149,7 @@
. = ..()
if(.)
return
- var/choice = show_radial_menu(user,src, helmet_designs, custom_check = CALLBACK(src, .proc/check_menu, user, I), radius = 36, require_near = TRUE)
+ var/choice = show_radial_menu(user,src, helmet_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user, I), radius = 36, require_near = TRUE)
if(!choice)
return FALSE
current_helmet_color = choice
diff --git a/modular_splurt/code/modules/clothing/misc/body_camera.dm b/modular_splurt/code/modules/clothing/misc/body_camera.dm
index 4d57911f1a..59ede91a29 100644
--- a/modular_splurt/code/modules/clothing/misc/body_camera.dm
+++ b/modular_splurt/code/modules/clothing/misc/body_camera.dm
@@ -69,8 +69,8 @@
/datum/component/bodycamera_holder/RegisterWithParent()
. = ..()
- RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby)
- RegisterSignal(parent, COMSIG_PARENT_EXAMINE_MORE, .proc/on_examine_more)
+ RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby))
+ RegisterSignal(parent, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(on_examine_more))
/datum/component/bodycamera_holder/UnregisterFromParent()
UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY)
diff --git a/modular_splurt/code/modules/events/crystalline_reentry.dm b/modular_splurt/code/modules/events/crystalline_reentry.dm
index 2894e4a484..03718bfdfc 100644
--- a/modular_splurt/code/modules/events/crystalline_reentry.dm
+++ b/modular_splurt/code/modules/events/crystalline_reentry.dm
@@ -255,7 +255,7 @@
var/turf/open/chasm/cloud/M = F
M.TerraformTurf(/turf/open/floor/plating/asteroid/layenia, /turf/open/floor/plating/asteroid/layenia)
gps = new /obj/item/gps/internal(src)
- addtimer(CALLBACK(src, .proc/delayedInitialize), 4 SECONDS)
+ addtimer(CALLBACK(src, PROC_REF(delayedInitialize)), 4 SECONDS)
/obj/structure/spawner/crystalline/deconstruct(disassembled)
new /obj/effect/cloud_collapse(loc)
@@ -294,7 +294,7 @@
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, 0, 50, 1, 1)
- addtimer(CALLBACK(src, .proc/collapse), 50)
+ addtimer(CALLBACK(src, PROC_REF(collapse)), 50)
/obj/effect/cloud_collapse/Destroy()
QDEL_NULL(emitted_light)
diff --git a/modular_splurt/code/modules/hydroponics/botany_flora.dm b/modular_splurt/code/modules/hydroponics/botany_flora.dm
index 5a2f8509a1..c706bb0d6b 100644
--- a/modular_splurt/code/modules/hydroponics/botany_flora.dm
+++ b/modular_splurt/code/modules/hydroponics/botany_flora.dm
@@ -90,7 +90,7 @@
*/
handle_biolumi()
- 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))
/obj/structure/flora/botany/proc/drop_produce(user)
var/obj/item/reagent_containers/food/snacks/grown/G = myseed.spawn_product(get_turf(src))
diff --git a/modular_splurt/code/modules/mapping/modular_map_loader/modular_map_loader.dm b/modular_splurt/code/modules/mapping/modular_map_loader/modular_map_loader.dm
index d1f3d4b15d..ede9bb1b45 100644
--- a/modular_splurt/code/modules/mapping/modular_map_loader/modular_map_loader.dm
+++ b/modular_splurt/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/modular_splurt/code/modules/mob/femclaw.dm b/modular_splurt/code/modules/mob/femclaw.dm
index 151630f384..17eb247d43 100644
--- a/modular_splurt/code/modules/mob/femclaw.dm
+++ b/modular_splurt/code/modules/mob/femclaw.dm
@@ -113,7 +113,7 @@
do_femlewd_action(M)
for(var/i in 1 to extra_sexxo)
- addtimer(CALLBACK(src, .proc/do_femlewd_action, M), rand(12, 16))
+ addtimer(CALLBACK(src, PROC_REF(do_femlewd_action), M), rand(12, 16))
/mob/living/simple_animal/hostile/deathclaw/funclaw/femclaw/proc/pickNewFemHole(mob/living/M)
diff --git a/modular_splurt/code/modules/mob/living/carbon/human/human_defines.dm b/modular_splurt/code/modules/mob/living/carbon/human/human_defines.dm
index 93880806ee..20f677fddd 100644
--- a/modular_splurt/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/modular_splurt/code/modules/mob/living/carbon/human/human_defines.dm
@@ -6,4 +6,4 @@
/mob/living/carbon/human/Initialize()
LAZYADD(hud_possible, ANTAGTARGET_HUD)
. = ..()
- RegisterSignal(src, COMSIG_MOB_CLIMAX, .proc/check_orgasm)
+ RegisterSignal(src, COMSIG_MOB_CLIMAX, PROC_REF(check_orgasm))
diff --git a/modular_splurt/code/modules/mob/living/carbon/human/species_types/arachnid.dm b/modular_splurt/code/modules/mob/living/carbon/human/species_types/arachnid.dm
index 0546b1f28b..8cc1e2d8b7 100644
--- a/modular_splurt/code/modules/mob/living/carbon/human/species_types/arachnid.dm
+++ b/modular_splurt/code/modules/mob/living/carbon/human/species_types/arachnid.dm
@@ -52,7 +52,7 @@
to_chat(H, span_warning("You pull out a strand from your spinneret, ready to wrap a target. (Press ALT+CLICK on the target to start wrapping.)"))
H.adjust_nutrition(spinner_rate * -0.5)
addtimer(VARSET_CALLBACK(src, web_ready, TRUE), web_cooldown)
- RegisterSignal(H, list(COMSIG_MOB_ALTCLICKON), .proc/cocoonAtom)
+ RegisterSignal(H, list(COMSIG_MOB_ALTCLICKON), PROC_REF(cocoonAtom))
return
else
to_chat(H, span_warning("You're too hungry to spin web right now, eat something first!"))
diff --git a/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm b/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm
index f52374cef4..ece75c92f6 100644
--- a/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm
+++ b/modular_splurt/code/modules/mob/living/carbon/human/species_types/zombies2.dm
@@ -282,7 +282,7 @@
if(!owner)
return
if(!(src in owner.internal_organs))
- INVOKE_ASYNC(src,.proc/Remove,owner)
+ INVOKE_ASYNC(src,PROC_REF(Remove),owner)
if(owner.mob_biotypes && MOB_MINERAL && MOB_UNDEAD)//We are already dead inside
. = ..()
STOP_PROCESSING(SSobj, src)
@@ -305,7 +305,7 @@
Your heart has stopped...")
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/undead_infection/proc/zombify(mob/living/M, mob/living/carbon/user)
timer_id = null
diff --git a/modular_splurt/code/modules/mob/living/living_signals.dm b/modular_splurt/code/modules/mob/living/living_signals.dm
index 1bb4d2ef4d..fea5c6d9b2 100644
--- a/modular_splurt/code/modules/mob/living/living_signals.dm
+++ b/modular_splurt/code/modules/mob/living/living_signals.dm
@@ -1,3 +1,3 @@
/mob/living/ComponentInitialize()
. = ..()
- RegisterSignal(src, SIGNAL_TRAIT(TRAIT_FLOORED), .proc/update_mobility)
+ RegisterSignal(src, SIGNAL_TRAIT(TRAIT_FLOORED), PROC_REF(update_mobility))
diff --git a/modular_splurt/code/modules/mob/living/navigation.dm b/modular_splurt/code/modules/mob/living/navigation.dm
index f786cd873d..1be63eb953 100644
--- a/modular_splurt/code/modules/mob/living/navigation.dm
+++ b/modular_splurt/code/modules/mob/living/navigation.dm
@@ -15,13 +15,13 @@
if(incapacitated())
return
if(length(client.navigation_images))
- addtimer(CALLBACK(src, .proc/cut_navigation), world.tick_lag)
+ addtimer(CALLBACK(src, PROC_REF(cut_navigation)), world.tick_lag)
balloon_alert(src, "navigation path removed")
return
if(!COOLDOWN_FINISHED(src, navigate_cooldown))
balloon_alert(src, "navigation on cooldown!")
return
- addtimer(CALLBACK(src, .proc/create_navigation), world.tick_lag)
+ addtimer(CALLBACK(src, PROC_REF(create_navigation)), world.tick_lag)
/mob/living/proc/create_navigation()
var/list/destination_list = list()
@@ -90,8 +90,8 @@
client.images += path_image
client.navigation_images += path_image
animate(path_image, 0.5 SECONDS, alpha = 150)
- addtimer(CALLBACK(src, .proc/shine_navigation), 0.5 SECONDS)
- RegisterSignal(src, COMSIG_MOB_DEATH, .proc/cut_navigation)
+ addtimer(CALLBACK(src, PROC_REF(shine_navigation)), 0.5 SECONDS)
+ RegisterSignal(src, COMSIG_MOB_DEATH, PROC_REF(cut_navigation))
balloon_alert(src, "navigation path created")
/mob/living/proc/shine_navigation()
diff --git a/modular_splurt/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_splurt/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
index 04e00581f6..dded62292c 100644
--- a/modular_splurt/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+++ b/modular_splurt/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
@@ -319,7 +319,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
if(R && !R.pounce_cooldown)
R.pounce_cooldown = !R.pounce_cooldown
to_chat(R, "Your targeting systems lock on to [A]...")
- addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), R.pounce_spoolup)
+ addtimer(CALLBACK(R, TYPE_PROC_REF(/mob/living/silicon/robot, leap_at), A), R.pounce_spoolup)
spawn(R.pounce_cooldown_time)
R.pounce_cooldown = !R.pounce_cooldown
else if(R && R.pounce_cooldown)
diff --git a/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm b/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm
index ef27847792..d8c8850e63 100644
--- a/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/modular_splurt/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -26,7 +26,7 @@
"Cyclone" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "cyclone")
)
stand_icons = sort_list(stand_icons)
- var/stand_borg_icon = show_radial_menu(R, R , stand_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/stand_borg_icon = show_radial_menu(R, R , stand_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!stand_borg_icon)
return
switch(stand_borg_icon)
@@ -108,7 +108,7 @@
"BootyS" = image(icon = 'modular_splurt/icons/mob/robots.dmi', icon_state = "bootystandardS")
)
clown_icons = sort_list(clown_icons)
- var/clown_borg_icon = show_radial_menu(R, R , clown_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/clown_borg_icon = show_radial_menu(R, R , clown_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
if(!clown_borg_icon)
return
switch(clown_borg_icon)
@@ -196,7 +196,7 @@
var/image/wide = image(icon = 'modular_splurt/icons/mob/widerobots_cargo.dmi', icon_state = L[a])
wide.pixel_x = -16
cargo_icons[a] = wide
- var/cargo_borg_icon = show_radial_menu(R, R , cargo_icons, custom_check = CALLBACK(src, .proc/check_menu, R), radius = 42, require_near = TRUE)
+ var/cargo_borg_icon = show_radial_menu(R, R , cargo_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), R), radius = 42, require_near = TRUE)
switch(cargo_borg_icon)
if("Default")
cyborg_base_icon = "cargoborg"
diff --git a/modular_splurt/code/modules/mob/living/simple_animal/hostile/clockworkmechanic.dm b/modular_splurt/code/modules/mob/living/simple_animal/hostile/clockworkmechanic.dm
index 8059d74604..72edb811e8 100644
--- a/modular_splurt/code/modules/mob/living/simple_animal/hostile/clockworkmechanic.dm
+++ b/modular_splurt/code/modules/mob/living/simple_animal/hostile/clockworkmechanic.dm
@@ -72,7 +72,7 @@
var/minions_chosen = pick(minions)
var/mob/living/simple_animal/hostile/clocktank/weak/S = new minions_chosen (get_step(boss,pick_n_take(directions)), 1)
S.faction = boss.faction
- RegisterSignal(S, COMSIG_PARENT_QDELETING, .proc/remove_from_list)
+ RegisterSignal(S, COMSIG_PARENT_QDELETING, PROC_REF(remove_from_list))
summoned_minions += S
/datum/action/boss/clockie_summon_minions/proc/remove_from_list(datum/source, forced)
diff --git a/modular_splurt/code/modules/mob/living/simple_animal/hostile/dancer.dm b/modular_splurt/code/modules/mob/living/simple_animal/hostile/dancer.dm
index 430cffd571..d8cef8de98 100644
--- a/modular_splurt/code/modules/mob/living/simple_animal/hostile/dancer.dm
+++ b/modular_splurt/code/modules/mob/living/simple_animal/hostile/dancer.dm
@@ -20,11 +20,11 @@
. = ..()
danceaction = 0 //you did your move
lastaction = world.time+actiontime //next action time
- addtimer(CALLBACK(src, .proc/move_part_2, newloc, direct), 1)
+ addtimer(CALLBACK(src, PROC_REF(move_part_2), newloc, direct), 1)
/mob/living/dancercaptain/proc/move_part_2(atom/newloc, direct)
animate(src, pixel_x, pixel_y = pixel_y - 10, time = 0.7, 0)
- addtimer(CALLBACK(src, .proc/move_part_3, newloc, direct))
+ addtimer(CALLBACK(src, PROC_REF(move_part_3), newloc, direct))
/mob/living/dancercaptain/proc/move_part_3(atom/newloc, direct)
LAZYINITLIST(dancefloor_turfs)
diff --git a/modular_splurt/code/modules/mob/living/simple_animal/hostile/deathclaw/deathclaw.dm b/modular_splurt/code/modules/mob/living/simple_animal/hostile/deathclaw/deathclaw.dm
index 49ecc7dab6..af823ac7e7 100644
--- a/modular_splurt/code/modules/mob/living/simple_animal/hostile/deathclaw/deathclaw.dm
+++ b/modular_splurt/code/modules/mob/living/simple_animal/hostile/deathclaw/deathclaw.dm
@@ -98,7 +98,7 @@
var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc,src)
animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 1)
sleep(3)
- throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, .proc/charge_end))
+ throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, PROC_REF(charge_end)))
/mob/living/simple_animal/hostile/deathclaw/charge_end(list/effects_to_destroy)
charging = FALSE
diff --git a/modular_splurt/code/modules/mob/living/simple_animal/hostile/deathclaw/funclaw.dm b/modular_splurt/code/modules/mob/living/simple_animal/hostile/deathclaw/funclaw.dm
index ed0ffd12b8..68c0fce202 100644
--- a/modular_splurt/code/modules/mob/living/simple_animal/hostile/deathclaw/funclaw.dm
+++ b/modular_splurt/code/modules/mob/living/simple_animal/hostile/deathclaw/funclaw.dm
@@ -64,11 +64,11 @@
do_lewd_action(M)
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(8, 12))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(8, 12))
// Regular sex has an extra action per tick to seem less slow and robotic
if(deathclaw_mode != "abomination" || M.client?.prefs.unholypref != "Yes")
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(12, 16))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(12, 16))
/mob/living/simple_animal/hostile/deathclaw/funclaw/proc/pickNewHole(mob/living/M)
@@ -186,7 +186,7 @@
refractory_period = world.time + rand(100, 150) // Sex cooldown
set_lust(0) // Nuts at 400
- addtimer(CALLBACK(src, .proc/slap, M), 15)
+ addtimer(CALLBACK(src, PROC_REF(slap), M), 15)
/mob/living/simple_animal/hostile/deathclaw/funclaw/proc/slap(mob/living/M)
diff --git a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/funwolf.dm b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/funwolf.dm
index 8c06851b30..3886b2fcf7 100644
--- a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/funwolf.dm
+++ b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/funwolf.dm
@@ -73,11 +73,11 @@
do_lewd_action(M)
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(8, 12))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(8, 12))
// Regular sex has an extra action per tick to seem less slow and robotic
if(werewolf_mode != "abomination" || M.client?.prefs.unholypref != "Yes")
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(12, 16))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(12, 16))
/mob/living/simple_animal/hostile/werewolf/funwolf/proc/pickNewHole(mob/living/M)
@@ -195,7 +195,7 @@
refractory_period = world.time + rand(100, 150) // Sex cooldown
set_lust(0) // Nuts at 400
- addtimer(CALLBACK(src, .proc/slap, M), 15)
+ addtimer(CALLBACK(src, PROC_REF(slap), M), 15)
/mob/living/simple_animal/hostile/werewolf/funwolf/proc/slap(mob/living/M)
@@ -286,11 +286,11 @@
do_lewd_action(M)
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(8, 12))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(8, 12))
// Regular sex has an extra action per tick to seem less slow and robotic
if(werewolf_mode != "abomination" || M.client?.prefs.unholypref != "Yes")
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(12, 16))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(12, 16))
/mob/living/simple_animal/hostile/ice_wolf/funwolf/proc/pickNewHole(mob/living/M)
@@ -408,7 +408,7 @@
refractory_period = world.time + rand(100, 150) // Sex cooldown
set_lust(0) // Nuts at 400
- addtimer(CALLBACK(src, .proc/slap, M), 15)
+ addtimer(CALLBACK(src, PROC_REF(slap), M), 15)
/mob/living/simple_animal/hostile/ice_wolf/funwolf/proc/slap(mob/living/M)
@@ -500,11 +500,11 @@
do_lewd_action(M)
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(8, 12))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(8, 12))
// Regular sex has an extra action per tick to seem less slow and robotic
if(werewolf_mode != "abomination" || M.client?.prefs.unholypref != "Yes")
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(12, 16))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(12, 16))
/mob/living/simple_animal/hostile/hellhound/funwolf/proc/pickNewHole(mob/living/M)
@@ -622,7 +622,7 @@
refractory_period = world.time + rand(100, 150) // Sex cooldown
set_lust(0) // Nuts at 400
- addtimer(CALLBACK(src, .proc/slap, M), 15)
+ addtimer(CALLBACK(src, PROC_REF(slap), M), 15)
/mob/living/simple_animal/hostile/hellhound/funwolf/proc/slap(mob/living/M)
@@ -714,11 +714,11 @@
do_lewd_action(M)
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(8, 12))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(8, 12))
// Regular sex has an extra action per tick to seem less slow and robotic
if(werewolf_mode != "abomination" || M.client?.prefs.unholypref != "Yes")
- addtimer(CALLBACK(src, .proc/do_lewd_action, M), rand(12, 16))
+ addtimer(CALLBACK(src, PROC_REF(do_lewd_action), M), rand(12, 16))
/mob/living/simple_animal/hostile/the_mosley/funwolf/proc/pickNewHole(mob/living/M)
@@ -836,7 +836,7 @@
refractory_period = world.time + rand(100, 150) // Sex cooldown
set_lust(0) // Nuts at 400
- addtimer(CALLBACK(src, .proc/slap, M), 15)
+ addtimer(CALLBACK(src, PROC_REF(slap), M), 15)
/mob/living/simple_animal/hostile/the_mosley/funwolf/proc/slap(mob/living/M)
diff --git a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/hellhound.dm b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/hellhound.dm
index 68a3ee3edd..90e489dfae 100644
--- a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/hellhound.dm
+++ b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/hellhound.dm
@@ -103,7 +103,7 @@
var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc,src)
animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 1)
sleep(3)
- throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, .proc/charge_end))
+ throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, PROC_REF(charge_end)))
/mob/living/simple_animal/hostile/hellhound/charge_end(list/effects_to_destroy)
charging = FALSE
diff --git a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/icewolf.dm b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/icewolf.dm
index 8f785c2b2b..95f9ec51a8 100644
--- a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/icewolf.dm
+++ b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/icewolf.dm
@@ -103,7 +103,7 @@
var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc,src)
animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 1)
sleep(3)
- throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, .proc/charge_end))
+ throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, PROC_REF(charge_end)))
/mob/living/simple_animal/hostile/ice_wolf/charge_end(list/effects_to_destroy)
charging = FALSE
diff --git a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/themosley.dm b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/themosley.dm
index ba74e5bce4..1b3e23db6c 100644
--- a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/themosley.dm
+++ b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/themosley.dm
@@ -103,7 +103,7 @@
var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc,src)
animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 1)
sleep(3)
- throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, .proc/charge_end))
+ throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, PROC_REF(charge_end)))
/mob/living/simple_animal/hostile/the_mosley/charge_end(list/effects_to_destroy)
charging = FALSE
diff --git a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/werewolf.dm b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/werewolf.dm
index 46df07d37f..717099d9dc 100644
--- a/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/werewolf.dm
+++ b/modular_splurt/code/modules/mob/living/simple_animal/hostile/werewolves/werewolf.dm
@@ -103,7 +103,7 @@
var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc,src)
animate(D, alpha = 0, color = "#FF0000", transform = matrix()*2, time = 1)
sleep(3)
- throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, .proc/charge_end))
+ throw_at(T, get_dist(src, T), 1, src, 0, callback = CALLBACK(src, PROC_REF(charge_end)))
/mob/living/simple_animal/hostile/werewolf/charge_end(list/effects_to_destroy)
charging = FALSE
diff --git a/modular_splurt/code/modules/research/xenoarch/tools.dm b/modular_splurt/code/modules/research/xenoarch/tools.dm
index a3ff76b863..d44ea6f8a9 100644
--- a/modular_splurt/code/modules/research/xenoarch/tools.dm
+++ b/modular_splurt/code/modules/research/xenoarch/tools.dm
@@ -184,7 +184,7 @@
return
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/Pickup_rocks)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(Pickup_rocks))
listeningTo = user
/obj/item/storage/bag/strangerock/dropped(mob/user)
@@ -245,7 +245,7 @@
return
if(listeningTo)
UnregisterSignal(listeningTo, COMSIG_MOVABLE_MOVED)
- RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/Pickup_rocks)
+ RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(Pickup_rocks))
listeningTo = user
/obj/item/storage/bag/strangerockadv/dropped(mob/user)
diff --git a/modular_splurt/code/modules/surgery/organs/eyes.dm b/modular_splurt/code/modules/surgery/organs/eyes.dm
index 99dbc50d99..0c210060de 100644
--- a/modular_splurt/code/modules/surgery/organs/eyes.dm
+++ b/modular_splurt/code/modules/surgery/organs/eyes.dm
@@ -44,7 +44,7 @@
to_chat(eye_user, span_nicegreen("Your [src] begin to glimmer with an entrancing power!"))
// Add examine text
- RegisterSignal(eye_user, COMSIG_PARENT_EXAMINE, .proc/examine_user)
+ RegisterSignal(eye_user, COMSIG_PARENT_EXAMINE, PROC_REF(examine_user))
// On remove organ
/obj/item/organ/eyes/robotic/hypno/Remove(mob/living/carbon/eye_user, special, drop_if_replaced)
diff --git a/modular_splurt/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/modular_splurt/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
index abc5205023..d1a34f997a 100644
--- a/modular_splurt/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
+++ b/modular_splurt/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
@@ -77,7 +77,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
@@ -116,7 +116,7 @@
S_TIMER_COOLDOWN_START(chassis, COOLDOWN_MECHA_SKYFALL, skyfall_cooldown_time)
button_icon_state = "mech_savannah_cooldown"
UpdateButtonIcon()
- addtimer(CALLBACK(src, .proc/reset_button_icon), skyfall_cooldown_time)
+ addtimer(CALLBACK(src, PROC_REF(reset_button_icon)), skyfall_cooldown_time)
for(var/mob/living/shaken in range(7, chassis))
shake_camera(shaken, 3, 3)
@@ -134,7 +134,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
@@ -145,7 +145,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
@@ -266,8 +266,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_pointer_icon = 'icons/effects/mouse_pointers/supplypod_down_target.dmi'
owner.update_mouse_pointer()
//owner.overlay_fullscreen("ivanov", /atom/movable/screen/fullscreen/ivanov_display, 1) //need sprite stretching on screen or stretch the sprite itself
@@ -323,7 +323,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
@@ -347,7 +347,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)
From 933571c07d26541efe96642e5eedeac49ac76403 Mon Sep 17 00:00:00 2001
From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com>
Date: Mon, 11 Mar 2024 20:03:26 -0500
Subject: [PATCH 2/7] rust-g
rust-g upgrade to 3.1.0
---
code/__DEFINES/rust_g.dm | 19 +++++++++++++++----
rust_g.dll | Bin 6967296 -> 7770624 bytes
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/code/__DEFINES/rust_g.dm b/code/__DEFINES/rust_g.dm
index e354105cc9..ab0f7d4c1f 100644
--- a/code/__DEFINES/rust_g.dm
+++ b/code/__DEFINES/rust_g.dm
@@ -135,7 +135,7 @@
#define rustg_dmi_icon_states(fname) RUSTG_CALL(RUST_G, "dmi_icon_states")(fname)
#define rustg_file_read(fname) RUSTG_CALL(RUST_G, "file_read")(fname)
-#define rustg_file_exists(fname) RUSTG_CALL(RUST_G, "file_exists")(fname)
+#define rustg_file_exists(fname) (RUSTG_CALL(RUST_G, "file_exists")(fname) == "true")
#define rustg_file_write(text, fname) RUSTG_CALL(RUST_G, "file_write")(text, fname)
#define rustg_file_append(text, fname) RUSTG_CALL(RUST_G, "file_append")(text, fname)
#define rustg_file_get_line_count(fname) text2num(RUSTG_CALL(RUST_G, "file_get_line_count")(fname))
@@ -146,7 +146,13 @@
#define text2file(text, fname) rustg_file_append(text, "[fname]")
#endif
+/// Returns the git hash of the given revision, ex. "HEAD".
#define rustg_git_revparse(rev) RUSTG_CALL(RUST_G, "rg_git_revparse")(rev)
+
+/**
+ * Returns the date of the given revision in the format YYYY-MM-DD.
+ * Returns null if the revision is invalid.
+ */
#define rustg_git_commit_date(rev) RUSTG_CALL(RUST_G, "rg_git_commit_date")(rev)
#define rustg_hash_string(algorithm, text) RUSTG_CALL(RUST_G, "hash_string")(algorithm, text)
@@ -161,6 +167,11 @@
#define RUSTG_HASH_XXH64 "xxh64"
#define RUSTG_HASH_BASE64 "base64"
+/// Encode a given string into base64
+#define rustg_encode_base64(str) rustg_hash_string(RUSTG_HASH_BASE64, str)
+/// Decode a given base64 string
+#define rustg_decode_base64(str) RUSTG_CALL(RUST_G, "decode_base64")(str)
+
#ifdef RUSTG_OVERRIDE_BUILTINS
#define md5(thing) (isfile(thing) ? rustg_hash_file(RUSTG_HASH_MD5, "[thing]") : rustg_hash_string(RUSTG_HASH_MD5, thing))
#endif
@@ -209,15 +220,15 @@
*/
#define rustg_add_node_astar(json) RUSTG_CALL(RUST_G, "add_node_astar")(json)
-/**²
+/**
* Remove every link to the node with unique_id. Replace that node by null
*/
-#define rustg_remove_node_astart(unique_id) RUSTG_CALL(RUST_G, "remove_node_astar")(unique_id)
+#define rustg_remove_node_astar(unique_id) RUSTG_CALL(RUST_G, "remove_node_astar")("[unique_id]")
/**
* Compute the shortest path between start_node and goal_node using A*. Heuristic used is simple geometric distance
*/
-#define rustg_generate_path_astar(start_node_id, goal_node_id) RUSTG_CALL(RUST_G, "generate_path_astar")(start_node_id, goal_node_id)
+#define rustg_generate_path_astar(start_node_id, goal_node_id) RUSTG_CALL(RUST_G, "generate_path_astar")("[start_node_id]", "[goal_node_id]")
#define RUSTG_REDIS_ERROR_CHANNEL "RUSTG_REDIS_ERROR_CHANNEL"
diff --git a/rust_g.dll b/rust_g.dll
index 1b5f515b3453dde60b0f98df2c22470da8b7a44c..7d1aa3cf295cc1246d50ffcfdbfd2cf990b5f700 100644
GIT binary patch
literal 7770624
zcmeFa3w%`7wLg9)nS=ob&O`%5jS@7rAV?F9ZK6?=kQu@wLl80v2oV)AQmRO102RW(
z$qdTRgIrGR9cme
z`}^JGGv~1%Ywx}G+H0-7);@ce&To_wB}p>l7Y<9(PTc9QKwJmE*i4c%a_loBrKg7e
ze%wye%-@fjTYXzi#_|<++`8h%?`7P4^;3C0&pAVVj;wY8UrslPYmnJkKQEDDKZD%@+6PlFD)S
zuiu?C4fkQ2b|;nKUijH=vlsX6E1yleNxZ*crugkEUq~tt_vgj^y4!B9rZRiCu*@z=
zGfigckJ~=FB@)*qT{v#IY2-I0+k8pdlrDmw-sX}d8y+(dMo;vdAW6yehQG*NYFVix
z7hwrf0WgMyls04a1aGu
z0P>lvCzG~bir}p)kQVn%xX1k!pqi6c+_LPBn?ZMIlZ3WOf5H9nKIw|$vi6^1?(Smth&yo+BH^sWHBE_rLl5t@gwx0uKkuN0hrPlH1Miv<3>T
z1j={J{XKpSFHB=63fV}x?iPYlX5%HP6J2Q&o$2y#4$8mTZ+cZZVXnC@`z_yodGp?2
z7uBK60&qO%NkAALPL}H?it=Z%+<*yB0Bp2PuFC*ELO;wt7W^f`1BDh`CA>X^+Y~B8QTstogQ2~2ri52omrCI)I`^!wg-2y&%(sP|W{>RZ
z753GVEBmYq_Z~QKKoGMv`Z_c2eVWlO-iTQ*xijr>66{
znHJMtR*^no4||(+D4MAzC;MQi-Mj8$$+M?z>cuASIwZAF(u$1GF#Vpl$NkuZJ&9Az
ztWD%ualo6OJj`>SvgdU6esstXZ~o{Ja`DTcIQz$PaYxVtDni}pFEZZ7_ZV+o7;o%l
zjJU;o1a%B6HHKTj-bwEP`w{)tMK^x8#TRz3;0b)bnb|w!=A^Q{D{Ma{eEM2EXNO1S
z0H-vrHX!jM6udNbsZA=cQX5tfW3=`LBL_5
z+b6Qk-ua1~k{r62+q=Y@a;3x^779aWt}yrPIMANKD)x;RbhnH6#51Y5FpTB32MprU
z-aQKxGCW4?^4MZ2N-tLvU2yv$zVLv$+#E_)+N?9&sY>nVlKZppx1%M#5&Da=wu5NO
zb0``pXi6>Z)c&I?5%jDRhK~LNzWr{Q7iXIDT34kNO=BJG#l5?zmDvZYkIVttex6<_
zu|4{8$GMe~(O-Y+UjIQE(y_m=U+2>Ov3y(u{t{dT&-54L=_qyMYpS2bJagtmcxMy6
z>o@`W67idph0BcbfhmH81`?A5o>Tmqes4-c2B5crG%QME4~$gQJ(Nl^
zQi1>2W>`Sy9ZKM|(h*j|N$eWt$Wl6`ok&7yo4WOT1C4*VC_n(E8@Sn5GC{JLy2D+p
zsSzQ(=`*_eDHYqjkFKss>YQBWu<`_@+vGVb%FnMeixBrQUkhuvA1UQJ%ByrI$iCC`
zu*V$y3jq+3?66*djyb9ntE$v)ooJT0qcR}0ra*x}N@xsou10d#8a*wNO4{uUlaMec
zAPvP^Xl8#fNypI~NT-T6A~mowjZjmVhD!>NP(p9hh<*zYl!CXE5(^*6fvFQo5oF0l
zt-tsJUF#mD3be=iTHAREsw+BK?^N}c&jg`!;KE@=gN}x!b>o6VWwico3o2}t>nIY)RdwdJInFlefT_)z{JZf;oy%)0m2Qith&%F8QAYuHmRyZ!FY4*f0M1y$
zcwA-Q69^3WAH@}a-hh8AZX}_&(|R;K)NK#V;Lf=OVJ0rl0@m=Hh%6yEPvH^whHbdB
zhV3FEp9v7Gfk5g&JQnVnq`mRHSyFayMW{vg{c@Njt=}Cf)pI*L(dHO#v;w-Dr0u^x
zu9I{ya@}6!3bx_G{2fSy3W=t0KQ)CabO@o$Pi&6wCZ5Md2>9H03uZC@7K8+UfQu^H
z%aYj%9dFcL?VA(OATK<#i{!>g{8ceKcl
zzG-WH-!^owQ6ZlXx!4=j`ENdJj%Ft+4K790P6EoC2wQwNRhBuIeRuzI=2#wZxbZ3l
z#01E6lDW*>WmRVmv#57lm}@a>I6$cz>czE=uFgfwnaLV9;W>LhI~lqxCK90kyjs-y
zu9=N)Gh0yI+T0~>&ZZtkk)&aA7N2&!E7#1Qn^yae`6>qm)KiF(P(
zedyOh<^3VdnZ+BZ!g6zdo;rOwb5_fbyi=3OM_=Vy=6OJMF4Iv&71xqBo{y2ZoV(n?
zyU`1B^ZaGJc6@eAz>$Gysjfx#bpo#3{F1z*Xeqa<3&1}U8}=bC{4N)FUs$f24m5Fx
zd6wL4Q!7pDPo6@2%@B4t_zoWA=7X#%Q*h?&x7P1TLODEj^MXskh+pK+%ca)iwmc-!0$WHL{Fn9?5y}1R!oAJCYL-rj2)hl6>>^}#iQDi$U@31H>
z3Cv-ZU)Ue~0SKGY?Gxz|W&h+zy3e^yX)z;N@Hzx3;Y3loA2{Vsl>WKgJUda|QD{=3
zOdW20&o*>V=v*ai5vdkYDyrjgPE{PrS|_|AZr@nqiyxw%&|E57f^DnyL%7wZywNxd2?0ny|sDSVecsn_2qgC
z`DnTMl?kt~(ej2|gqT{r;Y8*%KatFw87p1DwA@^l=nW4EI8sqID4nVxH(t{YYtX)&DuN^umrq$4L-S2k!h!UX1c*
z(9z-6piOlDRty^&K63}n{NMYdnZewXMNTuJ51^7E9rX650S2{~?#A$?&d47W^nLN5
z1>hS|B?1hvnK5byW;5!K5|NYqqkf|v3iZX`x8LE!45*1
z&}oSY_8t`}u?oZ^W}_L1L0_yNH1nbMzK97Sr;ZpME%ren+^0hT@25e@M;pU(GZo()
zV527lVV)ScAO#DF6c!I%>aGU7r>NSeLhMnIkRWNT>Q^e1Y)^mLNBStu(tb!7^LB
zY_0EFhPDockV$7vEl9{mvxauuNf4eJ6@=h!lJ@yJ2*N5iudPOdYpdC7LMmpk!&68s
zUr?WF;Z20i`neVp7aR^x3EZ^^w?r>kfHjuukE4O%%*u#&~wP_o!P@fHKQzoq|^_!rl%7~^~=lXj%9MKaY
zIwb8|vxQ~~E+#Zy-2FQdj(gKqao48?LMaAsi=Q0`m0H(^_df}3Q=f|YKR`C6l_p!k
zmQT?Xr&f!(nETHVQV2-`lHp`vqy$AEV
z&y;&G)BZ4gdCy5TcV!|^=ymQVAab*SZ^FE(cA4ZJ6JA-}UvkW=hIX>On3BkKzd$pB
z6JX~XxGlfjC)yJH7U^9(oL53i4o=4Nz&TdyIYMiZl*9?m$Ole6-GKkfptZ;}U``-_
zzZ^8_iM>6LPZ{n(2G$X&{R+HM)i9Y&gE$G^)C1hE&a4}4&rAkBt1a1>V>~lV7~z61
zBBbZcYS-#Zm)f40NGbEjAZ4SGaw|gg_JYYv+FjKnr66e?abdS0EOd{sbg(yLxX~7x
zDy7iPaRK?1@H(}j3;9*Y4FN~)ft(v{0SB2oAWlngm7Y0-p!%vCV%eCp0Mdf_yC{+W
zPq?<+cnNZmQAE`lVZMn?2pY+r
z7@yym_PHkYp7gQVR#i-7wR3)(NQl%eLA~><{;epuOsjj8OhslwxF|AW-{_nEs7OCo
zPtX00c;&in!?6Y?i(VD(ogZcn-gLjnLpghxJeX@WbFR?=3{*bxV#jjdTg;K;Nf*No
z=G2^ia0bJNy4n&N6~mptzY?&`a0k5W#28;E#`t%7<_;Z+Wm(b}-wxOoES}+D12j2&
z{#Ry$Lu)t5-xLga@cMge&z9V0W2PPtWfh=AF&`^k9$O&nf${zAtsO48FX@&4JIK$4
z@r*YRM+O#|L+=Uhk0BdjUyfhLYK}f=Ijy`JR=Sgv!;%;@a#8#7Rx$^9l0^G-n~?VF
zG#Ez6z}RR-u@B(43%_6EcME=H7>-?#qA%k934UQbpJ$PzKMt3qX1veFGlkPL&9~`J
zY0t9hc_}|V|L^aAaqz!1@UKAwG$zmVw-d9dEl58a_k8^5J>vhd_3-~ltA)Qc;xLFf
zTX|sy+)1-aSYZZF;e}@3LAL`Yy&^u_$_p)c8`j9ZTOebndyZ!x%s!^OFIl14@KhR(
zQhCSD`;aK_WX(7h2wj=o5~}eXlp8>;A)v1ZwIl
z96l{3yj#jXo3NKhyo@om#=GHGo3;x&2}H3xJWk*F(_M(ziiq+uc{u!uhBqhTPh0;1
z3DX`ZwE?B9v;{WIa!WssHFX1NNc`S<%4gpmu#-YA@gb~qC!b|*vpZLIY1fSpum
ziEp3+czqqN@QQPW`Eygw3)5#
z)b9L7rNq~Ea=V3lI(VZ{)myojsThL*KD{KNh>faabd{Pwm
z1hqi-a>QgN_kWJiU!X+EbDoOSCh4gBL=y#i-e(;bV~LOC84Upj5)K*np4lxUNUf9za_8eJi
zDqAXPP3w|C5^3B=ahR_8+_*FQK1|Z=?V)pG&2Mb8zh`Q*ziYZK+yNTm_NSEYM7d5w
z`MlH;i9{!0SW4Opd3sGrV5_BD@?Q0{Tulh~>_QpkJ8>!9j*ER8$|-NerL>+Rwot@Y
zD%*>Tx?0pJWi!={mwRbwO`xXR>rf7cyrim&5mlzya?#p-X1#?*UEtc)>vH*xiO6z*
zm$p!eXqipqBKL)FnO=ekrA@Q4!qm`0y}-!t@S|jv%#syC9My8k;Z=U@h`+Ltjio2CxF{`(PKOzZ&lb)xuT+
zNc*%oFU9%1E&c0O{MWCL|A+^erwh~)q2%9+vpdY@_66ksZ0e-FQRQ6zFi;LFVm
z-}SD2PjcH-z#fBS^$Xt@DI#}cy@pXA@7njVtN=8pT?LD*NVp_2Kcez`(ug)1i6R6e
z68GVM+tI8Z{4YcBzkO%I|3EIYEHNgCS7L+213?x<=(btpF%vXYx-DQQo;eUl?EESm
zvBl^Ug2&b#(ry?>9PyCgh%J3MV!h50m;c=0i0cI})LAcBqhN;gNkUsTm%T!9BJSog#+0#U}uFC)avsQ|av&Yv%kqN6QB@kl1vb=l3tB0Dg8
zQ5SnVE;>|Vkuw1vmHToQdFoP`QM%K{EvEDdmE0yFXeyj+72X(@V&^rfBsjm-2=JTAOEBBA_Snh
zkSOxfKmQZFAbtsB7V*DVXc6PwcgE;(gBr>@Da=Fg)UY``Ya71MoiT?SXh-
zL>m-ZqOJ|eqQ*EHCnhy40eI43jtUKasJGiIQ@TxC7pqnnHLr9E!
za|)?~JHYs6LKPG?C$>c>f#5sMq+Lz4ABr-*7&RV-;WTL
zbSf@XEWG`Ajh=Wj>6OII5~&hGmEli|l$!-F8_J*8HBay{(yJy8;}`IiW?p^>ZH2c@
zDgzhmbj{KJe!FO>@;m`fSTU2^y}Xq4LBJ)oql}eyhEs%w+NrEI!=$CGwhXPw#j4p*
z9=8)FuuiSCQ!N)VQnQaEuC<*w)5QMNGqKwCbEwMkw$sobptWTJk)&jz+&-Gytj~0|
zbOSGaikCy;M^kFWzc3gSwW_yjHpa*o$Drc-OD%uSP|ZFZ8(~n9{swKFm4X%f)`E!0c_
z%g`4oKj~v++CvGXlzlrS>q$tzqj*)Nj-;I0-S3_YUSxnU)^o1^fcQcW{j1>LQ2%;o
z%o*rkjqCr}`d2lH@c(1|>%!8nUH`fRz8RYN#_L~%u74l>YsAb!^skP2UxWU2Px?PW
z|61}R;y<_N#x5
ztL~$JRZTl1{p&kO7SX#R_kr}UQx#{Rf4z=GgX>>?_+Qz-BmcvS^e>%%mOb}R=YJXf
z@W0MM=buMt{z<9{q@gkYEL!&U^S^KO<$r{(|Nr{~Z1EznlB;
zzulA0i2pr+WD&j>xevtuo}F<9{I3a#2IqfAdh36S1pjNtf~ha{KVVvd&o=Bk1F*Q^
z53k}I5prL&+4qTwC=4(700c7?VWl7oGz@bA`!-5%SloL1Cccs-u7_`8;Q{RrSR#&3
zZ~FI5tTilgM|Xh}uEB)#%PeuR3F+5AA4O#=A%>~4Q!@CBOn%RJ_381%25j6!X1PK$
zpOM9$7eV*r7;;=p!_+KFHe(W*rLNB<4$0I>f?3dH&qWp~67w*}m1(Ir3&y~GVjj3z
zpFI+{L1tEd0N#%fzKJP_P)XGP@SK>_{zS}a`}iNO9jEh4`f@R1uOp=D{F0`tr8{x4
zV{)4!%x!on--;K*24^eXhL@@Zk3tUV&SqCb7khTVXH7_!p3XJ5;(*#x9>3K
z_8nqwpCRVj<^3Q#`h^+``&{F-xrRYIL9k_TndcT1M>Zy`hd{J*dlyC;{PCj%Q$U7
zey^sX8Cus9QIib$
zPI&nd?bjo}OkTi)CQ{ZRWkgg&?s5L4h`(l=7W$M-11PDNzlKORA|kXlB#ONBZ?D{m
z-soX3ST5v63mGiQW!=Bc62vhCzga{NVr1JJd%Lg=&rQI-6(xKvvf)77+=sk0yN1NH
zy8KMta%MlI@)nz=Q|#TYvrX02M45CG=w;YO0OTqAz#()U-IpPn?R_8WU`-
zm;d?@+e}@l{on$fH}9uK^nJY8Pq*k^>_gf6)u##80KROJ6NcMI_hcVfV6ZwNL3E$7
z;G{y193nY#Zj7TX8Ni=Cr+<0!(Ybn^&k^#ZQTTtTBZNF5da>C_ksv#1ig2Cag*@Ck
zI&j~t8%<#)>w86~Hb*D_}K5oJH9z4b1
z`)X;Ot4vex9)i(h;S2X+r+~T_sTuZ7yz~Iv+*CUfA|{=yk{I|96fD>=t*qluljDiR
zz#H`Td>P(I0E~&D3;tW3|36I`d-H$sS#ap>0bJ+r4<{M0m6txs%eTeJfEFPG4)vA+
zkH=&HRfMaAnWzltfDC9iWI#I_tMjsm80a7|(9w?=Shx?SU%`+LK@#8-?J}5_53uEU
zu(C>9pdb|pLoJODtk>@&E)tOevrzg_y!Vy?OWzhUAovR6Xb`AEO84)fKix%Xt-(i-
z)&Qqn`Gbj4khUo>IhB_!tmq=lepCpkWk)Kc(0~F6E`MQoX&Pz>pm_Q7({~4yKc#ir&Hoh@K26v4JKuQ1
z6_Y>8+B)%3d3{e&qci@fu_v}(Ko#R5!t%AY|L(>Aqy7#<-oZx^k#Bg=HXK!t6IuFtwSLxDc}ZUV`}o()SPb$d{#q##Upu$0KmS@E`%2@#wSC2dwHaS(U&(6y*RZd2L)!jN+gI+t
z)X*Xw%*gP7_qPHI86&>v7%Lce-&Ae+WPu{`mJtX@otT(xSoZ5?JKX&i0QXq
zlYPbcMFQD5@Ed47Y{b5jiIfq&Gji`o|JM@?ziU{{eaN8_b`3%L_v4|7-H%)=~dlc~Nl^lePaF<;B|vddZ7F
zt{+5RY&TMWsl3?O-JiVpe#e){i?Sa^<;Bl#?kg{TYX92h#RbRDR9<{`>zM*_j(1ZE35c7GRm3FD68rERM
zeHW~ML5s~QQ}Cf#89pivuQY4lxlwpk)Y3!PvdB(eav1A7&EiIiFq!V@rj2|J8%*N!
zRk*c12h`MQh0NV39549FCB@vxN}nUg1d1(x3Ry5&B+rli5F+hQF?)-4%`Y%HkGLO{
zeFehz(8K=%`!?elT1-bFnO4{IcuXPqSc%^M;
zK8xFS=5^ZO^^kzo)f1N3ci}*}*zh;ia4`O!-z&a~c+!j3vi1o_G3p!Wg97jK4-o>~
zwQ6CQZJ;!4kNoSS{AuF*e76_Z2`APKRvlKE&OTmUGADpGfT}>U16S|
zIc^Wne}kuI^0}{>uPPQ1o;ztLVSH$NFG1oyAx-qpKyotWI*!0#11`JC5pq;+)$8}k
z@q?yUS1;n5sR*u8k?Q>LxKDitdH!MUK5SN}C(6@aR8AJInAv(FA+LR%J#-OkpxTF~
zsE$PV!ltz;rwdn1Z0$~9pYWW_yy8sT+KgBKrqY+c*iRG-xk4#Mb+&sc-*BYD)?>aO
zp(bourZqH1JN)|!YO0y7$+R>or?77;Z6(N`-iq}6*OW_Zu9wLLdKNz1t)B_H3YA30
z<4>(Gtgz7<7hf7OXPjyoL>>3ZA7;6Y$M)m0E6M
z8hz#Lr7UQaXBMq!`7OPzr|M#X20VJ~`}B;aBV6CJoSlA_Iz-t;^^?%Ga5-XUnqV#7
zjP+vKZxKKO_a5z8(+{{8X*VAN6NLj@a^O<-{f2-&go}2?D-}}kZ9K77?KY@&!Qo_y
zc?%m#A#rv%B-5QTg_785RD^Z2Pr(1h_=?VL>B05WNk6A;p519B*w8tj7Qu8UtQaSp
zN#|j2x2nCnD1nyQG>>+CHWJjl6UpX@Wiz>JSsT6(!S0kjHjs|(D0;iTc{FzGj%^-2
zKOj*7#xA|AEdu!4C0Ir|ssI%VILw3&)nUO7(u9{tof^T9qjfTQHe|O%Vpbw1^n$)o
zv=uqD-|eiBM7tyVB`oj3AG7WTf5dkh1idn{R05xVV(~;|=WJd?j4c75b_woftd$Gc
zAE&wn?As}8o4o~}qOF{O*
z-9&=fZ=p)-0(QZyu!Muc(1N^nR{kg}KO!rYNQ|nogl4+>KcG
zwFM{;sg$203l*T&99K?{S(W;Nz|bSdYlac*KL=MK9tmTBkg?HR<_LxLzedlCgop~7h2ATL1U<3qFzWu3O8q;^z@*$-$d
zQ-Gz?P91Na^D+EAtQ9%Y1XS&i=3ulk8H)zGLdA%@lP|=o#Y4Wguu~E$F7{HVUDPd0
z8VB1)y%R9H&^_++dVNS{;4zel0?@7OVUg
z5PeB_V&z@IKM)@kBa*sJP+QMIDS8t`_fC=MxnQB5A=1#->`4
z0jw)0QM?Vh`+TP)*9}Ka!=7FWO7QQe2r(E7M(yY%4LJC<5~Etb6o`w()0#X~D^mM$
zMluD-;@1y|^As@Evu`CusuSCQ^-ozsK_Wu!rDS#Vr({LwH>$t&t8-!B2sA(dj;*KG
z^}T*Mo=6#!_WF7WN>95a+=<;=dnM5K8$*1bMSez^k@EpmdtI5<@_Pbc6Z2$6W9y_OP~sDxRgNprr4BPeAMT8Z9yY-Q0nGkHyog>UoIYUN%5ky(o<6TTf50E&wc%
zAktlt^Ev+1t$dKn?@q;D@$5A=Gt)ek6=z!6-Kp&4ggvs-jtcS_IMoD4R9G=#NM{Q&
zGmtDZdw=Ni9`r6ZzxWI`3YSdBrXGJ!&1q)$q?+3K%uGwl>(j1UlZlf7euh|NwIC21
zKwI=I+|^;DZn5weG_8oO3>|c}l!LOK(c6NqJ4mZq5F5=t~?$dy>2-
zlUDvfXr0Za7WQW1+EfFkxdM8bJ2O?gYzig=m(x52+I3wrT98xe8IY$KQKx%vt~T_P_SQGoX)
z@_3w&GYVu@*}9?t#4)N&gjVd2A!teC5_xi~C*htMs1th>g?u7c?ODGk2XI)&@lJwC
zO9--}<|fn{KuF4z4czM4s2W6C-FHXskGM{6)o?ldizLYTaOGm|xgoDxRxU%CzY)+_e^|p3+PYjbcJc_JJ_hh;5IHHwqyL+h8
zeT(c%(h~#L?^KY~Qi=Y{vphIhRVt{2m;knc|kPk
z_&aj*p6s`jwgk)xG2O~c4}Htv_fdL&i>*opMW_ErkaK3rYwFBwlS4UyDITr92SQNg
znb_ReAZJ7!xHE*)w*@Z^=H^+BFtH%}iz$X6)s`rdoqV
zNG6(@eNd3Xuw4j{g6X)jwioay9e?|rcUG?it-pj{%d-gag4jXSHzg6lgV2)Y$3myAUL?
zqwJK}QW_LzVTVC+7NN6L6k;gPrSaISqpyL+5$R~pw=k!)p(@y=I{RSo3+O<-%a!Aj
zV`n!)rJ!_6bTd^#Xy`n|*uZ84AeyMMkvP@?CjhZ3Yh*+rV>;E6>PX{A`)vX0xV=yC
z%sd1?h|x?Ssoz?%_XBA~7M8%Kn?u`mdyb9YX5)9I=6xh9KSO`u%rB7tHB;GLsrgx+
zv-3Wxxt89|9r?p*t_W^L3iB)Z7J1`cctYfbF$M$r5$T4m8ZkBR3*`5F7^J=Avs(yu
z6`nBcu2D|jBG+}H*2+n{zPwmDIa&5yi)eMKDNnQH$j9T}$DPm@%L
zl?MGLPw;f?x(2{=uSsC1rm_yI=Ze25FJ>rv6HpYJmn!?-MQQ2{33(yB)!;}0^94%x
zM36`Kr5^0ho`{;VQ+Xj-q4^Q2c!4^_gjxv6fYQmjlc&iFnKF+55n$uwb@2sZy^3VT
zP>atup@bF^jPD>)>yJNX@uF0IH_pL&!i2*z@=me&sWs#HbacJ-
z9OcAB_i*LJrB9eVBOzlGo-omY7JFGyYThY>MvANuURGhqdR?7k!UK+Cu+qlt2Gdj?
zMz3&>HSZ+iFmgVwsR0FAfW71IgwBofxBZaPYR;YN%(12^U}x^@z{b+TI*c0o`qM8R
zIABH9YX7kQG+JQ=pE@yQC5iNOVmNMy^yame;iW?GfcLn{Dzq_I3$_&`-bzLCwW(gv
ziR6}5^LMb}I}K{D>3C=)$nv=SU<(}uvTnk0xuBcdZM@V_i%m{;Q;{6u
z3{hG8$I$yKMm>9#BqueQ?a@?7SDZxa-e#}L;^{vwS&!3KUJJipfV1`r
zQ$6p3q=^Nx_p~46fNqlu5K2@n4wXYBeLfs|7vtg^c%a`5;}`!N3HwLyUni`=>TnI}
zuJd1OFNBQ;!oXsRi5I00QNMd!`QoBg={)^c5N!S7D|EhcYOTkjV=FWUh$6*4Gz1S~
z68xT4e7P7Bf;n7_IQmU7e(}$duz&RaRbkCU9pXtSf{)oz0=glu1LndzWB5pp!$+qA
ze4HZs*%P5366B#O<wi%6Ov2&LdV
zr$hitL>#7C*4bs6Z<32tV63UOBF2hzq5&lq)$yp(ea@;>9J$xB5r$f{H{7-B!#i%Z
zg>rU%fSYpqLiZ)X6qL8?D1~0I>l3<-+4ULSY`c!pZRoCU+{peLtrR5u${OKCNY9ja
z4CPbIOPDoF)B$QdDQz{DV1Nu^ovk6W(k08yKRO8@_wJ-?9GIk)w{vTzfCO`xIctF@
zE31A%mbrdSR+7?|jE_+XC_xOaCU7rPYG`sx6SP^^;qb(dX;&-YWw|AIC*+tBOL)<~
zg?J;jz`}s7;In`b$)Bvred1RT1at|sPfK2>`zDw)Ge9_5tZl;EE0ewXV_#S|nw`Lb
zjaGCzHW>TjSD1^5cvQjkj^1B+N97IoqWh^d@4+Dv9;U%IZd7A6*&2PYDVcJrQb4^oeqVQI*1^HB`fj%llGmGh?
z!^UfK^KoLb8%3(F6t!xeyki)Y%p&?MdAhuW4VRmzHb(}DpbN5GA>hw
z)H^DfbAe}^+TaCHy%A`oq?P+|g2V1QJnF{@0h*&4z8*fZh`DeIW=e4YRz;hm5*Ozp
zyw41ffzcdbP1GU0&;~6MD&7+?O|CY2V#7*eE+dHy95!^eQ63)PU%Ui-q88_w=HP%J
z-JYuJH$X+6BOjAMWGGN)r|EUX03kJ%xhz@;Tk)b3aR$z4<-~=+1QKFm;u(b#P%2~e
z2J|n*%-OrQBNpa8HB44~Nrc);@Qio=n6>YV1{rR|<7m
z)Jk|G=R#qbhpKsGUjg#*k(i^^-4scXNC^@|0#t2mG(n-BfMOHr7(&c;Pa?r-&_|o2
zKnjK_We=24xx*u10ZzMiq-I7Zv+CjZ%?dzn-8+xoEK;2}FxcLDCBZ
zZ@2@66|g4q9qS{k=38PsTfvVGtM`ysOWsHZyJvJq=}C-O&qlj~iTtabr&
zE`}??vFLPRn)cymVnvXn8pF_4`Keqh#-bx*iTpY_7*en=hGV?9)|M>${sKDZ&Q$nI
zoyDj)c*e&Ff!9)SE+Y7&m4@((qYalWG};K&d0|vWYqm>4bvUt1
zxQX<`o^^2?nYyEayh>pELsXEy*#A53a{b@vsxKO0hjmov{KP5|mJcIJ$MTz+^gsnz
zT|tHR^Bh{uXy&6uQ+!tdKf#Y^;0j9Q;xJ1t4#s@a93#Ns8mLjIdKy3mFYOM8#bTX`
z>*i?R9H*;oqk*kNR$I)f2wOVvPB8u8eE`mc0-!4cI#9row3jlW2bfOABm*Rwq&;(w@FgHBlX&c?}
zM|;MIvj%DB7$M#CiqJsS4*q8noOQNj&qd_90;=UY;&pwTWkK4RN3Au4G5CX|`n_~@
zR;uFIx{5Mw$rw6^$l|T7OvbMA&PvUWts2z^qCdTk+M%D|=sQ0J&@l4Kbq?IF#w#AD
z;E^}9-~~2a?tcysdOgV@&7ApMoR&xOPaOM(lg+iCeF)7zKpifQI)LnT<yNXs?ET~NfO+ZraDq}=%Oiv#H}bs5Hc=hB-ZKYCmSd3LQ}w9m-CMC1dRYW
z({R`@v>8MRt$>P1!BN8geaHtXPT|$e-!9&8vh@KxsE!55Nn^z(KzE8FY$Z0;IFvdi
za&PEDRGBJ(m1#pp8|VdNtNR&<15MT5!=8x2Eu>=XCX9uyW
zloC9-3UmMxmGwNyu&KvDd&b}-qeNhNzpZXT-9kf?;IEzzu|{zS5cyZB{1
z85;704qC?Re-9cL*k{0OyWO*FS?C+ydrT6)Os>O`CQ^Jlp{a^=?iHR}lsz;#%5DjM
zM%kxW_+_M{tw0{3yWG<9sAF7!%(>6scVI>}jZH|K|Itl=7q<_ysk4ef%vCf_XA;iE%h@Wq+=NCY(us}HQf&qd=byvB-U
z%5yAvXX6}t3YtP@qw9-&$JiW;T=z{7DHe^R?Qd$gl70c%89*}Cyiy6IsX4#Xz>~0F
z|9QS+JP}~zIy(6~ufzQf0AeQqYElsZ5r{XnZvX&tDQy~}6Ytq-2LNrF{7s-3&Fy
z657wNq#9LN^2W$@0{>H~KKD?4DlBlKB6t;5Qv|OqLLds_Gc4H$*>O~E^B%eQD49;l
z7elCIFjX?xzi7D&!ZM67GHi|~Y``KoNjv`s`UmD>gDNXln)BsmzS=^)$j|YdXQ1a!
zDi?)WGo#Hq2Ox6Tn-wnY&7i
zYN9=GpI!@+@BCV9!HI*fms@}f)D`$}m!r{Co?bc{jy2_DT*5@TAg*-TmqO)TE0E~U
zMkaPxFIHqh$q!@QA9~>4Aii#v*a`H&%&YYtsIY{7C<3mE1?-NFAG7S22{eq`#WwRT
z7;H;!Tvns(NeVUtB2my(A{RkH3ya`Qn_~(75Fx-PEmFULBEN$%n>Sjndy`(sN^VArd81bIh$YcS!q{bF$$4is6;jz4bq;wx+P#w?H
zE02nvg~}7Pus2;=7lMfu(A09CCHMg8;uLjqj`q8_sJkq|mk}kJ_bUSu#?w7i;+qxP
z4-uq0EvhWRKLC8=2;h1mepUFL2VBp_?@##klBbJkJ!c79GBe<)Bwan=nCpeXn=iyJ
zp_mMnE&eI;W7fRr4Pyk(yrsTSom02q9ZW&+jqL
z4v)&gXB8w+$si=Y$*73?Btx#-gkUIISdP>BeggP6tq~=Hk<|3-l~zm05z{}Bj5~5k
z}&%+YrT8n#{TrVsGJu5ysR`FJ37ZvBVmRQ|s2I)B~_$VSH`X8YH2hLmOgjd3F
za7~In(RX2Lk(S7+(phZ=tIE8}WtDxG0p+UG3glB3?d;{4M8iG}1Ci4lJWuq8SQ(2c
z7|pj0j9>ymjl}u$Wz2CA+UGbACnZPQJ+@7vnWHeL6qt-|i_kV0?k*||MdB)H8GbAY
zpbCh$g#R8P$-}i%AB>Q8QGpN-VP8euw@#7s-LU@j(d;n4y@We$s1B{8a+>piMcY($
zUYd3zeB;(%10JBM&NR)5ydpNL0=nXfiM&kqMQ?no;-F`wf)Q=={TmdOKCN;b~fFjv?t)ZwvRW?8qZoc&dTsycr-jUU#!{N
zI4cLMhUhd*AGySihG*pm2xYJ~^RsB>?XU67Ud|40T#>o)?u@*E=X&+dZsx%^MP#c$
zhQe;S;rDoYLDZ-nHM%>~J%)LX91V~3$ZF{kd?P?Tp&iWy$$R!;JyfF7hNVIpdr`OF
zv7^eqEd2|kzkaSatet;n{iIw<22OvNIpl5d7{lhBT
zGvffhI^##!6L{Hw!0#9fd-Ol?4NYawu=^>j7-6UyzKvpQyYP7w0MNG#bkov6EZECN
zr~fjn?#F(|Mr+}bPvQ1`&rnnG^&0Az;>Mb4)Xkz-%}Q0^i&16Y{Rrivs(+;?te{xirL>vZQMN+R<1u!6gE@fp$&
z`M0}3l;q!Tr~6|Ea1Ho7aTT)Oe+W<8$-n)Ym{HGX&RkvKGk*u7U{Sh`=n}0!2={YxOE7*4nn4s0qR_8!N^=3aKK-E%ruOYz)j!s=Lcj2X;bR
zeM1=vUW6CbPmNr<92)j-ExOg;pMid@_97T|_lNaBA!;>b`o^I
zpNKdKqs*D18YX+2HbW)DKQ%)*0*9L=bWyFai{ma_1kiq(T95!V3s`#9h|p9)RcZsZ
zSZ$&bVU+bR240{dH7&p$?+tT}JLRSDP9t3x?pXW!(&wa-Sd`raWhhp>3UFFoY9e&L
z0;qav@dH4v8-fb<83c0OQNq9$L77ont;*qB1eLndb>h?s75zU%^c7TZL8R{Ka{VbR
zlZ#h{pa{k3)xSfmP=@Bj=|Y~g;I9xK)19flIYg!5kpAA7c6polB`r$9i7q
zw(%$M=_I8SHwbI&!ZHw(PE>F%5QUX#^Y#2XNf|Vt+4VrEhf1#bONojW!bXXTUbM{<
zBSa%t&IE-R-00qw8ip#Vu
zxD;+R>kMI%)%5UWvZFaCl}CJ_|5tpR6O-FHg6juW+Qt_!%;zq
zwpmy*{kmThFDVV(xFh9si`qm%h?=(5sOy6%kU$t{a@`%6{l&2coiPOG(UdcR>0TWu
ztirvA&+@=o@OfCE$OekV;DUMZ=itkHdMclv$@6`=FG{rdiBC^sRWteg@rkwRaE0^f
z>8xr2pPvQaE}xFc%v?S{hdE35^hvC05ucyS8V(Vfro*WTK>4g86V>I@t65b6pI^Wl
z9!Ft(`f^san9pB^kPah7}4c;>`168MJ0e^uw4et~>z%E@H8=p;{lz63Q%bft&i
zTVG4x{&+b+)h-Tlfmd4td9R2i?86-x6k2p
zM{RfJQtgQSU`+@T7Fq*^x;Qi;ObU*Hi9y*-c!4;|2w8YlF|RGd!h>3@FtlC6LwY}h2`b@ila6_$c$DNu&I0Onx2qg_I`b!y2yM;R$Ei3@$QcB1j
zX7J|}-NzsNPmx&fGNd1<%hCyak1oUe*U)8D-)NTsBy}0hPjh;5J!Lm>63GoW5;2pW
zk-UL=5_C>7A_OADKWzJL%d)m<@;q>Y;=@F#%;wM3*6a@daC#F6IOhp?8Ta
zBn7GX&}ibz~RZH{3mB$7jWVMhtpBv2ni3(4btYO5hhbs?Bu
zpgi{zD?xWZrq+q4K5{;^2{J9X0q(~2wR2G_hT9^zenVr|*Ur>m7x3LQ#zQ04*B0v`
z5c*ib0CJrTUXy*0V>maZBZ|YyBIuO~nqv(a6bNo1$Q>FNYoa=GR~ZxXn2F)Woim9u
zH;|;}&IOTSNoBHzWg>7cYgjHG7O@7mct~XptHnbBYgi*57PAH~JqQj2S~TG|%>o*j
zP0V**8lRTI8XiRo;sHv~Tm
zenU-qrxIgU9m6BzvJ-%+i*K24E7OuvXtg{wriTVZqm#xkcV%V6FP-9CPAQ1=@ZwsH
z7s2SzVDhZ%YZGXc8Y5b)Q9z_P;+Z?DN#m+}7<#O)1z8<#T%2oo15M;)dpE}#AEBQB
zlD`BvAc$oG7aD3R+a1f0!HBWxF@jA2dx%^P)06s1b*7hs(w<2+@fp6oeUFDC>h%7n-y*NUlE(qiHYw
zDrRUpN9b12&f~NztV%>id~&Xv)WjepzrFV23V7>x0~{HN1WEddaIgpkSJKa^2HlEWy`tA+m&!vW1(siMphgX`4SUCnb;z^0-QHdQ6;vJiw@bAg@*Pjx(Ca4@Ry|Bf}_qEX1!kb&M((3Gtc295JnL8E(-X+{wpqhPWBa_l~
zbV6(R&d+FaiHqiKB{(M{m{uY#Aa211-JZp_|5*k40kR}>#k%6W2o-<%sh8!Z`
z=qa7?92Ec!#?y_LK8!~)y0RYGB8*4NU51rOqcE6y&_7a0yu^ZvVZ1B?FkQbv)v&O1
zaBhk`_{PPek9yTvO}<#H6TTB|Zhn&P_tY;)cwI%rOJh&IMiK?R#{NZ{am+#($
z>p#{Ky&0Dd&JFxeRXZ?fgw81E+Ih^ZR?;zCfZgVP24r}ObD&-K#SpJP}KGs
zYcXtK@gbVrN8v=+87iFeX8++RHY4h%KUqh}Ifwxf(U96rRKy>4<9a47jnYyCKM@N0
z$FMpma(ZDkh8*_rpHN-4J4P-Eakv7G{xRjeIw>krb;U(DPts5$sS_2C?fT1C)yrL3
z9Qf9?bKgzI7Y&AP?pnrcmy3-hNnMIp$|LF%?n1MQC`|4Pbu}por)Qi**m<7
zrb|Ng!d>LWCYuB%OBde$@wj^?!dO5pq!-*pBrCJ9)%ei(b$yM0nr`tA!Eu~Rpme>h
zUeDmywK-c80RZ%AnNcW(lK`SH9p{O%yPz?q%qEc2QrS6Ve0Ag)&I8%^!e6m;em^d%
znE8S#RWU!&?Sm+>Bny|a@c>+q%T7=eT0~(sGG(MR?bKh&(ujq$>(yx3ZlnMbQku5u
zFZA5770-YqTEt`YCB6{e|J{1lX1iZY1M<6KwQ0NdRpUI&_B+nr5?4`rPX>P
z%G8I+@H|KR^r+C#RbiXJMn@;Klxbw<7rNd_?K8Zz`E5vQ=#8W#h`D14s-!kijG^)E
zPl%Ey&DMaDrb@jnf?&=_<3si1C#k@PuJJ7r01b_=8ZSU)C5eJw=bHrslxcRl$p3
zJJ2m8Z|Xx7r{750J-1+y!iul3p~3WM3im|;^|ZRau+A?rnmDctdwXemT&y~ER)v@A_H(#Q)#CZmkVc+vS+n`5#`
zEL_mn569A1dr^X66(=M1q>n^5B0bHw#Cfk+j~q+yt(`2nFVbzz+Hb66?xEIEjWsWP
z4)h>0Mjv|G_j{Mmg~<<#Slwxu&3oL(&~NVBbd^y1k92HBwtzR#{B$P~jM92qIf1!k
ztJ0mc>N4(3Pqg|Thk_Y?_ZU=cceasl4C)oiJO-`9eSr~VJ`X`D$3WC>*efalP|HTA
zimGB=uIJb>2qE`T-7Td(wiF-K2ur%;J`!$TjO0Q3p7j{iIrmFJvH~1~oOZY9Hmoz4
zu#wK)vrD+}^qfJ~>VC44FcVp^GLP2jG@?emriyaiSj1$!D*MLZ9&RSd7hHwQF^qJ%
zE&*ZOPm_i-sKOc~>s@=o;TdEdwBd5yJzyvO*ZxMtQ0?d89&RQi1Zm;OF(?LdT`>Z=
zPz=wY3e@u6wWk)HK~`@+SxGk+S>?Lt!4mqf{UeB>+W!dma5E|LJ!=r$fQab#60z|W
z8BTpPA~5KvMkKhK_QXOOZeN~I(0FA1SMTw6M&*&oPtpp%ygZR`(DD>vj}f-(7W8IM
zq#XB?O$-QIN49M;`t^+G4|gDp3kw>p`^)u=Rd$n>B3NFpFD*qiAoOYb*ko)QJH!22
zpKW9HBWvG_u_)vFi&%e<4UYIJzBZ0`JQ{5*Fur$*OTYV3Q6JQQ8yW3%x?vF@$
z89j3jSe`1({aX1SlZo}}{4CZSeZS9m{w>_7eO(G|j&Gfre6R+Ed>Ejb0Ao~PAbRuG
zehbcfLw?+m9FZSdF+2yNk>V0-K_C1K=KJWCm;4ib@{=36Z~F(tFE;knO6D7N>u0=r
zYllhh3nS}8(CZKN>GfE%`pK`m>#6IsCt$gY_F)+oGH{5zbrATpWx_>x{~6xtcLknP
z@tY6#@>={B!vg*U47zjhy9>YZ2s?y3{ifh~1b(;Sw+X+u@VgRT_rJs9H(`_{{S|)Y
z-={$ZI7gB)(k01{-;DDm>HD}3y+D#K$31=tSoC|B^&ez`snPnKG`c^Qj%&a_9#@QC
zd}5r5rxsej<4l8kftT#J#I6rme;e7OLO86AB|N$hNg*dt3cg7n
z4MbuEE`z#Bc!h>6X`718Qt&uQzv&h|7@<<|=eVF~fNI);M?Hori;x7pHfXd9PS6xb
z0m8)BpKy^=rAlzQZafz3BD{(sT@+H3fhUI>6=u`ZQ40iBp{gmaEJ}_ZNSP1sByL4!
z?XTa1FBVI7rNf#fO=xe`%*Wr;9M?emDn?g{RP>2C0k_5)z@}m=SSn+x
zH89meN^W2XVfY1tr$hOxCIJe*#1MP&+rn8rIV9X%Xs=F9k(F1`@pgz1CJ2?j->d$(
z_xF9V_z3*7@zA@7KJ29!>m|kadU5%kX05usH@}FBH|qb7!beYNt6_f@b-}>Y$K(1B
zHUU{ZmI!yy*n3$l5(XPUWMt!h@7+TaWMu<_uuUGv65Rw=-pQU{17gG1Nz;^fyVYWo
z1q+GG!gI2)1T+t8Ss#~uWpDu~YpqypyiY%HL$3chf(G=`5;(bzw&)0Zj`Sq1;PVI#*a^wl
zVZ4!-T2NZRem}jd<@YoD7KUB*?OU-M_>zGAQA)H;wLg9x6^bqS!(}BXl-nN{4of;H
z0LRBr-hjP}ZZUD!NM9j{9Wxeg=WCzho}GE8R^+JSXm|Ew>La$+%RF^z>EmkorZVl)
z4{6PjSy}ryme+hAfd4<%-UdFZ;_4sYO%_;m;V!yj)F`oyZ79)_nzo5V4UlXCgs=!C
zXfe`9#8jyu?DC=zH`y0C#%-#;JNJ9l2soO9;PnKN_G=&5pWxUN?|BL2$zUZYd3LS7zUdO~Z#
zLda6uskNMoCzPlatI;n?3S0`{J$KBF4t&&BY4?}qbgUSVymFOqG`8w*8neQ&=rS2y
z@?z5^qKAjO_m14OXs&S|YRP~G#;d#awR7jVMss*hD2d%KZ3s?Q#5v7%m#V$ahPd?x;vv(j1T#L~`2^{k>
z*FJA9;m3hz!v7-D;a@BXq-deP<5&FEOCGO$RbR1N{CO$D_}r&!QNHLBH^NE$tKtN_
zy?YXe2daaRxTt5v-{`r1#%?&~=j8+kMCIGo?(E6->!y0dn+fXyIZ5EKHJn?m_*>~K
z+R9td48XX6U<^&6@ob}3!azeuK*C@_j>)MUc6vc8lsTls;wT{-Ga256xO9rzCg|{W
z>20>@vzpQKS4Z{;-+|ISi*gmjH@-bBQDQ>uGa=?Z0uo%@onX6W8qSo~?N^{yK4#qy
zP{oSf|CvPS7uXf&eznl8SgYW6EAw3Z^LbNlaK3OkSw`}u;?717VjH~;-2Fd)HZ3>~
zBZv+FZTgM4;Ke&?cH
zrvLvx6a4-{PEIMD&yXHi@ha71U)LG3^i>Db-#;H|{wU859Q>jo
z=z}hV4oH2lEE?t)L!z!ctqAg6P2F1ixI7GZx1Aoht-gzkI+7PD0~(Ow|Ml)oyqrf1
zwc;(gY#pp*v_A1qop8crfY5pw!;qwyjO)O!O5Ku9?Lv2dn){nrp1enh28hbZt2fcck)BvS|8q=y%+V8}WY
z(niVySg4`{Z|Y2?IvA^sln^0bm&(UAHS!&hZ_+Ub(vGOKBPz{O#2Q=KMWi|9TN{;O
zl*?0T)V`25TBUJqfV6UzR<6=KD$S$PW~;Q>Ds6#ETcFbXD$TFbR;jdAd>h&N2p$sI
zI5gh0SB`cfE&@n(d32QM_2UgsiAG)C=oJq?!GVZB_>W14u8xGV6HOc>T`Llmg-
z2rx%(a^Mw%5x*8dBsS*C_dN3*i#3MuHy0YY3`W*`3(v@!Li}zGUyfg^2#>}i9>xbl
z=0M^H^!x*%*P)^4#&SeN!^`mtI`L($Hh)NmqMk>--qSi8&v+Og6UskHNX5wz-cRjT
z(-eK^)h^PWYq)c+_DM%Pyc~?K#_1}A_=kJ=q-;TN(8xVuKjI_d)%(fRJf_M&d?R9p5|y8P8z-QukyQ_4g=LAlwvELX-<8@414Srda&%~1P
zxYbQ2z#NW1~-b31BSD$8nBohw!+>
zQm5dK88lKk@AO|H>T5EngaX*)@a3kEDH`mF*DgSB+lYVeX*Q%$`qOdECnUsQfznxh
zP%4XyjcjM}CCaca}WYY5?MbG6Afu0X3ddh;z$g775f@tFyipqv=vw9MbUpoYtL&w&kDtXc1UvM@}
zl}P2nS-eExw0u81H6KJ>V%BNd<{=waOI+Aw(U>*E4ktB5+oHA>;r8lx;nb5KEvMM~
zHsluYh}X(7uZQQMX9AnX*V#&YL|9IEb+fhc+i`}L>8%|1aLwpO1cQ3*oYI&UT92K%
zF|Bh@HagZS;0o2f)R(W<&56pmjO0jsc`XKBD;vS*CdjL|HL}67dxdOSmm<%GBs%EfSC
z+UthJr(`^RH~tO%kQ0wkDW*3ONZe5T98v%B@6`?LBw2MyLi)9xq87Mj(dC45n=|7rh`&HS6T6;_z?=B2tMBRe<
z9-pVcAwjqX#T7QH)1iuVs2m}Mjk0uHNjg-V4vjWLU%o85B5(K)4a#2{+0pUwppHcL
zXS=nH-J+>cfA|`-cj8wQfb==$J?2a@R8qi-R7*P+3y2g*)u7)Uys0v!XqQ@G(h
z{eDPpy^XRxY7=@*3qBNeV$EEny9woNER(3131>K63k{0?c
z{B0z!iI%nKt<+%jHfl4g^g%e}TL4!j0s1J4=62vJlnbKEFBou@+rIFSZ>V+8ShM`i
zDBs*P3$xHYTA&CG$QjR>63lM`vwgJ!(VY>8zOMn?)U=s+=p0N~YveqorY#J2Bs(}^
z>5_UCI$+_%rJD+fjvTYZbR7#7PIP@|AADL@2rsIM-#RF0aWqoSQ=j8P++l>sl+YYC
zzk-jI^r*RT(IEe}JkgnSVMz8HIpexS7iiVDjo!r$58Jr*)HZ^XP^a-2U@h8aEP@pz
z)93!>=Xet5Xlf!=r^M^#1wPOA4oJ?|5!wV6Svsc9tA!l+mP%j4K9;WGRIi11pmHVM
z>Hm`xderet{K996sPA)1uR^&f2@!+xB3E%D15DyyxXaME19K-<3F;dLx%Aarw;;Q|
zu>-#Kh>O_+Q`~+!-tH0py9RB>j6Jj
zA0)JpoyowHLJm1T6PxJ0b%>?wu2Gp0_iRG%v=(&)HnN>IiE%L`&C{
z<5vssLJqa~AR|0VAj|fhi38RkNu5LL%K@L3g9GM4!6FRLvM%|FS6>bgo25pL^#V!%
z1Wx9W=DhSqp2*8koj2ehE6BbQnKA?vvBqN9!xGO`D|^`&Fu|Y76coVt003PQvSa$1
z>9Uht=q#SC);BPbelJ=kx%~7F`o4WSdk<&l?mt6os1&VH3W_ysL0`iKSm~OX_+@Le
z@Kmk6gPi!JJY&yN1L{nzJ%)=BjZ43>HP$I)3;G(Wj-_j;X|gpckN@kwUB%Y^1a{~H
zTc6>@I)!XOmy1Pxqm=HFb)u^0wf4qppdGuH94?+j<2E^*APFd9z|P=OjCp5b%2;lo
zfhp(nqy1;mL$QYEszi7LexqT!rT-MmF*Gglk51V#&U>5V1L_F?@Z*;s;}Fv7E+is1KKq
ztJ-;RT(O_3h^=@Mk%_VzeIs9+;qd_bHlcYa$BG|A9G>!|BMmB#;GLF{XMtgwLY}}A
z@2zX`G_p`gwFE~9$f$ZVHSrDA59I~`dC(iq+6+C`hR=ip-IJrWmtO!632)CLF7Ww3ae+y&5v~6_G;BdGqJf4{qCrXucNv26T2T)r
zmfhHhTA+w!MtsDdD%dY2WXjBM*s5`an&*b4>1ur}HBMoCFF
z0SovnRqYumNke2mN^T#oD0vhKpd{1Nlss2ewEmx<k}Wn
zB)bunpH|Bx5a}%yc}5^Oe)<71(F9_p0)pvjAX-&L>zCF7h%E4rxC<9iVB@_UV*(s;
zS!A5aLyD_2BHfe7dPkZ_jL+b@xDR3Hkgy*>eIQ{A(O93f4NQC4Ors%8?O$*ls9ZpT
zC9&)(2(V)a>F!y|u)*j|HP5@+uwPV+IQ5BRV>R9zPu>fQp((IFtYq^JW_r7*srKk&}P
zVwFUit0dH6N&J#Y7pNpsLM3tZCt8rCosInxXY|kSAIE@|8y|}B9J8Lp0o;uMtnwwG
zu2Gifk^1MC=eL+8ar8$#&zH^{L?iNiLI3=cv5*aNaP&S&QNDa-{r^TUk!4PW-`_OI
z;u|276bpG0+xE(4WE{`O^@m3u|4rN?HD_EEeTH<5)x;ZDrL1&DI8NK*Gz
z&BS#`^Tb;^tSq+DU5n4AcLK=4W<2~a&gP52ML@izb#;foX&5xAm_0`4Es>gh_=Wfd
zGUzKg4)v#|<2PE}E9T{wl^W_&RQea)q=j#AAbkqF^7{3fpV;Y=>UGA{7ji{)C4%A|
z{iXuFzC?GtQu?wM9xhXhMG{_3U84%`MU^>P%cGEe@SO_JU;rmxk#8q-TJUECLEe9a
zuLvZ-aP~734jma^RTiC61_M|{C%$q;ge;F*@j?2<$cx))o%*kMo;EtEcg+3lffiUq
z84JMoYGI9lz@w_;7kW)Z0)CzX99VM__{C>4g95$NcmypFFgz@!yB1vxizr*bf8O9&
zLBm8%e!19Vl&H2H3T``U%R#3c!Y&rr@M#2mJ-T2*4Q!bycS|METJUO+Q(sA7`{LR~
zTra_Bg8$u3;@!kcUqX_?8QVNUHnR}D2wcoyd4cZe0*Z;>cCIn&i^Y*qwtKaf$*k9v
zALo>e>wau-x+Nw$lFj;4YzxkD;YlrxoIf%%kaJiIf5}=v)#-nPuS!MMS<6gn!@MXmMNSFoitduMec*^aiBs^)42E7If9?ol#rIy@gp(Z`Od4*B0&t
z>2kGDF>+ZqjgysXLHaN*T}gSi@GjOd9PbzyW59Nceng1p0t~Fm^?9xK(8pRZMyN0t
z-p~R!NB|{26&ghH44GCuUhEm=_#dt1*FX*G;RUm}=*d9Ek~uP?VH={1Pq7$T#Vq52
zw3b&G^-~@skOYlZ_KsPpIQ^%Pv|yXVq*vm;lZtV!WQ&S%-e-^dG7c`5R`jbXMw4YE
zl-N7U6@h@LmLLVHP$e9w=D+YT_v0(_^H-}Ul>&|pPDXqd$~mPXe>C3{o-y*i4*d?h
z*b1UM^eN@|Bvqf_tPULL27}~AD+Y3uIIe>$V^)?<$-B^24cmbB%~}^bP@O|njIQGYs#i)Mq{8D4oTU
zH=ty+7$WHz8!T1d#DK!uVAhCg>mIO%T?=qYgUE_#uC8B%%N4y_l4IwtQf2RC*}`XV
zK2M)aUnPIgZ*rCH(E=4La}#Vu+wRRjJ38;|0VP`&zT?xauZ&k!G?)I03{4t<(2&OT
zLkb+^amnl<(Z{FQs%06Bk|QLwJu;SqsErT>886
zWpe5!{D5}Vb`p_HmCPP1tbGSBGqr9l1*=aBgloy%d}@D3SJvLE>Tnf0~GWVrMx
ziAu^rbPq@bIxhe^DGNGLFg-#SR;JNdece=GF<0`WV*J-l&NMN3kS&@R6Gy>sE2Sui
z0h=7+i9dF$;XR!gSHqiE5cM10YgGSo^eQQy-Qt)U+mO!%;Auk3;UtIsr{ah~Z|@Y#
zpK(&S1Ew}RK0kX`O8<9&?J{t3u2%I1q(e?}u)Fk4E%+*Oj={Lng1=!~Q|zTNWCZTp
z2tJBHUV~f?eLjg-L{h@RI_|_H4Uw}vd2#A|yG{rEAYa9w9i@`~(}=oazh3iaQZEn4
z0QD*cRa;|hO7GK@^_aQ7&mL7t`oWj}bUVrS
zF38teo?NL!yPU>IK0vFrj3D_S>OTT*l&Hrkva=A$SvgU3T;ZPXcud?22K$QEuOY&1
z%8IX>Sr9D@VJ#R15Sgh_@H=K_CbAc9vYkTF
z0$k>p7z8pm%TaLIsq@`wME8P1+{PV{u7oqBSUes5&T$*7GgV4J|Ap(3%_`;l-|>zHpcOYh
zd>0nIZ^(2IK-xXx@=amoF9$-*E9Uz;mubywmRQX8=Q#hkWcwr=LrA*zU>bsm_LxnFz`1z%m-{yQ_6j-5g
z7GZpi={r!Dthe_&rdMgMywsmse^q1cH9dcpcm;QrOth80jujZjH1yvJsA2vWsexO#
z^ty{nuPyd1{=4YTPuh;;f{SD2DiYxVisi_he0ZnsE$xDcz=fS0jF1f&@>9w%{B8OY
zmq_eN1UkN?KC)lxn$Ty$Au%#ygBf)E(y+5MXZT1>YCA&Nui!
z9Kcewpd#@t^j#_v?2H!RWJuT{ly@Zqo4=$u3`l4onSY=*D%n?`g!iJ%nNGsbLi|>AZM-d>4e%|-
zgVgLyB;egr`nrH-%l-u}L`UFJG1_27lmlN{;QIAV2$qW@TGgA!_aJD)|3dL52?erM
z9Dg_Y4aAf|?i3=|Eq#
z6iH>s#v>J@h)B7p;yk;SZ%>g+h&If)r3RD@2kxYVT9INI$>`|Mlc=I!e?o{jr9Xb=
zL4VYexB|U1`4?BzfPW`BPcx+R<8oT9wg@a*5%ShggiAR3710RE+?^d&~I(0aFOSO?tUg
ze*020(jLV^|2p8)UdPEpuE5Yj#nc(d?dk1O>o6A?;7i~}4uk^;P~V|cN@iDz1P~ec
z8!#YVqL90SI&Nxg*b3Cp*i1pPmI^3_M(%^9zmh{^GbPY}qhv+`wH!uArp}OnK=rPG
z=3U@{-t7S-(7Rp04!=)HwO^W8(rhdPyAvgV3-uS$oB4H))4Pf4?EDX0$SzmZ$)zv)
z+NYo13#sE?kG|z$1j)5#PXD#$#b{n#MghtbF}zLlOhW7Th);dKgFae}_sAuuBJNE@
zVjw%jOIqM5)w2>QR{Eh1=FR-3-xIpcxy540^U-x
z$Q(KtyT_QVuPoYzh*QSy7UrqSt?V~$4nrQ;uzVq3hy<{Vk#ixMFd6|omLPTv1&&;d
zClcy5NhQ3OzKP3st6oo@?Jh+oB`ZshYQfjg2v*tO<u&uftmL&o2iv~MrrQFg
zDn;7%M6F}P==OIc})
zlea7okj5p*m}WLp7GZz}66rpnKTuwQj1oEDxPc@}+Cs#ZAK!~#NAi5N9-adOOLV$@Gu>Vj^#h0l;Kun)bSI2zA0s1)57=3dUM66DG5V*
zjmo`O$(R}v^A`##If>u~B-u-Wh2vAV8dE~`&+yL?wHnc!iBbu!EleZVjpB>
zFY43IFle0mqypn2J|UioHdJXbC~|O#U<{X$1>VcH#$fFW?CA}}vS`G33^nPtR?G^K
zSCJW~Y}vi_jIC(3;TtSYve=(lxrtTXhVRo&aJwkqF%|2-B)EE1B1tMc`J7#wIr{@a
zd$pFS1bVL)d=7rtKmf*-}B^Yc*;nA{c3zz0~w1)xpYvpP;2=dot2$RVGaGUc+W!<
zg_)%?*7DmSTrnw>VK$(ct%BLm0Zz*kpMr(*K~KAIx*9h#z1+?PW$irI8w}86R9Rf(uR(6vt
zT&dLL&%`ZU^YUj!%N~o`*|DcxJTbu>qw=7mhRDRvnm$$XQXxV~D%LSgYbv8M6_2f$@v}
zkv1agXQ|$kW6L6`ZqI@xhiAgyM$g6P#3J=NEP1rRSS0mAMH5Fxc55wD&^g@y&9mMx
zMMhoEYwc$>_i%vw2I#(mq)TiUugCt875FgQ`Z`c6_6OeWCG`Vavv9{!U=q%}>yBqa
z+m?=q)>?52KJa5g1nYc?L0?{Sq0xi-n-8Mhd(yF5_R757@7^gJlY%%k#^j_Lbp3moxcO(N@`Yo_fH)pm!IvKtNqij+qIuE%o?PrKnes
zP%!@&LYarzAN0bQTz9tAN^@!W$3aF3>@h7&q@bSBXrM%2VH2)=xqY&n1`iA`3=pt)
z9#k}7u0Xdv2YlJezVv=eYd_NbrKImf6t@9!1=b@JjlHa}cqMKX@(wZ12Ifl+YQa0m
z(?pOJs>RAc+G9uB9m64KET|BVW^6{s2OA
zhvRWPiI1q`{%Em8Z_&qihiCw#r;N`}h>Fl>-WE{Rspr0cG4)-HsfyH?n#wV?^<;ED
z$J7q;EjH-M>?^s{DW8rAy?}WBb?rg+fXzV#9*2X&IHa!Jc
zaisLm6hA0eqP5)2q4k*-%z+JvlUYbkW-WJfcNbHi-1jLY`MGD2&j5FSrhCM8teqC9
zH9$GWoZQ5PMPBsaGRu`t)N0uAV*)2pv+E7q!B24Z2gN}h}Q@|blj_5rZ*zZ&@w%GH9;gRk@z_R{@YxPw6!
zeHW$jz`~T);G>EGh5C;%33Z9W{0NvOuqg|*+jVRi_)mPvE#^&fy7NsyX?xT)8Xx)x
zs#w{qpIf;1HbfqED>(?~?<-*lxqGup%SDMJ3VV#}I#oQGxhAnX?gj
zfrPzJB!&hKcd!Cz-nr|@iWnm~rN1N}X)W@mV5}OmAV`#8#@u-wS%5Kwg5vefg)wnd
zalnR)B?pX_9MB7qCE`l&fmn_~ENAqdbz}(YJxgm$oky|=be?3nhy@O215q|v76oyj
zq)$o*Y9!YGwr&^IVtcS1n9-w)GUl*Q_%6lEd#td%lCBpSmjW3XUL`z~wF@~!`pMdF
zvQS3WK45Hz(x}#}|5o6Z0R0rWSK$fN{bzw|5vIJ=g0w`C0soWCea#e98JYVSp*@q#
zy^{&2$=q8`iIp<<21cGPb0?cJmpd+LnY*waIsfnF?e(1K)AII9s1U|yJQtz>Q}Q-w
z==kyi)5TcPH4>Nn-mFF=EFrrvLr2S=0X9M7^P5kY8q(x~n8VH-3TpN8r8S$l+*)np1-vj724)%%W
zV1Jk~9PHPK*Obopcj|m!SmoGxw^xcJEgna(+poWi+&1R@T|>fDLka@1IwCxG^ds;J`7&U
zkb2%yPSvmk=*mkDnY+rZGR#zSB~GGDV3nBd;##4Y^pL(a3}1azoTm~ge0CeQ{-+RCuv
z6U?=3rV51~+lqEVQ(6tJ+=dOc+`m9qx*WRF)hS)6%G8zW)%pX2+xk*;-d_ilzOnEc
z1NSuYqzWc=Kw7vSao;i$1T~c{8&T&QpY)Bg(TZg-2D6*(vDECwBBdcU!_mPeRopj$
z7Ih{dR}0KVq}b&ixmj!Z0?pzAJQ5JchCl`!OFL!han31A4=g;$g70d9>1;Z)=)eh{
zwTwAs(Gf)Dr?J+2wunW?@xH7@?iq!zZ=t(uflVA@9cFg}FJ+;xEiMdJn3kk6Rx})D
z9uxo{a0HGv{GZAx#u4Y_Y%wC{E7EW#lYg{TE@W(m|8dYzZ3NxWuP}Gks~O{k0LD5|
z94m)`p@n`JaL@?+1hpp*NRK)m)Y`2|_bTQxZEQwnNy{~vCOCr9ve=Ya!%hCZ3Ra0^
z71W2V=BjQh)ra)xet`I~Jq@woHWmI5*|_3qTkJ^8<$hZ-HUMZd*%|6$4`q`1x4ay
zr|24Gdk8+67=vj&Zbf^zHOwZa+Qsz_WB4&yrGr)e4AlS^sSWiYTj-%xj%_UFTTGm2
zlvx|`CT);&mLTm0nbvrc`DzhH)8@u^d8(95`;JP>1Ke_3{A)~o33kI1s*Q8_z9ZF!
z4R5NiC(cFuF;)LRR9LdpA%q*fgkU#gkHShR-(Kb$>yfQ);9IOQ$b9P%1{!!SqgcVP
zhN7(S}X9#COf_HQaI%XX@;EW1I4C2Z>u
zR<-<&v9#+-ygbOaJqp|RAq@L#dCLA;ZrWd^i4-%6hvO2@YSaE&!}r8iTp!hVA2IV0
zLg19cjSur}4Qd0%?ZB^0eO;!iv=+8XtFcUZmMP@7LNep;R4rzy2l1xjTUB|Pr-k98
zDt)*m0GpF>WIFte@AIi0rtyHh?%!LOZNI3^&
zMl}|!l}F&@$O*|+;hi7s@ZBDOIT&ZrQ3zY0fqQcB65}`?Ylj)8r37pBkw=6rUkkdW
zIYgQyvC#ypBr0_3W3in$s`(3L3Vs3wqf4{Kl;vwJ{D=px+FbdK&yriS06Ck&`Vq^|
zxB526FB{C}wxJCuT*19q+L`80{YM4*J-L9_#U@d6d)f}OpUthv!erheznQ@?Gu7D7
zogmcHwDV9)Y*uDwcjisea0lQChOGwiF{}(1t7%p*|x@8cm2K%M@uc80*^Ty1>>A#jHz-TO^2Ahfr
zAhU5RVo>6f*e6+74O&0JZB2pwy@9x-USJW|td76POLg$A!h|01y%Vl30uGXOd-P5#
zBIYQ%!*L0hArO@Mvb^}%9OSTwJ9E9~p!x*$8C0KO^}DH3qnrcgD4Lo^v612cm@?7}
zwuSm(WAqg&+Bk_g@w(Vf2%)=fhwiE%1i=Fb$=k&yfS+j-zSN8JVQvmQz{Zcmynu;j
zjxyK*GAF2uJ4y56ZUr5bC5TPjeoQD|7q7)WmQB3ICf?y%0A9$5*T8Do%;N;{VSrc-3pLVk5t?z9`PBP(Rb7la9z
z`+}Hzrx);$;{v1Dw&QW=q;ScX@BAx~O#&GNqBIE|EN9WJ2+xU5vnq~7*4z|Trn0|1
zqT8fOx1tKjL8UR(l`$CYfdgE+E85)7j(34{B+gG%ys^UUyX><%rLn|ydhY`kb{yY`
zT}Syty}T@WVMae5FWw=NP>B|J6I_WGm^$wuvrd%@aCu;g1-I+VY#fWI0hTCR0SHRV
zl(kSCjR4;E4rStW>9+f!sKX?cGH=#k%)8W=4`;DnwfNQy9!gqOl8@o`-w1&lZ07ps
zb=5O$5Z{lr=)xzBZHO@Mr&q?!H`B(===E9P>XGkiEq_Pdv|Af^MqR&(mW9XxMV|rt
zHDo}o-IYIg6$H=ENj97}$$h+JulL%L6W$*v{hW&qSHAbhRMO)oqdsfNUU*alSX^2E
z0oKfgbByN!Nd|e?Z@`eD&BMn1f*lLT8+Y}~fc=?NdD=Jg4X(BOl~1S3Rku9Pq*mRM
zrOB_eV6A#u>GD(L>N{SQqP7;KXReHdZRx-(uw9L_JT$f7P*27QCu}(7)9@n?LQKV+
zTnu-dPGtto!<=)7(s>@#X|nMcx-i
zwtO`(AQ=9^Ay=A^1LGD7g{a4B$_3hcPK4VJG4&oW1llOwJV;95q@MgC%S%^}R!7YIFqo%_&~s
zzj+?UNosU3NEX1@Ku0(}`i+hB$iPlYnZ-L+cRc6s!FCWG!(nGY?zw59QoNNwwuGd%
zj(T9P=X!n&VI(_v*V&EtkZJBJ@h<>ctvjCb_k8L74y%v`keQ@97Q>Jaav#OEQf%dN
z_yU6(L5Aa2v63t~O|bHL`rdf2v#Zzu-Zn#1e8t0gL3#z7Dymt@cG;BZC&NRC|kGVsG(?u^rh(KL}}8*_wq-+?F9G
zgzvC3XqYp2wD`GbuCh~qtiEUAk)b1~1?C0uNy#Rdrw@6nVFXa{P##PrJe%bP$0o=F
zek%ji;o`!Y^&HdHay;~jmirsuF?jf_Pi)P4pnBm+*~5C81}kSnhD7$30jnHSU*S
z6ox*_jC*fsX3Pg};5fB|qT(Ntrjm79UP7!|CZC1N!7@byTRdtb4tiL;TndtSIkwN?
zPV;?Op`nR}-Ul$vAIJsZR2OZqZ<7rtIIBeWDBIIoOAon+#^m(sZ<$@(=}4{(l;LBV
z5XD2k;=g2ZpbS;udn8#!`)O5R0ePpxXh5sXIv(>FvHAQs
zaPs&Kki&i6_#g>%l}*gIizN;tLTd{Sba5m>joLvSM;(vAl3k*r`2NsmY1^bcIO&CL
za-fMu+BY~8cqBDyQMq0%cWa+sxFFNkO|q@rf7h1$Qlej5ZLI98+d4$7pe@*SzxZ^3i+NmkqwnRrdIk*Hmtmsb0z0R2(c#_ZbTS#DZ>i*
z2_A5t$u!d%QNuLK+TnRGz8z>>jjrRq-PQ0hY%Yd>guLk`FK9u<
zorgvpiQXglNN$U*s6&3rE%WqCAJJaK58yMYufED7wKQ=$#8Fh?Of26ns}M&TRIXFg
z@7w$D(>KKWr6OpY
zNqgv@6fxu93Uu$&TKJ*BXPd2J#oN9+#O@slQMtDNp=aN4^YH76wKTQ9kNooRtG;3_
zuFUM?5|{#nF=BIKyioowX4v6Yn`972>&1-+rX}uuL<1mp<5wij_}xX@j_(e9UZ9QZ
z#HQS{Q|V3Cu8K~pi&j4CN!%5X6){iXTd034vW<=|vi1d09N+N?obUJXuV0>mu|I$#
zGXVZ3BI`Asegj81)P(*>7(e)xgb_Ztsb;_z*CzlLz14jVcy_G%2q5>mB*<4QkY}jM
z>h%=|>Lt`$T4e3mDy)1KKa)4;m0R%fYUNt|Ony*QJ_5MJ=k!$w!ixx<-85~5Pn*iMP#A;Fh}9x1A+P#k2bjs+
zrG1{HTwR)MB97##@-Uz{24p}6_9nu|>v*9+e-I(o)!iON9mf4=h!cZfAD@3UrXBzC
zamoCRi1a6&a!Fq|tv=DwtXKd(=2N+Hv0t9kyQrXl&1SRgc!Y>pg`XMz=nQ{4Vb~-W
z5{bO=x%ipp5b$e%cY${9q(XgCaUxvd!XdcC905ZM=C>_gsRKM;fR`8e)A;_924~{H
zmvzXsUZ1f+R6Z*vuNN~mJa6&9cZZW%oCq~;fq!>NzhVdlg_IMCrJvPVz#lKTmNvkb
z`LhoBST84q$}K1gU*;R+lu+5B-V_oKeo==M6~637x+kwt_h|&+pZqlB@-jNCx8Prb
z{>jgro|aOXK%e_+s5sI;`6GP(ZY_S5_i$1a-l6gCq?mv|${XQO_c6RD@ZT~M{<7xi
zS2KvKz443NCB;T2o9M)C1>RijH~LEaS6!ureuEVF`IHCy{KmKoL32jyi1y!Q{k9gm
z80eH4FxLFWrO2@OPGs@TgIUlT=-9ylwX&PXx#T5;*{;xrsa9t%++f%sK^%MzPc&EK-XG%+
zs9WrjY*@5Ubj96L|HH*RFh+=m95@Hlg4cq4bde#K<_$QHb~fCZ*5xL@pIJ*tdWo1n
z*5&Ux3wM;~?}xX_fw*?u-l?^BTbo?^(D7sOjYF_bj<;+vRBP`H^jzCCDbQ2y`<^}&
z%YA(8I&F;Gx#&$e{=mWsE^TtluJF}hxw-C&F}2P`6A|w(JL?L>d)Fn)=B^6#Gm%79+WDy?OA<3J~d;PcRkdsp52>!-lS
zC0o3MLffJftiDh5p(R_i&@`kOmr*|)ic34ouFyhom4&4Rnjc$Qixc8mR^Vqbt~Is!
zORms@gJ6|~Q$r}GxJhIFMKI62f-@ay^o97rb5Td~>{Ug*`oQv1x6?Zv;D~_)2v~?-
zzccXpIZMuZ!RoYGwBPPs7-7Ex=$G2}hm`_b#{UMhvQFO<@b({fmw~fznS3rEAld58
zp=1j=V=S2TfqIiY(o_*?
zs7bK}yo=hB!&B=yB%|Nt3=7s(*bR?CVtvcMTZnUYN#S;e
z_W3SI#?AHQI^fZXjrtS9?SiYcb^fbv^*uf=dUvm=%OO3{^9!{0tZ`E!Tl`zP{3p*^
z__5-vg?~>5fc;5&tt)v>h6$gxicO)Nz7q5^xXrg%#4|~fKT+S?qGyVK`B}Y}`;LiC
zI7i*m1pWs%cZYU*L0~%wuZSnl#`aL(5I?i-$$a>HnK-+*^Mi*gxj;u
zYK7mub-*QfrdLXO*e{4%vm)B%X{&B`44{6DrPk02;7KT7Hv3+$2zkc5o2#axLfufPwB&T4*T(
zNSdGp2Ov|qaXa4|a;$rhdCX+{;&0%fPNuEKXf?T@gZk{qmY%>#PaEPzJZ`D399scj)W=D>d%TzQEv*}Hp-jpPU+=idsaF@@W=j-)-$gMT?7;YfT=#3iDo9hv>BKWwKeAI=_z7B!YvI`W
zPu6GHC(>TtUc^z$7vavicbV1Ltxydy;B>*px_Gt&T{;a
zwrZ2Abjc;boxTgjCf)7obvvuAFGKEOT_Krc(MDXkQfHT(9r^|+p%2B0hi%@=Ff|qJ
zlj98+?_BP^Y<%e+-@kBb;1zT`?xy-+NnVx-7xfnHOP&`UZx!1|#yPFkv~D;1TC~%IXV~Sq@wH-@
zbzEt;?`ZO(=s0UH#gYqMik4YNxn0qkVQky?TA;~h@eN_`yn~8%8aLv5L37wWV-4=3
z2XV^M3>!dzegVb;`H>DTn~WJ4l!qiUnIZ8chCjNk*OigSmj-uwy}G-acQ8`Gra27;
zQRuN+Mc2qKtz`nf_Q-}y|JpoHqG6$$FB1dm1qjLcDjsFO27X+HB>4M#NvA?&;mm{x$JO{80m0AdB<2QZ*9fI*t
zee}9&y}Vef*ag&DcZ}Qxb%3T%ctUoK+zoxfT_fB${fk@p#BRVFmezVqk#}KYa}2{g
zriH%AnFKB-;b?U4$P>}r647Au-h+KZf6pi__**+#?77@a_tsryXDylwM!?5iqA530
zTZSnzSTChf4G-SWvnRUr0e
z*OiEY@WveI9;mIP2U*<_dIV}&w!C}m^sk%U-*I;ZvmE~QBsy#h#F|hW~p1W&~s)u8{x+hF4`7%S0Jy&;Mb*Q
zMf0^_L{@aOuUb|zUkf#*D*3S%T9~Q?;kjnm_9HDs7e35C007h?ye`WqP1Wk}fvQ@H
zNU?bmF7+D9TPBuS{nuXVtA?f%`w~_-EG9rS{Ti*kJ}YqIQty?46PIft+(3Z|0&bV>
zfsQY{4t?k|*66bAo=QDyJa%96Qn4ediv7M;+M+zqDTfg){2N4s;KO_ixS<*A#WY{u$WR6*z$==v~v=
zQH54Uc9m}T{hgB@=NW%f8T$Gh3ImIwjy`>jtmD@-wK+vQJ&9Xa5z&~$I6BOEEJQn_
z@pZ`Vr?Zl`ORk!yg$ghvBx{1ha?Nn|e`z78vD7`>6-C>U*T~F>{2Y{&nQw!Ezzma*
z-!sFuo3+qe3}5oJ)qgjckVo+%wRyT5Ug~lvK1@vu(Uyq&(!`VP=dvSx*kKkrPIjnx
zBgfJI+8rNe2#1I+&PjKu<`AIy|dJcHQ}=QG<}b
zsrqubddI;DgX~?KL$v0RCQW&Bsaj`cP>X9=2A&4zUgQ-$iC<#Wf~48*TqtZCaKsf$
z7mOhgOOD?rTo}y(Ser}nxj$29)MX#J9sR6Ne4d&TfTjHA9<}z{g-INGcpcV%m?&Vd
zn3h~tN&&q%2UEP%=`PiRFGE`hbeH2RVgw}VZ?h(DZ#8M3B7886RHF3gt}KgjE?|^{
z1`COyuN3pS+ebB3
z!)YD*`xivQ>n%c3QO#BTMx2~ZPxLM>OZ;<1pRxD|D1u227s#OnT6;J+we~?$bL|GR
zKywv)d_y=J?t$jIinJ`+8R&t!P_gI|t$jpbb64PVj2lupYWr!`gs5x0??WSrvQ(1D
zp~!XnPK?lwR9@bQglRrR=MGg9tb6Z#!;nX7;X@ys1zi{}BjIMoNWy0}BK&t{UF9pr
z;ybV@JFxkS+pI~fVpZ%Vnb@pkPAb-}GA6UeO+xx@@QHg*4wXwR&%AKr=vYr$$H&^F
zDTSXQ0$o<)Addqek;*4tck>`pF$+P)EF6HB&B|iCfsTv6yw^{@q%K^(}!7&$0HnRVLgh8-;RYmy|5(HC6&R
zeYk3$gBMkM60_@hZz+`20#pGLmOD?3rN_Flwzw5I^&9fgIqWZWxUGHUuA
z%GL%Isn!*@U^M!vAVE!9%G(J9HaR>lV>K$)8@$GapkrvK7I9^oNZtK*zIaO+d)dyr
zV0&>wt~jovSr`mJWk_za
zv-*3GK^c;p?EUSuxAdufnOQqzfS>-k_QVYPTrqJl138h2XNxR&369{D>s@dkg4q*#
zBeD_ym+KArdK3HxVogz72uh3_g3LGA#9j6Xe4~V!nU*Z_mho3eS}a6>9)8c*&BL)x
z9%$VYGRte-?coX=gLvV^*;ISsXx@c&cCYtanM|dz#UEuD6B`t>@46NHGl%Q2P8K_o
zLwUyr3wl5(@fO;u=)vkc!bMbet!KYxBn}RilPoUqDbvIhg#Ar5mW=#?
zZ&{{e$+#EmJ=|rTc;&xb7DJ<)==HvcYWvEFC1>G0-@vg`M((}yAmmfvb4*090~#f$
z0-xJpsseNEkov|G)NZbPfu*rg12HqHQr%wn(#>}jEiSz
z9q|7JInLZVKwF~{&)j;mN<2gBUSA`s#4_|$d@b}%LBfF36K?T+4+#TLPxztlVkDda
z^dD=%5cC0}9>OYveeXzmuJ!V*I(6qU~tiQdnv~g~w#b{^q7Uidf$d(F(GmvE_W|P5F95
zL9}-1ujl=Kp>t|)7i(JzhvY~@tT=(n!VfaPj6#bR2*IcB8_qgm5JDT6ReKlP5|heg
zJIPB}!)W}}<>99m;0<#(;-_{te(GlG?wQig?3<3kfV;5NXy{!$FL4&k$5MGr&m|EF
zL|$UuE7Zwysq#Zo8hDPMLWo$oaUL+YLN8-7{Z+rU6TfL{FZMdyULm
zB+kTG-itm#&1qto*>`nb0UbB)1<+iP?$aVuq{bpI5J=4|ee75#A#|kRpVrTe^>;*1
ztM`a_B6O>o&fv>=H{r^|A(hBjP3(>(Ap6G-VPBkaE2M;9;Lz?ed*pgYNo<
zxo*OE5OMyd3d{**z6k`80zWms?ospWlkcnfmA+j?d>Z=XNt~FQnpxu(%u1M6F{j$a
zOowsO98Y})Qx3UD3ewxM5?$jZ=NK_sk|c3}?=e#(b&L)4)`SbSnu^)K0&$j(d(Fmi
zkido0T`n+z@qywqv8g^WK$SY9YJoZ3Z!7>TaVP^QvL0Lrb94Fe-3luW*t)V2m1HFr-E^*{cO`w3XBJIR@HZeQj70j_e0?gI#5uMw
zJ~kix*7&y$RTDbY4$oVya82`U62Bj^<%?6dVmR
zwNL=v;u49l*UhX?(A!9Vf$>+>@x(pxEOXu?O$?q+;=UWuwi!XFwNkw-b-TO;0a(BPBo3sdHLihIoP&
zZA`_Iq^P6$8X^--s~XUj1v?0!iE!s@=Ryp+^B7m3I3I`ug^u$|%6r7-Gk_7?my-6O
z@kE~+HyTQnG9Ro^Ti8z!#;sCiDIr5Q*!qq-O$0H@qwbl{mjmN3K-q?CO@tbsmDh-O
zy$1?h1G<|kD6C;vjT)bzOa=#y^GK|h_G2$Oz1mSK<DocdJ_oL0X%
z>3N-}8iP!DtT5*sgFN8>Z{YtlGyE`~0{!_Rc=x;bKMDVNsz813Wsv^o0OPKWj+sPp<%sC3i>Nu9He&qxSjYJ
zE{;J`Pr(5aob5uWiYG|$CGSo7Vm?lgOexf-6elXa#<|)h&y6IO;Mz3vhz0S%^WFF)
z@fDo)y?QCk{Qb0=e{-^i{T!zHc`R||-|8%~7j^YB62EJZy*Qo?zPbnSFFHkO6jzGd
zrAN#YINeg0`29svkx;*fac&6hIAZrMZeap2P?;Ck({qL!e^)r95FdLBDKGfKKAr$-T~IzH953T?DvNBoA`-qesnx`
z)5Qf^McU!>kL*-GIYOeK$3ekDIjOL-B8}!pG?USA682h7U3n
z@d5Ac8GJYuK5|aM$G21X_!#(@V%NXRE=Qq)0E5X()%olh>At*)4+!ia;%Fek5&GEM
zj74a4oHMjjoR6dT*gZq32{^uQe*P;^AvUurF%E?--}`+XAL}l)CC@wMd_W-Xm<0cp
z_nfqN|JnQfOk>FpRQrJy7{9^A6wk%^nPg)QA~N`N=tbhgqyy)ZqBZYW5`%t3bx|Bk
zynYTg-U{;p?I;i&+gas-4Zq|ETo&(}(Vz^Swg;Wu0MR7z%KFh+sERgxZlKObq8jW+
zJ0AYskH3L!>3xR>{1T?R;eli-u?8B|)~oNz@gjjz@0H!(1X-nWi*P+@(&?@rPUB5#mcc%-sn7fy?!?
z^cx(~)YvfFceZ$|XrDA4C%-3JsadGznHP73;=O3+w8ZjedGi!*z(fRY#^i5PfiCk~
zclR!yjmzgAyg^C>b7aPGi5&j28)j$f)2Fy_=dqB*6N9gqh&pELvJGm2xbL%K^T?jk
z*rKnCHUc6}C;&VtlsMtXIb0cytC<7RJSpD7Rg(nM=FL_@$j?h
z)TODA+rzr!;anBrPnkQy^HSyA`7Eu@Ir;Tkk5(YNq`PNFr#j%uXyp&EYT*Zx+>;mX
z>HL@s-X6}ysU0kF7`#FTvl*PgvpnFDjbuCcBGRyVZPS!JC-$Cw@Me73re$gE%e8Fa
zEB0Z|;LU?S*Iu#ir9Z~qUn7&wW}BZdD6K$XvXS8h=%RJ|NZjc=8x9|Z#IhDF0brue
zqeVVMZq>#qlVsZLJDcm43z5w<`_Arf_O&3TzPH^EM1azsL{q&S8Q5i{|8a|4nkWXt
z8(4{~r;U$`IBt+b1TG|;H{>$#FYXIu68QEc9^MO^PvC)NR_xMLCF)FIGF#vnAMoUM
z)O)TIZzYDP27&ZIw?oJqxV0AH#L1ppajm0s5VnE`z<=q$dtqXeXo<|7<$r&Fr0&K@
zZ37TQCXBdm@^5+3fARut}FEQ5_ZN9UNKO%lTn#REK;}<+1h}r8QTCT2>2!z3C7H-8n?|{4q
zcmBmk=mO9BV1_#h;9V#M*?
z&4*Z27AuNjoAJh?t|FAWqXXU{VzC2g4o$~CyeMW2L_=s|Q>=HyWvaQwo0>mV?d{uK
zv|YA(dYdOq9^FyY#g-3R@%brR-lJM>KFAu1I)R3Uq8&wm^Ntw&V|U7)vgtz?#S*Hk
zX!=CDt7!XBy6sJ8Y`deVOKd7aCoTyblKt%-aeS`?T@@|bp|#iDRJ5t+Wi+}8A3Xp-
zv%d#rqbF2;;kW(NVhK(&k*8tmFeP9DEfDjY5-oCJ9h=H4R&j?$$
zh%4AWv;r`=zdXKQ!6u6qoha&>L|lT=rR=2>z49k-ENN-(8QE8iB#v}m7UDIcJv@*=L%L`^<1>GJ~76s6oiedQK7!(
zLH@RJR2sbqo(gpN8G*L+0s3r|BGB}a@838c`765o>(JWM(4
zGaIEK6B}pYO>E?xCBm~2h8Yc{@uLI8pp*Jjm^B%fFtKhatg~emTJRP2m^7%=g7+gF
z=*C7ky^f(~lXSB?i1(+`c%N-{L4Ivfg{-NCFksEW>wku|i?BB3iZG5KoC2sH6SN4k
z8pHQ*p%~p4iWnd_Hp3F})lhr-=BGNsZSZ|R+RA5!HK?HCpCys~6z(c+
zU57-yjru~0k>^Vu(sAld&Hqu`b>oDrQk2C+UA~wVvx(&~`={EliWpoJ$D9)?#!iRi
zogQ-uS(6b!{i*fVn6?FkqX;*4p9TkZYb=Sop9CCjOHYR&OwA?(M~V}p4!~2lRFrj!
zS)G8SQ$o_|00cFi7&=YUI{^plGr7rR7~DbMpN7P$9}wspsapa=lJ^YhPwYg|K6!jU
zY8!D~?_zwf<(nesvFtS*8BxawEPCWn!J$2Msl4c}(%N%`+Y8Sa!3e4qtCqq@seMdt!yoGPk9LnC`4Z4?;ZTeOEZ
zX_0?i1gPu0r{Mg2@k-`E!PCeh_DB_mpL#JVb)cXPNz>{@nA;DYL~ybsIFAYK5o^{W
zF6oMg`Q#sZh!9`Qi=oAK?}feX6rm|56PwNRaXn%;IFYCBz==F5qqVpFR6f@H3=hmA
zVajWBvJ`b*?EaA(53pkwpR$XTVp`EdT}PLzn5zMX-#ZEGFe$gaxxMX$eE>1fX2~?s
z6WCacGz&A8d}SuUr3cS!o+xkGQl-XOb-#Sak<6+XMctFE!1FO|;N0hs3ARO_;h
zqmc#hwXrGD%69aPL>;QyJy+YZ&x-!7Ax4lX2IR1-Vq=*qwWeH_s*t~I6Otxe&9}B1
z{2Eu%q%9Y8O8<^aBy?ZTr62o^YAsQ7P1TL!IUTc+LOtB?w;@E1L^jZnjIBbCAe4vy
zpfG;<7Y{#%U(m<0RerjZt<1G5`+7vHPzOSJ_#Y2%!7tiCs1v`c;HwB_i#8$v>v;UK
zkZ2`(qOBhOwsFxW!c2&VZTNkp>U_XR#NnSMG5HEEMwwL)&%`g6o73@x_E_t{ITY$u
zF}1z~ca;MGwGf3eV~H8~*b2_lv2}@cC{GnM6oC8$k~44#0x4!yJQBFuhP6uXmHlJY
zXr@s^4=LOoKfSDmMg(mSS~XV2bxwVaAN7N#ge7*+9y{b5Oug3=JD4*VUTL=@
zZZLGxU4viN)g-TBQw$`ovZK%fb`4H`-T0cv#YoOVd8mnDa3p4LkXKaYh$*>Xx2il{
znpXO6+$o_Gmv#Y9J=uc9$3LLkk4Kc(X#aoYg01e0fMFs)3g%WjDN~CrBL@O(LbQ=^
zF!+Ngc#nsJ_&xIBMSz0jm04Q1;9;(m+By-AN=t@leU;%>N`u7oLJ(dG27Tj4%)aIb
zf93KDwP&b|r7$;eB)-u;ZUq*S1m24w;FOtCd@kaqFzOcj6@@@DjK(-tTVNub3fN0d
z!ht4d>~M}>>FpFklROj(&r-&k+liw)k?N-jz*yF-?QMF6GSLn4%qu1M#XUqMC
zz~-DOa9?}3wEvyLS*RhoKd_OC0XcH<(iFg^$U*~BL4jnerG>FJpY@*G*TQH){nhw7
z@Ra&9{Y}0b*hmdX?)7C1j8c)$Xrve!U!jyr;exTFgzR@=(8bU>UA(5mD#sPb+`l8~
za|%rmU1w4!ja!glPFv4c0$8;N`p6cw2l^1cSP=2sDjR3cyaBq1;g(ZVQODDjB;hla
z8D@yPXQMQXI3D$I@)6k*!D82>B}g6iBNDhbu9iECvtdb%d!}NNUZpA)8|R@5MLVSi
zWbR3&I6gTL+z$SWO4EcIM%94oOjb8YC?Q#0U^FN`Z(R>knASLHz7QM9^L<8?9JMK%
z9>*=Mb3%%0-IQ-BOI^f$QR4EE944$)-?)LlYdZM*Rl_7TIJD4yVB9#~2kn&D3hg6t
zw2)>ZnrQUeS-5y(uQ=P(WNeAM_p6gi8!167-ZGFtLI=s*N<*O1qeX+~FRW3KhOz>r
zVFU@02M`UekD}q32u9_?ING)zF>xt1wn(W($w4J5E_1Q4SThT8|2yG@V*k%m7YQWFUAZ)^A?{9@8Pf`>}#PKPY$L>}HC5)tBj9S_?P;$J*G
z8zI@*jYP=Su!DINhhWbTlVvv|luTdu?f|D~W&P3C-S|~9meN+VQ8FvBOb$v}fSocg
zYY=U#WIe0#%jVSF5D&YML-O4JVeehQqpGg{;hAKBiA2u?qee|@f}l;_S$=|y>=vo7`0B0%OgdEGPhqy
zf?Eq9BXSRaWf>4?W=C3m-#Z+^o1te(j=_FQWeQq>l74Z2vs)_^w{IYe&Fmp%D1#1U
z^4KKiiT$PcNs2^5QBpxQ13t3h`aUz@zeYQ3agX>z79jo72eoW;vIG1?mzv0gVBT19T(spdQ&r1Rv=0;i4i588-i_Z^ZJ$W#Qx&KtN`R@h6bxBZ2P6v@v%{o>J4(B}71>fj{^39@1
zyg1mxdf{*cldkHU-tI;>mH|{NjI#1F(m~vbRR|;3#NLIqq*hpxE#fxM`5;r`mig)t
zH$IBj=pwf0&5WQ3Oz{EZ1izCfR+dw|rp#eJ_wH#VNF)w)xwOXLz(FCAvaPXRF(fif
zt