From f7c26bbf2592b92034ba1ede42cf1797b1324024 Mon Sep 17 00:00:00 2001 From: Zonespace <41448081+Zonespace27@users.noreply.github.com> Date: Mon, 14 Nov 2022 22:59:06 -0800 Subject: [PATCH] 515 Compat (#17465) * ONLY SKYRAT CHANGES * ACTUALLY SKYRAT CHANGES * yolo, revert later * Update alternate_byond_versions.txt Co-authored-by: AnturK --- .github/alternate_byond_versions.txt | 4 +- .github/guides/HARDDELETES.md | 2 +- .github/guides/STANDARDS.md | 46 +++++++++- .github/workflows/has_515_compatibility.yml | 17 ++++ code/__DEFINES/cooldowns.dm | 4 +- code/__DEFINES/qdel.dm | 6 +- code/__HELPERS/_auxtools_api.dm | 6 +- code/__HELPERS/_lists.dm | 10 +-- code/__HELPERS/_string_lists.dm | 2 +- code/__HELPERS/areas.dm | 4 +- code/__HELPERS/game.dm | 2 +- code/__HELPERS/global_lists.dm | 10 +-- code/__HELPERS/hallucinations.dm | 2 +- code/__HELPERS/hearted.dm | 2 +- code/__HELPERS/icons.dm | 2 +- code/__HELPERS/nameof.dm | 9 ++ code/__HELPERS/priority_announce.dm | 2 +- code/__HELPERS/roundend.dm | 2 +- code/__HELPERS/sorts/__main.dm | 4 +- code/__HELPERS/stat_tracking.dm | 2 +- code/__HELPERS/traits.dm | 4 +- code/__HELPERS/varset_callback.dm | 4 +- code/__byond_version_compat.dm | 53 +++++++++++ code/_compile_options.dm | 15 ---- code/_debugger.dm | 2 +- code/_onclick/click.dm | 2 +- code/_onclick/hud/action_button.dm | 4 +- code/_onclick/hud/alert.dm | 6 +- code/_onclick/hud/credits.dm | 2 +- code/_onclick/hud/fullscreen.dm | 2 +- code/_onclick/hud/hud.dm | 14 +-- code/_onclick/hud/new_player.dm | 20 ++--- code/_onclick/hud/parallax.dm | 8 +- code/_onclick/hud/picture_in_picture.dm | 2 +- code/_onclick/hud/radial.dm | 2 +- code/_onclick/hud/rendering/plane_master.dm | 10 +-- code/_onclick/hud/rendering/render_plate.dm | 8 +- code/_onclick/hud/screen_objects.dm | 4 +- code/controllers/admin.dm | 2 +- .../controllers/configuration/config_entry.dm | 4 +- .../configuration/configuration.dm | 2 +- code/controllers/failsafe.dm | 2 +- code/controllers/master.dm | 12 +-- code/controllers/subsystem/augury.dm | 2 +- code/controllers/subsystem/dbcore.dm | 4 +- code/controllers/subsystem/dcs.dm | 2 +- code/controllers/subsystem/eigenstate.dm | 6 +- code/controllers/subsystem/explosions.dm | 2 +- code/controllers/subsystem/job.dm | 10 +-- code/controllers/subsystem/lag_switch.dm | 6 +- code/controllers/subsystem/lua.dm | 2 +- code/controllers/subsystem/mapping.dm | 4 +- code/controllers/subsystem/materials.dm | 2 +- .../subsystem/movement/movement_types.dm | 16 ++-- code/controllers/subsystem/pathfinder.dm | 2 +- .../subsystem/points_of_interest.dm | 2 +- .../subsystem/processing/quirks.dm | 2 +- code/controllers/subsystem/shuttle.dm | 4 +- code/controllers/subsystem/spatial_gridmap.dm | 6 +- code/controllers/subsystem/statpanel.dm | 4 +- code/controllers/subsystem/tcgsetup.dm | 2 +- code/controllers/subsystem/throwing.dm | 2 +- code/controllers/subsystem/ticker.dm | 8 +- code/controllers/subsystem/time_track.dm | 8 +- code/controllers/subsystem/timer.dm | 2 +- code/controllers/subsystem/traitor.dm | 2 +- code/controllers/subsystem/verb_manager.dm | 2 +- code/controllers/subsystem/weather.dm | 2 +- code/datums/actions/action.dm | 18 ++-- code/datums/actions/cooldown_action.dm | 4 +- code/datums/actions/items/stealth_box.dm | 2 +- code/datums/actions/mobs/charge.dm | 22 ++--- code/datums/actions/mobs/fire_breath.dm | 4 +- code/datums/actions/mobs/lava_swoop.dm | 4 +- code/datums/actions/mobs/projectileattack.dm | 4 +- code/datums/ai/_ai_controller.dm | 6 +- .../ai/basic_mobs/base_basic_controller.dm | 2 +- code/datums/ai/cursed/cursed_controller.dm | 8 +- code/datums/ai/dog/dog_controller.dm | 20 ++--- code/datums/ai/generic/generic_behaviors.dm | 2 +- code/datums/ai/hauntium/haunted_controller.dm | 6 +- code/datums/ai/idle_behaviors/idle_monkey.dm | 4 +- code/datums/ai/making_your_ai.md | 2 +- code/datums/ai/monkey/monkey_behaviors.dm | 4 +- code/datums/ai/monkey/monkey_controller.dm | 24 ++--- .../movement/ai_movement_basic_avoidance.dm | 4 +- code/datums/ai/movement/ai_movement_dumb.dm | 4 +- code/datums/ai/movement/ai_movement_jps.dm | 6 +- .../vending_machine_behaviors.dm | 2 +- code/datums/ai/oldhostile/hostile_tameable.dm | 16 ++-- .../robot_customer_controller.dm | 12 +-- code/datums/alarm.dm | 6 +- code/datums/beam.dm | 8 +- code/datums/brain_damage/brain_trauma.dm | 4 +- code/datums/brain_damage/creepy_trauma.dm | 14 +-- code/datums/brain_damage/imaginary_friend.dm | 10 +-- 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 | 6 +- code/datums/brain_damage/split_personality.dm | 2 +- code/datums/browser.dm | 4 +- code/datums/callback.dm | 28 +++--- code/datums/chatmessage.dm | 14 +-- code/datums/cinematics/_cinematic.dm | 8 +- code/datums/components/_component.dm | 2 + code/datums/components/acid.dm | 18 ++-- code/datums/components/admin_popup.dm | 2 +- code/datums/components/anti_magic.dm | 12 +-- code/datums/components/aquarium.dm | 10 +-- code/datums/components/area_sound_manager.dm | 10 +-- code/datums/components/areabound.dm | 2 +- code/datums/components/armor_plate.dm | 8 +- .../components/atmos_reaction_recorder.dm | 4 +- code/datums/components/bakeable.dm | 6 +- code/datums/components/beetlejuice.dm | 2 +- code/datums/components/blood_walk.dm | 2 +- code/datums/components/bloodysoles.dm | 23 ++--- code/datums/components/boomerang.dm | 8 +- code/datums/components/bumpattack.dm | 8 +- code/datums/components/butchering.dm | 22 ++--- code/datums/components/caltrop.dm | 4 +- code/datums/components/chasm.dm | 8 +- code/datums/components/cleaner.dm | 8 +- code/datums/components/clickbox.dm | 8 +- code/datums/components/clothing_fov_visor.dm | 8 +- code/datums/components/codeword_hearing.dm | 2 +- code/datums/components/combustible_flooder.dm | 10 +-- code/datums/components/connect_containers.dm | 6 +- code/datums/components/connect_loc_behalf.dm | 4 +- code/datums/components/connect_mob_behalf.dm | 4 +- code/datums/components/connect_range.dm | 6 +- code/datums/components/construction.dm | 6 +- .../container_item/container_item.dm | 2 +- code/datums/components/conveyor_movement.dm | 4 +- code/datums/components/cracked.dm | 2 +- code/datums/components/crafting/crafting.dm | 6 +- code/datums/components/crate_carrier.dm | 6 +- code/datums/components/creamed.dm | 3 +- code/datums/components/cult_ritual_item.dm | 22 ++--- code/datums/components/curse_of_hunger.dm | 12 +-- .../components/customizable_reagent_holder.dm | 6 +- code/datums/components/deadchat_control.dm | 38 ++++---- code/datums/components/dejavu.dm | 8 +- code/datums/components/deployable.dm | 6 +- code/datums/components/drift.dm | 20 ++--- code/datums/components/earprotection.dm | 2 +- code/datums/components/edit_complainer.dm | 2 +- code/datums/components/effect_remover.dm | 6 +- code/datums/components/egg_layer.dm | 2 +- code/datums/components/electrified_buckle.dm | 14 +-- code/datums/components/embedded.dm | 16 ++-- code/datums/components/engraved.dm | 4 +- code/datums/components/evolutionary_leap.dm | 4 +- code/datums/components/explodable.dm | 24 ++--- code/datums/components/faction_granter.dm | 4 +- code/datums/components/fishing_spot.dm | 6 +- code/datums/components/food/decomposition.dm | 10 +-- code/datums/components/food/edible.dm | 26 +++--- .../components/food/ice_cream_holder.dm | 18 ++-- code/datums/components/food_storage.dm | 12 +-- code/datums/components/force_move.dm | 8 +- code/datums/components/fov_handler.dm | 14 +-- code/datums/components/fullauto.dm | 39 ++++---- code/datums/components/gags_recolorable.dm | 6 +- code/datums/components/gas_leaker.dm | 2 +- code/datums/components/geiger_sound.dm | 6 +- code/datums/components/genetic_damage.dm | 2 +- code/datums/components/gps.dm | 14 +-- code/datums/components/grillable.dm | 10 +-- code/datums/components/gunpoint.dm | 22 ++--- code/datums/components/hazard_area.dm | 10 +-- code/datums/components/heirloom.dm | 2 +- code/datums/components/hide_highest_offset.dm | 2 +- code/datums/components/holderloving.dm | 6 +- code/datums/components/igniter.dm | 6 +- code/datums/components/infective.dm | 22 ++--- code/datums/components/irradiated.dm | 8 +- code/datums/components/itembound.dm | 2 +- code/datums/components/itempicky.dm | 2 +- code/datums/components/jetpack.dm | 18 ++-- code/datums/components/jousting.dm | 10 +-- code/datums/components/knockoff.dm | 8 +- code/datums/components/label.dm | 4 +- code/datums/components/light_eater.dm | 8 +- code/datums/components/lockon_aiming.dm | 2 +- code/datums/components/manual_blinking.dm | 10 +-- code/datums/components/manual_breathing.dm | 10 +-- code/datums/components/material_container.dm | 10 +-- code/datums/components/mind_linker.dm | 4 +- code/datums/components/mirv.dm | 4 +- code/datums/components/mob_harvest.dm | 8 +- code/datums/components/multiple_lives.dm | 6 +- code/datums/components/omen.dm | 10 +-- code/datums/components/orbiter.dm | 8 +- code/datums/components/overlay_lighting.dm | 44 ++++----- code/datums/components/palette.dm | 14 +-- code/datums/components/payment.dm | 8 +- code/datums/components/pellet_cloud.dm | 42 ++++----- code/datums/components/phylactery.dm | 10 +-- code/datums/components/plumbing/IV_drip.dm | 4 +- code/datums/components/plumbing/_plumbing.dm | 18 ++-- code/datums/components/pricetag.dm | 4 +- code/datums/components/punchcooldown.dm | 6 +- code/datums/components/puzzgrid.dm | 6 +- code/datums/components/radiation_countdown.dm | 4 +- code/datums/components/reagent_refiller.dm | 6 +- code/datums/components/religious_tool.dm | 6 +- code/datums/components/remote_materials.dm | 8 +- code/datums/components/riding/riding.dm | 16 ++-- code/datums/components/riding/riding_mob.dm | 10 +-- .../components/riding/riding_vehicle.dm | 2 +- code/datums/components/rot.dm | 18 ++-- code/datums/components/rotation.dm | 10 +-- code/datums/components/scope.dm | 16 ++-- code/datums/components/seclight_attachable.dm | 20 ++--- code/datums/components/seethrough.dm | 12 +-- code/datums/components/shell.dm | 32 +++---- code/datums/components/shielded.dm | 16 ++-- code/datums/components/shy.dm | 10 +-- code/datums/components/shy_in_room.dm | 10 +-- code/datums/components/simple_access.dm | 8 +- code/datums/components/singularity.dm | 18 ++-- code/datums/components/sitcomlaughter.dm | 4 +- code/datums/components/slippery.dm | 12 +-- code/datums/components/smooth_tunes.dm | 8 +- code/datums/components/soul_stealer.dm | 6 +- code/datums/components/soulstoned.dm | 2 +- code/datums/components/sound_player.dm | 2 +- code/datums/components/spawner.dm | 2 +- code/datums/components/spill.dm | 6 +- code/datums/components/spin2win.dm | 10 +-- code/datums/components/spinny.dm | 6 +- code/datums/components/spirit_holding.dm | 16 ++-- code/datums/components/splattercasting.dm | 8 +- code/datums/components/squashable.dm | 2 +- code/datums/components/squeak.dm | 28 +++--- code/datums/components/stationloving.dm | 12 +-- code/datums/components/stationstuck.dm | 2 +- code/datums/components/strong_pull.dm | 6 +- code/datums/components/subtype_picker.dm | 6 +- code/datums/components/summoning.dm | 8 +- code/datums/components/supermatter_crystal.dm | 20 ++--- code/datums/components/surgery_initiator.dm | 8 +- code/datums/components/swabbing.dm | 10 +-- code/datums/components/swarming.dm | 4 +- code/datums/components/tackle.dm | 18 ++-- code/datums/components/tactical.dm | 6 +- code/datums/components/tameable.dm | 6 +- code/datums/components/tattoo.dm | 4 +- code/datums/components/technointrovert.dm | 4 +- code/datums/components/technoshy.dm | 4 +- code/datums/components/tether.dm | 2 +- code/datums/components/thermite.dm | 12 +-- code/datums/components/tippable.dm | 12 +-- code/datums/components/toggle_suit.dm | 4 +- code/datums/components/transforming.dm | 4 +- code/datums/components/trapdoor.dm | 25 +++--- code/datums/components/twohanded.dm | 20 ++--- code/datums/components/udder.dm | 6 +- code/datums/components/unbreakable.dm | 2 +- code/datums/components/uplink.dm | 24 ++--- code/datums/components/usb_port.dm | 22 ++--- code/datums/components/vacuum.dm | 10 +-- 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 | 4 +- .../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/dna.dm | 6 +- code/datums/elements/_element.dm | 2 +- code/datums/elements/art.dm | 4 +- code/datums/elements/atmos_requirements.dm | 2 +- code/datums/elements/atmos_sensitive.dm | 2 +- code/datums/elements/attack_equip.dm | 4 +- code/datums/elements/backblast.dm | 8 +- code/datums/elements/bane.dm | 4 +- .../elements/basic_body_temp_sensitive.dm | 2 +- code/datums/elements/basic_eating.dm | 4 +- code/datums/elements/beauty.dm | 4 +- code/datums/elements/bed_tucking.dm | 4 +- code/datums/elements/bsa_blocker.dm | 2 +- code/datums/elements/bump_click.dm | 8 +- code/datums/elements/can_barricade.dm | 8 +- code/datums/elements/chemical_transfer.dm | 4 +- code/datums/elements/chewable.dm | 4 +- code/datums/elements/cleaning.dm | 2 +- code/datums/elements/climbable.dm | 10 +-- code/datums/elements/connect_loc.dm | 2 +- code/datums/elements/content_barfer.dm | 2 +- code/datums/elements/crackable.dm | 2 +- code/datums/elements/crusher_loot.dm | 2 +- code/datums/elements/cult_eyes.dm | 4 +- code/datums/elements/cult_halo.dm | 4 +- code/datums/elements/curse_announcement.dm | 4 +- code/datums/elements/death_drops.dm | 2 +- code/datums/elements/decals/_decal.dm | 16 ++-- code/datums/elements/decals/blood.dm | 2 +- code/datums/elements/delete_on_drop.dm | 2 +- code/datums/elements/deliver_first.dm | 10 +-- code/datums/elements/diggable.dm | 2 +- code/datums/elements/digitalcamo.dm | 4 +- code/datums/elements/drag_pickup.dm | 4 +- code/datums/elements/dryable.dm | 2 +- code/datums/elements/earhealing.dm | 2 +- code/datums/elements/easily_fragmented.dm | 2 +- code/datums/elements/embed.dm | 12 +-- code/datums/elements/empprotection.dm | 2 +- code/datums/elements/eyestab.dm | 2 +- code/datums/elements/firestacker.dm | 6 +- code/datums/elements/food/dunkable.dm | 2 +- code/datums/elements/food/food_trash.dm | 22 ++--- code/datums/elements/food/microwavable.dm | 4 +- code/datums/elements/food/processable.dm | 4 +- code/datums/elements/food/venue_price.dm | 2 +- code/datums/elements/footstep.dm | 8 +- code/datums/elements/forced_gravity.dm | 4 +- code/datums/elements/frozen.dm | 7 +- code/datums/elements/honkspam.dm | 2 +- code/datums/elements/item_fov.dm | 4 +- code/datums/elements/item_scaling.dm | 4 +- code/datums/elements/kneecapping.dm | 4 +- code/datums/elements/kneejerk.dm | 2 +- code/datums/elements/knockback.dm | 6 +- code/datums/elements/lazy_fishing_spot.dm | 2 +- code/datums/elements/lifesteal.dm | 6 +- code/datums/elements/light_blocking.dm | 2 +- code/datums/elements/light_eaten.dm | 8 +- code/datums/elements/light_eater.dm | 16 ++-- code/datums/elements/mob_killed_tally.dm | 2 +- code/datums/elements/movement_turf_changer.dm | 2 +- code/datums/elements/movetype_handler.dm | 10 +-- code/datums/elements/nerfed_pulling.dm | 4 +- code/datums/elements/obj_regen.dm | 2 +- .../elements/openspace_item_click_handler.dm | 4 +- code/datums/elements/pet_bonus.dm | 2 +- code/datums/elements/plant_backfire.dm | 6 +- .../elements/prevent_attacking_of_types.dm | 2 +- code/datums/elements/projectile_shield.dm | 2 +- .../elements/radiation_protected_clothing.dm | 2 +- code/datums/elements/ranged_attacks.dm | 4 +- code/datums/elements/ridable.dm | 6 +- code/datums/elements/rust.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/selfknockback.dm | 4 +- code/datums/elements/series.dm | 2 +- code/datums/elements/simple_flying.dm | 2 +- code/datums/elements/skittish.dm | 2 +- code/datums/elements/snail_crawl.dm | 4 +- code/datums/elements/soft_landing.dm | 2 +- code/datums/elements/spooky.dm | 6 +- code/datums/elements/squish.dm | 2 +- code/datums/elements/strippable.dm | 4 +- code/datums/elements/swabbable.dm | 2 +- code/datums/elements/tenacious.dm | 2 +- code/datums/elements/tool_flash.dm | 4 +- code/datums/elements/trait_loc.dm | 2 +- code/datums/elements/turf_transparency.dm | 6 +- code/datums/elements/undertile.dm | 2 +- code/datums/elements/update_icon_blocker.dm | 2 +- .../elements/update_icon_updates_onmob.dm | 2 +- code/datums/elements/venomous.dm | 6 +- code/datums/elements/volatile_gas_storage.dm | 4 +- code/datums/elements/waddling.dm | 4 +- code/datums/elements/wall_engraver.dm | 6 +- code/datums/elements/weapon_description.dm | 4 +- code/datums/elements/weather_listener.dm | 4 +- code/datums/holocall.dm | 2 +- code/datums/hotkeys_help.dm | 2 +- code/datums/hud.dm | 12 +-- code/datums/looping_sounds/_looping_sound.dm | 6 +- code/datums/martial/_martial.dm | 2 +- code/datums/martial/cqc.dm | 4 +- code/datums/martial/plasma_fist.dm | 4 +- code/datums/martial/sleeping_carp.dm | 2 +- code/datums/martial/wrestling.dm | 4 +- code/datums/mergers/_merger.dm | 6 +- code/datums/mind/_mind.dm | 4 +- code/datums/mind/antag.dm | 2 +- code/datums/mood.dm | 18 ++-- code/datums/movement_detector.dm | 4 +- code/datums/mutations/_mutations.dm | 4 +- code/datums/mutations/body.dm | 10 +-- code/datums/mutations/chameleon.dm | 4 +- .../mutations/holy_mutation/burdened.dm | 20 ++--- .../mutations/holy_mutation/honorbound.dm | 20 ++--- code/datums/mutations/hulk.dm | 12 +-- code/datums/mutations/sight.dm | 6 +- code/datums/mutations/speech.dm | 12 +-- code/datums/mutations/telekinesis.dm | 2 +- code/datums/mutations/tongue_spike.dm | 2 +- code/datums/mutations/void_magnet.dm | 2 +- code/datums/profiling.dm | 2 +- code/datums/progressbar.dm | 6 +- .../fields/projectile_dampener.dm | 2 +- .../proximity_monitor/fields/timestop.dm | 8 +- .../proximity_monitor/proximity_monitor.dm | 16 ++-- code/datums/quirks/_quirk.dm | 4 +- code/datums/quirks/negative.dm | 22 ++--- code/datums/quirks/neutral.dm | 28 +++--- code/datums/recipe.dm | 2 +- code/datums/screentips/atom_context.dm | 2 +- code/datums/screentips/item_context.dm | 2 +- code/datums/station_traits/_station_trait.dm | 2 +- code/datums/station_traits/negative_traits.dm | 6 +- code/datums/station_traits/neutral_traits.dm | 10 +-- code/datums/station_traits/positive_traits.dm | 8 +- code/datums/status_effects/debuffs/choke.dm | 32 +++---- .../status_effects/debuffs/confusion.dm | 4 +- code/datums/status_effects/debuffs/debuffs.dm | 14 +-- .../status_effects/debuffs/dizziness.dm | 2 +- .../status_effects/debuffs/drugginess.dm | 2 +- code/datums/status_effects/debuffs/drunk.dm | 2 +- .../status_effects/debuffs/hallucination.dm | 8 +- .../status_effects/debuffs/jitteriness.dm | 2 +- .../status_effects/debuffs/screwy_hud.dm | 2 +- .../datums/status_effects/debuffs/silenced.dm | 2 +- .../status_effects/debuffs/speech_debuffs.dm | 4 +- .../status_effects/debuffs/strandling.dm | 10 +-- code/datums/status_effects/gas.dm | 4 +- code/datums/status_effects/neutral.dm | 10 +-- code/datums/status_effects/wound_effects.dm | 8 +- code/datums/storage/storage.dm | 54 +++++------ .../datums/storage/subtypes/bag_of_holding.dm | 2 +- code/datums/tgs_event_handler.dm | 2 +- code/datums/visual_data.dm | 16 ++-- code/datums/voice_of_god_command.dm | 10 +-- code/datums/weather/weather.dm | 6 +- code/datums/wires/_wires.dm | 2 +- 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/world_topic.dm | 2 +- code/datums/wounds/_wounds.dm | 4 +- code/datums/wounds/bones.dm | 20 ++--- code/datums/wounds/burns.dm | 2 +- code/datums/wounds/pierce.dm | 4 +- code/datums/wounds/scars/_scars.dm | 4 +- code/datums/wounds/slash.dm | 10 +-- code/game/area/areas.dm | 2 +- code/game/atoms.dm | 6 +- code/game/atoms_movable.dm | 8 +- code/game/gamemodes/dynamic/dynamic.dm | 8 +- .../gamemodes/dynamic/dynamic_hijacking.dm | 2 +- .../dynamic/dynamic_unfavorable_situation.dm | 4 +- .../game/gamemodes/dynamic/ruleset_picking.dm | 6 +- code/game/gamemodes/game_mode.dm | 4 +- code/game/gamemodes/objective.dm | 2 +- code/game/machinery/_machinery.dm | 10 +-- code/game/machinery/ai_slipper.dm | 2 +- code/game/machinery/autolathe.dm | 6 +- code/game/machinery/buttons.dm | 2 +- code/game/machinery/camera/camera.dm | 6 +- code/game/machinery/camera/tracking.dm | 2 +- code/game/machinery/civilian_bounties.dm | 4 +- code/game/machinery/computer/apc_control.dm | 2 +- code/game/machinery/computer/arcade/arcade.dm | 4 +- .../machinery/computer/arcade/orion_event.dm | 4 +- code/game/machinery/computer/arena.dm | 8 +- .../computer/atmos_computers/_air_sensor.dm | 2 +- .../computer/atmos_computers/inlets.dm | 2 +- .../computer/atmos_computers/meters.dm | 2 +- .../computer/atmos_computers/outlets.dm | 6 +- code/game/machinery/computer/camera.dm | 4 +- .../game/machinery/computer/communications.dm | 12 +-- code/game/machinery/computer/dna_console.dm | 2 +- code/game/machinery/computer/mechlaunchpad.dm | 10 +-- .../computer/prisoner/gulag_teleporter.dm | 2 +- code/game/machinery/computer/station_alert.dm | 2 +- code/game/machinery/computer/teleporter.dm | 4 +- code/game/machinery/constructable_frame.dm | 2 +- code/game/machinery/dance_machine.dm | 4 +- code/game/machinery/deployable.dm | 2 +- code/game/machinery/dna_scanner.dm | 2 +- code/game/machinery/doors/airlock.dm | 30 +++---- code/game/machinery/doors/alarmlock.dm | 2 +- code/game/machinery/doors/brigdoors.dm | 4 +- code/game/machinery/doors/door.dm | 10 +-- code/game/machinery/doors/firedoor.dm | 36 ++++---- code/game/machinery/doors/poddoor.dm | 4 +- code/game/machinery/doors/windowdoor.dm | 10 +-- code/game/machinery/ecto_sniffer.dm | 2 +- .../embedded_controller/access_controller.dm | 4 +- .../embedded_controller_base.dm | 4 +- code/game/machinery/fat_sucker.dm | 2 +- code/game/machinery/firealarm.dm | 10 +-- code/game/machinery/harvester.dm | 4 +- code/game/machinery/hologram.dm | 4 +- code/game/machinery/hypnochair.dm | 2 +- code/game/machinery/launch_pad.dm | 4 +- code/game/machinery/lightswitch.dm | 2 +- code/game/machinery/limbgrower.dm | 2 +- code/game/machinery/medipen_refiller.dm | 2 +- .../newscaster/newscaster_machine.dm | 4 +- .../machinery/porta_turret/portable_turret.dm | 20 ++--- code/game/machinery/quantum_pad.dm | 2 +- code/game/machinery/recycler.dm | 6 +- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/roulette_machine.dm | 12 +-- code/game/machinery/scan_gate.dm | 6 +- code/game/machinery/sheetifier.dm | 5 +- code/game/machinery/shieldgen.dm | 4 +- code/game/machinery/slotmachine.dm | 8 +- code/game/machinery/suit_storage_unit.dm | 6 +- code/game/machinery/syndicatebomb.dm | 4 +- code/game/machinery/teambuilder.dm | 2 +- .../machinery/telecomms/computers/message.dm | 4 +- .../telecomms/machines/broadcaster.dm | 2 +- .../machinery/telecomms/telecomunications.dm | 2 +- code/game/machinery/transformer.dm | 2 +- code/game/machinery/washing_machine.dm | 2 +- code/game/objects/buckling.dm | 2 +- code/game/objects/effects/anomalies.dm | 10 +-- 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/decals/cleanable/aliens.dm | 4 +- .../effects/decals/cleanable/humans.dm | 10 +-- .../objects/effects/decals/cleanable/misc.dm | 4 +- .../effects/decals/cleanable/robots.dm | 4 +- .../effects/effect_system/effect_system.dm | 2 +- .../effect_system/effects_explosion.dm | 4 +- .../effects/effect_system/effects_water.dm | 8 +- .../fluid_spread/effects_smoke.dm | 8 +- code/game/objects/effects/mines.dm | 6 +- code/game/objects/effects/particle_holder.dm | 4 +- code/game/objects/effects/phased_mob.dm | 2 +- code/game/objects/effects/powerup.dm | 2 +- .../effects/spawners/xeno_egg_delivery.dm | 2 +- code/game/objects/effects/spiderwebs.dm | 6 +- code/game/objects/effects/step_triggers.dm | 10 +-- .../temporary_visuals/miscellaneous.dm | 4 +- code/game/objects/items.dm | 12 +-- code/game/objects/items/RCD.dm | 24 ++--- code/game/objects/items/RCL.dm | 6 +- code/game/objects/items/RPD.dm | 2 +- code/game/objects/items/RSF.dm | 2 +- code/game/objects/items/binoculars.dm | 6 +- code/game/objects/items/body_egg.dm | 4 +- code/game/objects/items/boxcutter.dm | 2 +- code/game/objects/items/broom.dm | 4 +- code/game/objects/items/cardboard_cutouts.dm | 2 +- code/game/objects/items/cards_ids.dm | 24 ++--- code/game/objects/items/charter.dm | 2 +- code/game/objects/items/cigs_lighters.dm | 2 +- code/game/objects/items/clown_items.dm | 2 +- code/game/objects/items/control_wand.dm | 2 +- code/game/objects/items/crab17.dm | 8 +- code/game/objects/items/debug_items.dm | 2 +- code/game/objects/items/defib.dm | 20 ++--- code/game/objects/items/dehy_carp.dm | 6 +- .../items/devices/anomaly_neutralizer.dm | 4 +- code/game/objects/items/devices/camera_bug.dm | 2 +- .../objects/items/devices/desynchronizer.dm | 2 +- .../devices/electroadaptive_pseudocircuit.dm | 2 +- .../objects/items/devices/geiger_counter.dm | 10 +-- code/game/objects/items/devices/megaphone.dm | 2 +- .../objects/items/devices/pressureplates.dm | 6 +- .../objects/items/devices/radio/intercom.dm | 2 +- .../game/objects/items/devices/radio/radio.dm | 6 +- .../items/devices/reverse_bear_trap.dm | 2 +- .../items/devices/scanners/gas_analyzer.dm | 2 +- .../devices/scanners/sequence_scanner.dm | 2 +- code/game/objects/items/devices/spyglasses.dm | 4 +- 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/dice.dm | 2 +- code/game/objects/items/dualsaber.dm | 10 +-- code/game/objects/items/eightball.dm | 2 +- code/game/objects/items/emags.dm | 2 +- code/game/objects/items/etherealdiscoball.dm | 2 +- code/game/objects/items/extinguisher.dm | 2 +- code/game/objects/items/flamethrower.dm | 2 +- code/game/objects/items/food/bread.dm | 4 +- code/game/objects/items/food/cheese.dm | 2 +- code/game/objects/items/food/deepfried.dm | 2 +- code/game/objects/items/food/donuts.dm | 2 +- code/game/objects/items/food/frozen.dm | 2 +- code/game/objects/items/food/meatslab.dm | 4 +- code/game/objects/items/food/misc.dm | 6 +- code/game/objects/items/food/monkeycube.dm | 2 +- code/game/objects/items/food/snacks.dm | 2 +- .../items/granters/magic/_spell_granter.dm | 2 +- code/game/objects/items/grenades/_grenade.dm | 2 +- .../objects/items/grenades/antigravity.dm | 2 +- .../objects/items/grenades/atmos_grenades.dm | 2 +- .../objects/items/grenades/chem_grenade.dm | 4 +- .../objects/items/grenades/clusterbuster.dm | 2 +- code/game/objects/items/grenades/festive.dm | 2 +- code/game/objects/items/grenades/plastic.dm | 2 +- code/game/objects/items/hand_items.dm | 10 +-- code/game/objects/items/handcuffs.dm | 6 +- code/game/objects/items/his_grace.dm | 4 +- code/game/objects/items/holy_weapons.dm | 4 +- code/game/objects/items/hot_potato.dm | 2 +- code/game/objects/items/hourglass.dm | 2 +- code/game/objects/items/implants/implant.dm | 2 +- .../objects/items/implants/implant_chem.dm | 2 +- .../objects/items/implants/implant_clown.dm | 2 +- .../items/implants/implant_deathrattle.dm | 8 +- .../items/implants/implant_explosive.dm | 4 +- .../objects/items/implants/implant_stealth.dm | 2 +- .../objects/items/implants/implantchair.dm | 4 +- .../objects/items/implants/implantuplink.dm | 2 +- code/game/objects/items/mail.dm | 2 +- code/game/objects/items/melee/baton.dm | 8 +- code/game/objects/items/melee/energy.dm | 4 +- code/game/objects/items/melee/misc.dm | 8 +- code/game/objects/items/mop.dm | 4 +- code/game/objects/items/paint.dm | 2 +- code/game/objects/items/plushes.dm | 2 +- code/game/objects/items/puzzle_pieces.dm | 4 +- code/game/objects/items/robot/items/food.dm | 2 +- .../game/objects/items/robot/items/storage.dm | 8 +- code/game/objects/items/robot/items/tools.dm | 6 +- .../objects/items/robot/robot_upgrades.dm | 2 +- code/game/objects/items/shields.dm | 6 +- code/game/objects/items/singularityhammer.dm | 2 +- .../game/objects/items/stacks/sheets/glass.dm | 2 +- code/game/objects/items/stacks/stack.dm | 8 +- code/game/objects/items/storage/backpack.dm | 2 +- code/game/objects/items/storage/bags.dm | 4 +- code/game/objects/items/storage/book.dm | 2 +- .../objects/items/storage/boxes/food_boxes.dm | 2 +- code/game/objects/items/tanks/jetpack.dm | 4 +- code/game/objects/items/tanks/tanks.dm | 2 +- code/game/objects/items/tanks/watertank.dm | 10 +-- code/game/objects/items/tcg/tcg.dm | 4 +- code/game/objects/items/teleportation.dm | 6 +- code/game/objects/items/theft_tools.dm | 4 +- code/game/objects/items/tools/crowbar.dm | 2 +- code/game/objects/items/tools/screwdriver.dm | 2 +- code/game/objects/items/tools/wrench.dm | 2 +- code/game/objects/items/toy_mechs.dm | 2 +- code/game/objects/items/toys.dm | 18 ++-- code/game/objects/items/v8_engine.dm | 4 +- code/game/objects/items/virgin_mary.dm | 2 +- code/game/objects/items/weaponry.dm | 10 +-- code/game/objects/objs.dm | 4 +- code/game/objects/structures/aliens.dm | 10 +-- .../objects/structures/beds_chairs/chair.dm | 2 +- code/game/objects/structures/bonfire.dm | 2 +- .../game/objects/structures/cannons/cannon.dm | 2 +- .../structures/crates_lockers/closets.dm | 8 +- .../crates_lockers/closets/cardboardbox.dm | 4 +- .../crates_lockers/closets/infinite.dm | 2 +- .../structures/crates_lockers/crates.dm | 2 +- .../structures/crates_lockers/crates/bins.dm | 2 +- .../objects/structures/deployable_turret.dm | 2 +- code/game/objects/structures/divine.dm | 2 +- code/game/objects/structures/false_walls.dm | 2 +- code/game/objects/structures/flora.dm | 2 +- code/game/objects/structures/guillotine.dm | 8 +- code/game/objects/structures/guncase.dm | 2 +- 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 | 6 +- .../objects/structures/lavaland/geyser.dm | 2 +- .../structures/lavaland/necropolis_tendril.dm | 2 +- code/game/objects/structures/life_candle.dm | 2 +- code/game/objects/structures/maintenance.dm | 16 ++-- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/objects/structures/mystery_box.dm | 10 +-- code/game/objects/structures/plasticflaps.dm | 2 +- code/game/objects/structures/railings.dm | 4 +- code/game/objects/structures/shower.dm | 6 +- code/game/objects/structures/stairs.dm | 6 +- code/game/objects/structures/tables_racks.dm | 14 +-- .../objects/structures/training_machine.dm | 2 +- .../structures/transit_tubes/station.dm | 8 +- .../transit_tube_construction.dm | 4 +- .../transit_tubes/transit_tube_pod.dm | 6 +- code/game/objects/structures/traps.dm | 2 +- .../objects/structures/windoor_assembly.dm | 2 +- code/game/objects/structures/window.dm | 24 ++--- code/game/say.dm | 4 +- code/game/turfs/closed/minerals.dm | 8 +- code/game/turfs/closed/wall/mineral_walls.dm | 2 +- code/game/turfs/open/floor.dm | 2 +- code/game/turfs/open/floor/light_floor.dm | 4 +- code/game/turfs/open/floor/reinf_floor.dm | 2 +- code/game/turfs/open/openspace.dm | 4 +- code/game/turfs/turf.dm | 2 +- code/game/world.dm | 8 +- code/modules/NTNet/netdata.dm | 2 +- code/modules/admin/IsBanned.dm | 2 +- code/modules/admin/admin_verbs.dm | 4 +- code/modules/admin/antag_panel.dm | 2 +- code/modules/admin/check_antagonists.dm | 2 +- code/modules/admin/create_object.dm | 2 +- code/modules/admin/greyscale_modify_menu.dm | 8 +- code/modules/admin/smites/berforate.dm | 2 +- code/modules/admin/smites/bread.dm | 2 +- code/modules/admin/smites/nugget.dm | 6 +- code/modules/admin/smites/puzzgrid.dm | 6 +- code/modules/admin/tag.dm | 2 +- code/modules/admin/topic.dm | 8 +- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 2 +- code/modules/admin/verbs/admin.dm | 2 +- code/modules/admin/verbs/adminevents.dm | 4 +- code/modules/admin/verbs/adminhelp.dm | 2 +- code/modules/admin/verbs/ai_triumvirate.dm | 2 +- code/modules/admin/verbs/cinematic.dm | 2 +- code/modules/admin/verbs/debug.dm | 12 +-- code/modules/admin/verbs/ert.dm | 4 +- code/modules/admin/verbs/hiddenprints.dm | 2 +- code/modules/admin/verbs/highlander_datum.dm | 6 +- .../modules/admin/verbs/individual_logging.dm | 2 +- code/modules/admin/verbs/lua/_wrappers.dm | 6 +- code/modules/admin/verbs/lua/lua_editor.dm | 4 +- code/modules/admin/verbs/lua/lua_state.dm | 2 +- code/modules/admin/verbs/plane_debugger.dm | 4 +- code/modules/admin/verbs/possess.dm | 4 +- code/modules/admin/verbs/secrets.dm | 10 +-- .../view_variables/reference_tracking.dm | 4 + .../admin/view_variables/topic_basic.dm | 8 +- .../antagonists/_common/antag_datum.dm | 4 +- code/modules/antagonists/_common/antag_hud.dm | 2 +- .../antagonists/_common/antag_spawner.dm | 2 +- code/modules/antagonists/abductor/abductor.dm | 2 +- .../abductor/equipment/abduction_gear.dm | 6 +- .../antagonists/abductor/equipment/gland.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 | 5 +- code/modules/antagonists/blob/blob.dm | 2 +- code/modules/antagonists/blob/overmind.dm | 2 +- .../antagonists/changeling/changeling.dm | 12 +-- .../changeling/powers/biodegrade.dm | 10 +-- .../changeling/powers/fakedeath.dm | 4 +- .../antagonists/changeling/powers/headcrab.dm | 2 +- .../changeling/powers/humanform.dm | 24 +++-- .../changeling/powers/lesserform.dm | 62 ++++++------- .../changeling/powers/mutations.dm | 2 +- .../changeling/powers/strained_muscles.dm | 2 +- .../changeling/powers/tiny_prick.dm | 4 +- .../changeling/powers/transform.dm | 2 +- .../antagonists/clown_ops/bananium_bomb.dm | 2 +- .../antagonists/clown_ops/clown_weapons.dm | 4 +- code/modules/antagonists/cult/blood_magic.dm | 8 +- code/modules/antagonists/cult/cult.dm | 30 +++---- .../antagonists/cult/cult_bastard_sword.dm | 4 +- code/modules/antagonists/cult/cult_comms.dm | 8 +- code/modules/antagonists/cult/cult_items.dm | 10 +-- .../antagonists/cult/cult_structures.dm | 2 +- .../antagonists/cult/rune_spawn_action.dm | 4 +- code/modules/antagonists/cult/runes.dm | 10 +-- .../antagonists/disease/disease_mob.dm | 6 +- .../antagonists/heretic/heretic_antag.dm | 34 +++---- .../antagonists/heretic/heretic_focus.dm | 6 +- .../antagonists/heretic/heretic_knowledge.dm | 30 +++---- .../heretic/heretic_living_heart.dm | 6 +- .../modules/antagonists/heretic/influences.dm | 8 +- .../heretic/items/forbidden_book.dm | 2 +- .../antagonists/heretic/items/hunter_rifle.dm | 2 +- .../antagonists/heretic/knowledge/ash_lore.dm | 10 +-- .../heretic/knowledge/blade_lore.dm | 28 +++--- .../heretic/knowledge/flesh_lore.dm | 16 ++-- .../heretic/knowledge/rust_lore.dm | 26 +++--- .../sacrifice_knowledge.dm | 32 +++---- .../heretic/knowledge/side_void_blade.dm | 4 +- .../heretic/knowledge/void_lore.dm | 22 ++--- .../heretic/magic/ash_ascension.dm | 4 +- .../heretic/magic/furious_steel.dm | 4 +- .../antagonists/heretic/magic/mansus_grasp.dm | 2 +- .../antagonists/heretic/magic/mirror_walk.dm | 4 +- .../antagonists/heretic/magic/shadow_cloak.dm | 16 ++-- .../heretic/mobs/maid_in_mirror.dm | 2 +- .../heretic/status_effects/buffs.dm | 8 +- .../heretic/status_effects/ghoul.dm | 2 +- .../heretic/status_effects/mark_effects.dm | 8 +- .../heretic/structures/carving_knife.dm | 2 +- .../heretic/structures/mawed_crucible.dm | 2 +- .../antagonists/heretic/transmutation_rune.dm | 2 +- .../nukeop/equipment/borgchameleon.dm | 2 +- .../equipment/nuclear_authentication_disk.dm | 2 +- .../equipment/nuclear_bomb/_nuclear_bomb.dm | 6 +- .../equipment/nuclear_bomb/beer_nuke.dm | 4 +- code/modules/antagonists/nukeop/nukeop.dm | 6 +- code/modules/antagonists/pirate/pirate.dm | 2 +- .../antagonists/revenant/haunted_item.dm | 4 +- code/modules/antagonists/revenant/revenant.dm | 6 +- .../revenant/revenant_abilities.dm | 2 +- .../antagonists/revenant/revenant_blight.dm | 2 +- .../antagonists/revolution/revolution.dm | 16 ++-- .../antagonists/separatist/separatist.dm | 2 +- .../modules/antagonists/shade/shade_minion.dm | 2 +- .../antagonists/slaughter/slaughter.dm | 4 +- .../antagonists/space_dragon/space_dragon.dm | 6 +- .../traitor/components/demoraliser.dm | 2 +- .../components/traitor_objective_helpers.dm | 6 +- .../traitor_objective_limit_per_time.dm | 2 +- .../traitor_objective_mind_tracker.dm | 6 +- .../traitor/equipment/Malf_Modules.dm | 18 ++-- .../traitor/equipment/module_picker.dm | 2 +- .../traitor/objectives/assassination.dm | 10 +-- .../traitor/objectives/bug_room.dm | 4 +- .../traitor/objectives/demoralise_graffiti.dm | 12 +-- .../traitor/objectives/demoralise_poster.dm | 6 +- .../traitor/objectives/destroy_item.dm | 2 +- .../traitor/objectives/eyesnatching.dm | 8 +- .../final_objective/battlecruiser.dm | 10 +-- .../final_objective/final_objective.dm | 18 ++-- .../objectives/final_objective/romerol.dm | 8 +- .../final_objective/space_dragon.dm | 10 +-- .../final_objective/supermatter_cascade.dm | 10 +-- .../traitor/objectives/hack_comm_console.dm | 6 +- .../traitor/objectives/kidnapping.dm | 6 +- .../traitor/objectives/locate_weakpoint.dm | 4 +- .../traitor/objectives/sleeper_protocol.dm | 2 +- .../antagonists/traitor/objectives/steal.dm | 8 +- .../antagonists/traitor/uplink_handler.dm | 2 +- .../antagonists/wizard/equipment/artefact.dm | 6 +- .../antagonists/wizard/equipment/soulstone.dm | 8 +- .../wizard/equipment/wizard_spellbook.dm | 2 +- code/modules/antagonists/wizard/wizard.dm | 2 +- code/modules/art/paintings.dm | 4 +- code/modules/art/statues.dm | 2 +- code/modules/assembly/assembly.dm | 4 +- code/modules/assembly/doorcontrol.dm | 14 +-- code/modules/assembly/flash.dm | 8 +- code/modules/assembly/infrared.dm | 10 +-- code/modules/assembly/mousetrap.dm | 10 +-- code/modules/assembly/signaler.dm | 4 +- code/modules/assembly/timer.dm | 2 +- code/modules/assembly/voice.dm | 2 +- code/modules/asset_cache/assets/uplink.dm | 2 +- .../asset_cache/transports/asset_transport.dm | 4 +- .../atmospherics/environmental/LINDA_fire.dm | 4 +- .../atmospherics/machinery/airalarm.dm | 90 +++++++++---------- .../machinery/bluespace_vendor.dm | 2 +- .../components/binary_devices/dp_vent_pump.dm | 2 +- .../components/binary_devices/pump.dm | 10 +-- .../components/binary_devices/valve.dm | 4 +- .../components/binary_devices/volume_pump.dm | 10 +-- .../machinery/components/components_base.dm | 2 +- .../machinery/components/fusion/hfr_procs.dm | 10 +-- .../atmospherics/machinery/components/tank.dm | 8 +- .../components/unary_devices/cryo.dm | 4 +- .../atmospherics/machinery/other/meter.dm | 2 +- .../portable/portable_atmospherics.dm | 2 +- code/modules/autowiki/autowiki.dm | 2 +- code/modules/autowiki/pages/techweb.dm | 2 +- code/modules/autowiki/pages/vending.dm | 2 +- code/modules/awaymissions/away_props.dm | 4 +- code/modules/awaymissions/gateway.dm | 2 +- .../awaymissions/mission_code/murderdome.dm | 2 +- .../modules/awaymissions/super_secret_room.dm | 4 +- code/modules/balloon_alert/balloon_alert.dm | 6 +- code/modules/buildmode/buildmode.dm | 2 +- code/modules/capture_the_flag/ctf_game.dm | 6 +- code/modules/cards/cardhand.dm | 2 +- code/modules/cards/deck/deck.dm | 6 +- code/modules/cargo/centcom_podlauncher.dm | 2 +- code/modules/cargo/department_order.dm | 2 +- code/modules/cargo/gondolapod.dm | 2 +- code/modules/cargo/packs/organic.dm | 2 +- code/modules/cargo/supplypod.dm | 22 ++--- code/modules/cargo/supplypod_beacon.dm | 2 +- code/modules/cargo/universal_scanner.dm | 2 +- code/modules/chatter/chatter.dm | 2 +- code/modules/client/client_colour.dm | 2 +- code/modules/client/client_procs.dm | 12 +-- code/modules/client/preferences/README.md | 2 +- .../client/preferences/middleware/antags.dm | 2 +- .../client/preferences/middleware/jobs.dm | 8 +- .../preferences/middleware/keybindings.dm | 6 +- .../client/preferences/middleware/names.dm | 2 +- .../client/preferences/middleware/quirks.dm | 4 +- .../client/preferences/middleware/random.dm | 4 +- code/modules/client/preferences_savefile.dm | 2 +- code/modules/clothing/chameleon.dm | 4 +- code/modules/clothing/clothing.dm | 8 +- code/modules/clothing/glasses/_glasses.dm | 4 +- code/modules/clothing/gloves/_gloves.dm | 2 +- code/modules/clothing/gloves/color.dm | 4 +- code/modules/clothing/gloves/special.dm | 4 +- code/modules/clothing/head/frenchberet.dm | 2 +- code/modules/clothing/head/jobs.dm | 2 +- .../clothing/head/mind_monkey_helmet.dm | 2 +- code/modules/clothing/head/tinfoilhat.dm | 8 +- code/modules/clothing/masks/_masks.dm | 4 +- code/modules/clothing/masks/animal_masks.dm | 2 +- code/modules/clothing/shoes/_shoes.dm | 14 +-- code/modules/clothing/shoes/bananashoes.dm | 2 +- code/modules/clothing/shoes/cowboy.dm | 4 +- code/modules/clothing/shoes/galoshes.dm | 2 +- code/modules/clothing/shoes/gunboots.dm | 8 +- code/modules/clothing/shoes/kindlekicks.dm | 4 +- .../modules/clothing/suits/reactive_armour.dm | 2 +- code/modules/clothing/under/accessories.dm | 6 +- code/modules/detectivework/scanner.dm | 2 +- code/modules/economy/holopay.dm | 4 +- code/modules/events/_event.dm | 2 +- code/modules/events/fake_virus.dm | 2 +- code/modules/events/ghost_role/_ghost_role.dm | 2 +- .../events/ghost_role/fugitive_event.dm | 2 +- code/modules/events/ghost_role/pirates.dm | 6 +- code/modules/events/immovable_rod.dm | 2 +- code/modules/events/scrubber_clog.dm | 4 +- code/modules/events/shuttle_insurance.dm | 2 +- code/modules/events/spacevine.dm | 2 +- code/modules/events/wizard/embeddies.dm | 2 +- code/modules/events/wizard/fakeexplosion.dm | 2 +- code/modules/events/wizard/greentext.dm | 2 +- code/modules/events/wizard/rpgloot.dm | 2 +- code/modules/events/wizard/rpgtitles.dm | 4 +- code/modules/experisci/destructive_scanner.dm | 8 +- .../experiment/handlers/experiment_handler.dm | 22 ++--- .../experiment/physical_experiments.dm | 4 +- code/modules/experisci/handheld_scanner.dm | 2 +- code/modules/explorer_drone/adventure.dm | 2 +- .../modules/explorer_drone/control_console.dm | 4 +- code/modules/explorer_drone/exodrone.dm | 10 +-- .../exploration_events/resource.dm | 2 +- code/modules/explorer_drone/loot.dm | 2 +- code/modules/explorer_drone/manager.dm | 2 +- code/modules/explorer_drone/scanner_array.dm | 8 +- code/modules/fishing/aquarium/aquarium.dm | 2 +- code/modules/fishing/fish/_fish.dm | 10 +-- code/modules/fishing/fishing_minigame.dm | 8 +- code/modules/fishing/fishing_rod.dm | 12 +-- code/modules/flufftext/Dreaming.dm | 2 +- .../food_and_drinks/machinery/coffeemaker.dm | 2 +- .../food_and_drinks/machinery/deep_fryer.dm | 2 +- .../food_and_drinks/machinery/food_cart.dm | 10 +-- .../food_and_drinks/machinery/gibber.dm | 2 +- .../food_and_drinks/machinery/griddle.dm | 10 +-- .../food_and_drinks/machinery/grill.dm | 2 +- .../food_and_drinks/machinery/microwave.dm | 6 +- .../machinery/monkeyrecycler.dm | 2 +- .../modules/food_and_drinks/machinery/oven.dm | 2 +- code/modules/food_and_drinks/plate.dm | 4 +- .../restaurant/custom_order.dm | 2 +- code/modules/forensics/_forensics.dm | 2 +- code/modules/hallucination/_hallucination.dm | 8 +- code/modules/hallucination/battle.dm | 22 ++--- code/modules/hallucination/body.dm | 6 +- code/modules/hallucination/bolted_airlocks.dm | 2 +- .../modules/hallucination/bubblegum_attack.dm | 4 +- code/modules/hallucination/fake_chat.dm | 2 +- code/modules/hallucination/fake_death.dm | 4 +- code/modules/hallucination/fake_sound.dm | 2 +- code/modules/hallucination/hazard.dm | 6 +- .../modules/hallucination/inhand_fake_item.dm | 2 +- .../modules/hallucination/nearby_fake_item.dm | 2 +- code/modules/hallucination/on_fire.dm | 2 +- .../hallucination/screwy_health_doll.dm | 6 +- code/modules/hallucination/shock.dm | 4 +- code/modules/hallucination/station_message.dm | 2 +- code/modules/hallucination/stray_bullet.dm | 8 +- code/modules/hallucination/xeno_attack.dm | 8 +- code/modules/holiday/holidays.dm | 2 +- code/modules/holodeck/computer.dm | 10 +-- code/modules/holodeck/holo_effect.dm | 2 +- code/modules/holodeck/items.dm | 2 +- code/modules/holodeck/turfs.dm | 2 +- code/modules/hydroponics/fermenting_barrel.dm | 2 +- code/modules/hydroponics/grown.dm | 2 +- code/modules/hydroponics/grown/banana.dm | 4 +- code/modules/hydroponics/grown/melon.dm | 2 +- code/modules/hydroponics/grown/replicapod.dm | 6 +- code/modules/hydroponics/hydroitemdefines.dm | 2 +- code/modules/hydroponics/hydroponics.dm | 28 +++--- code/modules/hydroponics/plant_genes.dm | 34 +++---- .../modules/hydroponics/unique_plant_genes.dm | 40 ++++----- .../industrial_lift/crossing_signal.dm | 2 +- .../industrial_lift/elevator_button.dm | 2 +- .../modules/industrial_lift/elevator_panel.dm | 4 +- .../industrial_lift/industrial_lift.dm | 18 ++-- .../modules/industrial_lift/lift_indicator.dm | 2 +- code/modules/industrial_lift/lift_master.dm | 14 +-- code/modules/industrial_lift/tram_controls.dm | 4 +- code/modules/industrial_lift/tram_desto.dm | 2 +- .../industrial_lift/tram_lift_master.dm | 10 +-- .../instrument_data/_instrument_data.dm | 2 +- code/modules/instruments/items.dm | 2 +- code/modules/instruments/piano_synth.dm | 34 +++---- code/modules/instruments/songs/editor.dm | 2 +- code/modules/interview/interview.dm | 4 +- code/modules/jobs/job_types/_job.dm | 2 +- code/modules/jobs/job_types/mime.dm | 2 +- code/modules/jobs/job_types/prisoner.dm | 2 +- code/modules/library/bookcase.dm | 2 +- code/modules/library/lib_machines.dm | 18 ++-- .../library/skill_learning/skill_station.dm | 4 +- code/modules/lighting/lighting_source.dm | 2 +- code/modules/mafia/controller.dm | 24 ++--- code/modules/mafia/roles.dm | 58 ++++++------ .../ruins/lavalandruin_code/biodome_winter.dm | 2 +- .../ruins/objects_and_mobs/ash_walker_den.dm | 2 +- .../ruins/objects_and_mobs/necropolis_gate.dm | 8 +- .../ruins/objects_and_mobs/sin_ruins.dm | 4 +- .../ruins/spaceruin_code/hilbertshotel.dm | 6 +- .../ruins/spaceruin_code/oldstation.dm | 10 +-- code/modules/mapping/mapping_helpers.dm | 2 +- .../modular_map_loader/modular_map_loader.dm | 2 +- code/modules/meteors/meteors.dm | 2 +- code/modules/mining/aux_base.dm | 2 +- .../modules/mining/equipment/explorer_gear.dm | 2 +- .../modules/mining/equipment/kheiral_cuffs.dm | 2 +- .../mining/equipment/kinetic_crusher.dm | 6 +- code/modules/mining/equipment/mining_tools.dm | 2 +- .../equipment/monster_organs/brimdust_sac.dm | 6 +- .../equipment/monster_organs/monster_organ.dm | 2 +- .../equipment/monster_organs/rush_gland.dm | 4 +- code/modules/mining/equipment/resonator.dm | 6 +- .../mining/equipment/wormhole_jaunter.dm | 2 +- code/modules/mining/laborcamp/laborstacker.dm | 2 +- .../modules/mining/lavaland/megafauna_loot.dm | 28 +++--- code/modules/mining/lavaland/tendril_loot.dm | 39 ++++---- code/modules/mining/machine_processing.dm | 2 +- code/modules/mining/machine_redemption.dm | 2 +- code/modules/mining/machine_vending.dm | 2 +- code/modules/mining/ores_coins.dm | 4 +- code/modules/mob/dead/new_player/login.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/dead/observer/orbit.dm | 4 +- code/modules/mob/inventory.dm | 2 +- .../mob/living/basic/farm_animals/cow/_cow.dm | 6 +- .../basic/farm_animals/cow/cow_moonicorn.dm | 2 +- .../mob/living/basic/farm_animals/pig.dm | 2 +- .../mob/living/basic/farm_animals/sheep.dm | 4 +- .../mob/living/basic/vermin/cockroach.dm | 2 +- code/modules/mob/living/basic/vermin/mouse.dm | 2 +- code/modules/mob/living/brain/posibrain.dm | 2 +- .../mob/living/carbon/alien/adult/adult.dm | 2 +- .../living/carbon/alien/adult/caste/hunter.dm | 2 +- .../modules/mob/living/carbon/alien/organs.dm | 10 +-- .../carbon/alien/special/alien_embryo.dm | 6 +- .../living/carbon/alien/special/facehugger.dm | 12 +-- code/modules/mob/living/carbon/carbon.dm | 10 +-- .../mob/living/carbon/carbon_defense.dm | 6 +- code/modules/mob/living/carbon/death.dm | 4 +- code/modules/mob/living/carbon/human/emote.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 12 +-- .../mob/living/carbon/human/init_signals.dm | 2 +- .../mob/living/carbon/human/monkey/monkey.dm | 2 +- .../mob/living/carbon/human/species.dm | 8 +- .../carbon/human/species_types/dullahan.dm | 6 +- .../carbon/human/species_types/ethereal.dm | 14 +-- .../carbon/human/species_types/golems.dm | 10 +-- .../carbon/human/species_types/jellypeople.dm | 2 +- .../carbon/human/species_types/monkeys.dm | 2 +- .../modules/mob/living/carbon/init_signals.dm | 4 +- code/modules/mob/living/death.dm | 2 +- code/modules/mob/living/emote.dm | 6 +- code/modules/mob/living/init_signals.dm | 50 +++++------ code/modules/mob/living/life.dm | 2 +- code/modules/mob/living/living.dm | 12 +-- code/modules/mob/living/living_defense.dm | 6 +- code/modules/mob/living/living_fov.dm | 2 +- code/modules/mob/living/living_say.dm | 4 +- code/modules/mob/living/navigation.dm | 8 +- code/modules/mob/living/silicon/ai/ai.dm | 10 +-- code/modules/mob/living/silicon/ai/death.dm | 4 +- .../living/silicon/ai/freelook/cameranet.dm | 2 +- .../mob/living/silicon/ai/freelook/chunk.dm | 2 +- code/modules/mob/living/silicon/ai/life.dm | 2 +- .../modules/mob/living/silicon/ai/multicam.dm | 2 +- code/modules/mob/living/silicon/laws.dm | 4 +- code/modules/mob/living/silicon/robot/laws.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 22 ++--- .../mob/living/silicon/robot/robot_defense.dm | 2 +- .../mob/living/silicon/robot/robot_defines.dm | 2 +- .../mob/living/silicon/robot/robot_model.dm | 10 +-- code/modules/mob/living/silicon/silicon.dm | 2 +- .../mob/living/silicon/silicon_movement.dm | 2 +- .../living/simple_animal/bot/SuperBeepsky.dm | 10 +-- .../mob/living/simple_animal/bot/bot.dm | 18 ++-- .../mob/living/simple_animal/bot/cleanbot.dm | 6 +- .../mob/living/simple_animal/bot/ed209bot.dm | 2 +- .../mob/living/simple_animal/bot/floorbot.dm | 2 +- .../mob/living/simple_animal/bot/honkbot.dm | 20 ++--- .../living/simple_animal/bot/hygienebot.dm | 8 +- .../mob/living/simple_animal/bot/medbot.dm | 6 +- .../mob/living/simple_animal/bot/mulebot.dm | 16 ++-- .../mob/living/simple_animal/bot/secbot.dm | 20 ++--- .../mob/living/simple_animal/friendly/dog.dm | 8 +- .../simple_animal/friendly/drone/_drone.dm | 8 +- .../friendly/drone/visuals_icons.dm | 4 +- .../simple_animal/friendly/farm_animals.dm | 2 +- .../living/simple_animal/friendly/trader.dm | 10 +-- .../living/simple_animal/guardian/guardian.dm | 6 +- .../simple_animal/guardian/types/charger.dm | 2 +- .../simple_animal/guardian/types/explosive.dm | 6 +- .../simple_animal/guardian/types/fire.dm | 2 +- .../guardian/types/gravitokinetic.dm | 2 +- .../simple_animal/guardian/types/ranged.dm | 2 +- .../living/simple_animal/heretic_monsters.dm | 6 +- .../mob/living/simple_animal/hostile/bees.dm | 2 +- .../hostile/bosses/paperwizard.dm | 2 +- .../mob/living/simple_animal/hostile/carp.dm | 2 +- .../simple_animal/hostile/giant_spider.dm | 8 +- .../mob/living/simple_animal/hostile/goose.dm | 20 ++--- .../living/simple_animal/hostile/headcrab.dm | 2 +- .../living/simple_animal/hostile/hostile.dm | 12 +-- .../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 | 2 +- .../hostile/megafauna/bubblegum.dm | 12 +-- .../hostile/megafauna/colossus.dm | 14 +-- .../hostile/megafauna/demonic_frost_miner.dm | 16 ++-- .../simple_animal/hostile/megafauna/drake.dm | 16 ++-- .../hostile/megafauna/hierophant.dm | 28 +++--- .../simple_animal/hostile/megafauna/legion.dm | 10 +-- .../hostile/megafauna/wendigo.dm | 2 +- .../hostile/mining_mobs/basilisk.dm | 2 +- .../hostile/mining_mobs/brimdemon.dm | 4 +- .../hostile/mining_mobs/curse_blob.dm | 8 +- .../hostile/mining_mobs/elites/elite.dm | 22 ++--- .../mining_mobs/elites/goliath_broodmother.dm | 6 +- .../hostile/mining_mobs/elites/herald.dm | 20 ++--- .../hostile/mining_mobs/elites/legionnaire.dm | 8 +- .../hostile/mining_mobs/elites/pandora.dm | 10 +-- .../hostile/mining_mobs/goldgrub.dm | 2 +- .../hostile/mining_mobs/goliath.dm | 8 +- .../hostile/mining_mobs/gutlunch.dm | 2 +- .../hostile/mining_mobs/hivelord.dm | 2 +- .../living/simple_animal/hostile/mushroom.dm | 4 +- .../mob/living/simple_animal/hostile/ooze.dm | 10 +-- .../living/simple_animal/hostile/regalrat.dm | 2 +- .../simple_animal/hostile/retaliate/clown.dm | 4 +- .../simple_animal/hostile/retaliate/frog.dm | 2 +- .../simple_animal/hostile/space_dragon.dm | 10 +-- .../living/simple_animal/hostile/vatbeast.dm | 2 +- .../simple_animal/hostile/venus_human_trap.dm | 10 +-- .../living/simple_animal/hostile/zombie.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 2 +- .../mob/living/simple_animal/slime/life.dm | 2 +- .../mob/living/simple_animal/slime/slime.dm | 14 +-- code/modules/mob/living/ventcrawling.dm | 2 +- code/modules/mob/mob.dm | 12 +-- code/modules/mob/transform_procs.dm | 10 +-- code/modules/mob_spawn/mob_spawn.dm | 4 +- code/modules/mod/mod_actions.dm | 10 +-- code/modules/mod/mod_activation.dm | 12 +-- code/modules/mod/mod_ai.dm | 4 +- code/modules/mod/mod_control.dm | 14 +-- code/modules/mod/mod_core.dm | 18 ++-- code/modules/mod/mod_paint.dm | 2 +- code/modules/mod/modules/_module.dm | 12 +-- code/modules/mod/modules/module_kinesis.dm | 6 +- code/modules/mod/modules/module_pathfinder.dm | 2 +- code/modules/mod/modules/modules_antag.dm | 14 +-- .../mod/modules/modules_engineering.dm | 4 +- code/modules/mod/modules/modules_general.dm | 22 ++--- code/modules/mod/modules/modules_maint.dm | 10 +-- code/modules/mod/modules/modules_medical.dm | 4 +- code/modules/mod/modules/modules_ninja.dm | 22 ++--- code/modules/mod/modules/modules_science.dm | 2 +- code/modules/mod/modules/modules_security.dm | 20 ++--- code/modules/mod/modules/modules_supply.dm | 26 +++--- code/modules/mod/modules/modules_timeline.dm | 18 ++-- .../computers/item/computer.dm | 2 +- .../computers/item/role_tablet_presets.dm | 6 +- .../file_system/programs/alarm.dm | 2 +- .../programs/antagonist/revelation.dm | 2 +- .../file_system/programs/atmosscan.dm | 2 +- .../file_system/programs/emojipedia.dm | 2 +- .../file_system/programs/frontier.dm | 2 +- .../file_system/programs/ntmessenger.dm | 4 +- .../file_system/programs/radar.dm | 2 +- .../file_system/programs/signalcommander.dm | 2 +- .../file_system/programs/sm_monitor.dm | 4 +- .../modular_computers/laptop_vendor.dm | 2 +- code/modules/ninja/ninjaDrainAct.dm | 24 ++--- code/modules/pai/card.dm | 2 +- code/modules/pai/door_jack.dm | 8 +- code/modules/pai/pai.dm | 2 +- code/modules/pai/shell.dm | 2 +- code/modules/paperwork/clipboard.dm | 2 +- code/modules/paperwork/fax.dm | 8 +- code/modules/paperwork/pen.dm | 4 +- code/modules/paperwork/photocopier.dm | 12 +-- code/modules/paperwork/ticketmachine.dm | 2 +- code/modules/photography/camera/camera.dm | 14 +-- code/modules/plumbing/ducts.dm | 2 +- code/modules/plumbing/plumbers/fermenter.dm | 2 +- .../plumbing/plumbers/grinder_chemical.dm | 2 +- .../plumbing/plumbers/plumbing_buffer.dm | 6 +- .../plumbing/plumbers/reaction_chamber.dm | 4 +- code/modules/point/point.dm | 4 +- code/modules/power/apc/apc_attack.dm | 12 +-- code/modules/power/apc/apc_main.dm | 16 ++-- code/modules/power/apc/apc_malf.dm | 2 +- code/modules/power/apc/apc_tool_act.dm | 2 +- code/modules/power/cable.dm | 10 +-- code/modules/power/cell.dm | 8 +- code/modules/power/lighting/light.dm | 10 +-- code/modules/power/lighting/light_items.dm | 2 +- code/modules/power/pipecleaners.dm | 2 +- code/modules/power/power.dm | 2 +- code/modules/power/rtg.dm | 2 +- code/modules/power/singularity/boh_tear.dm | 2 +- .../power/singularity/containment_field.dm | 6 +- .../power/singularity/field_generator.dm | 20 ++--- code/modules/power/singularity/narsie.dm | 30 +++---- code/modules/power/singularity/singularity.dm | 10 +-- code/modules/power/solar.dm | 4 +- code/modules/power/supermatter/supermatter.dm | 6 +- .../supermatter_delamination/cascade_delam.dm | 6 +- .../delamination_effects.dm | 2 +- code/modules/power/tesla/energy_ball.dm | 2 +- code/modules/power/tracker.dm | 2 +- .../procedural_mapping/mapGenerator.dm | 4 +- .../projectiles/ammunition/_ammunition.dm | 6 +- .../boxes_magazines/_box_magazine.dm | 2 +- code/modules/projectiles/gun.dm | 6 +- code/modules/projectiles/guns/ballistic.dm | 6 +- .../modules/projectiles/guns/ballistic/bow.dm | 2 +- code/modules/projectiles/guns/energy.dm | 4 +- .../projectiles/guns/energy/beam_rifle.dm | 4 +- .../projectiles/guns/energy/recharge.dm | 4 +- .../projectiles/guns/energy/special.dm | 2 +- code/modules/projectiles/guns/magic.dm | 4 +- .../projectiles/guns/special/blastcannon.dm | 8 +- .../guns/special/grenade_launcher.dm | 2 +- .../projectiles/guns/special/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 | 6 +- code/modules/reagents/chemistry/items.dm | 2 +- .../chemistry/machinery/chem_dispenser.dm | 12 ++- .../chemistry/machinery/chem_heater.dm | 4 +- .../reagents/chemistry/machinery/pandemic.dm | 4 +- .../chemistry/machinery/reagentgrinder.dm | 4 +- .../chemistry/reagents/alcohol_reagents.dm | 8 +- .../chemistry/reagents/drug_reagents.dm | 6 +- .../chemistry/reagents/food_reagents.dm | 4 +- .../impure_medicine_reagents.dm | 16 ++-- .../chemistry/reagents/medicine_reagents.dm | 12 +-- .../chemistry/reagents/other_reagents.dm | 6 +- .../reagents/pyrotechnic_reagents.dm | 2 +- .../chemistry/reagents/toxin_reagents.dm | 6 +- code/modules/reagents/chemistry/recipes.dm | 6 +- .../chemistry/recipes/pyrotechnics.dm | 10 +-- .../chemistry/recipes/slime_extracts.dm | 28 +++--- .../reagents/chemistry/recipes/special.dm | 2 +- code/modules/reagents/reagent_containers.dm | 6 +- .../reagents/reagent_containers/condiment.dm | 4 +- .../reagent_containers/cups/glassbottle.dm | 6 +- .../reagents/reagent_containers/misc.dm | 2 +- .../reagents/reagent_containers/pill.dm | 2 +- code/modules/reagents/reagent_dispenser.dm | 2 +- code/modules/recycling/conveyor.dm | 16 ++-- code/modules/recycling/disposal/bin.dm | 8 +- .../recycling/disposal/construction.dm | 2 +- code/modules/recycling/disposal/holder.dm | 10 +-- code/modules/recycling/disposal/outlet.dm | 4 +- code/modules/recycling/sortingmachinery.dm | 2 +- code/modules/religion/religion_structures.dm | 4 +- code/modules/religion/rites.dm | 2 +- .../religion/sparring/ceremonial_gear.dm | 2 +- .../religion/sparring/sparring_datum.dm | 40 ++++----- .../research/anomaly/anomaly_refinery.dm | 8 +- code/modules/research/destructive_analyzer.dm | 4 +- code/modules/research/experimentor.dm | 14 +-- .../modules/research/machinery/_production.dm | 8 +- .../research/ordnance/doppler_array.dm | 6 +- .../research/ordnance/tank_compressor.dm | 4 +- code/modules/research/server.dm | 2 +- code/modules/research/stock_parts.dm | 6 +- code/modules/research/techweb/all_nodes.dm | 2 +- .../crossbreeding/_status_effects.dm | 6 +- .../xenobiology/crossbreeding/burning.dm | 2 +- .../xenobiology/crossbreeding/charged.dm | 4 +- .../xenobiology/crossbreeding/chilling.dm | 2 +- .../crossbreeding/selfsustaining.dm | 2 +- .../xenobiology/vatgrowing/biopsy_tool.dm | 2 +- .../research/xenobiology/vatgrowing/swab.dm | 2 +- .../xenobiology/vatgrowing/vatgrower.dm | 8 +- .../research/xenobiology/xenobio_camera.dm | 14 +-- .../research/xenobiology/xenobiology.dm | 4 +- .../security_levels/keycard_authentication.dm | 6 +- code/modules/shuttle/arrivals.dm | 2 +- code/modules/shuttle/emergency.dm | 10 +-- code/modules/shuttle/on_move.dm | 2 +- code/modules/shuttle/ripple.dm | 2 +- code/modules/shuttle/special.dm | 8 +- code/modules/spells/spell.dm | 12 +-- code/modules/spells/spell_types/cone/_cone.dm | 2 +- .../spell_types/conjure_item/invisible_box.dm | 2 +- .../spells/spell_types/jaunt/_jaunt.dm | 2 +- .../spells/spell_types/jaunt/bloodcrawl.dm | 14 +-- .../spell_types/jaunt/ethereal_jaunt.dm | 10 +-- .../spells/spell_types/jaunt/shadow_walk.dm | 2 +- .../spells/spell_types/pointed/_pointed.dm | 2 +- .../spell_types/pointed/abyssal_gaze.dm | 2 +- .../spells/spell_types/pointed/blind.dm | 2 +- .../spells/spell_types/pointed/spell_cards.dm | 2 +- .../spells/spell_types/right_and_wrong.dm | 2 +- .../modules/spells/spell_types/self/mutate.dm | 2 +- .../spell_types/self/spacetime_distortion.dm | 4 +- .../spells/spell_types/self/summonitem.dm | 2 +- .../spell_types/shapeshift/_shape_status.dm | 8 +- .../spell_types/shapeshift/_shapeshift.dm | 2 +- .../spells/spell_types/touch/_touch.dm | 12 +-- .../spells/spell_types/tower_of_babel.dm | 2 +- code/modules/surgery/bodyparts/_bodyparts.dm | 22 ++--- .../surgery/bodyparts/dismemberment.dm | 4 +- code/modules/surgery/bodyparts/parts.dm | 32 +++---- code/modules/surgery/organs/_organ.dm | 4 +- code/modules/surgery/organs/augments_arms.dm | 6 +- code/modules/surgery/organs/augments_chest.dm | 10 +-- .../surgery/organs/augments_internal.dm | 8 +- .../organs/external/_external_organs.dm | 4 +- code/modules/surgery/organs/external/tails.dm | 6 +- code/modules/surgery/organs/external/wings.dm | 6 +- code/modules/surgery/organs/eyes.dm | 2 +- code/modules/surgery/organs/heart.dm | 26 +++--- code/modules/surgery/organs/liver.dm | 2 +- code/modules/surgery/organs/lungs.dm | 2 +- code/modules/surgery/organs/organ_internal.dm | 2 +- .../organs/stomach/stomach_ethereal.dm | 4 +- code/modules/surgery/organs/tongue.dm | 16 ++-- code/modules/surgery/tools.dm | 14 +-- code/modules/tgui/tgui.dm | 4 +- code/modules/tgui_input/say_modal/modal.dm | 2 +- code/modules/tgui_input/say_modal/typing.dm | 2 +- code/modules/tgui_panel/tgui_panel.dm | 4 +- code/modules/tooltip/tooltip.dm | 2 +- code/modules/unit_tests/combat.dm | 6 +- code/modules/unit_tests/connect_loc.dm | 2 +- code/modules/unit_tests/create_and_destroy.dm | 18 ++-- code/modules/unit_tests/emoting.dm | 2 +- .../unit_tests/find_reference_sanity.dm | 29 +++++- code/modules/unit_tests/heretic_rituals.dm | 2 +- code/modules/unit_tests/metabolizing.dm | 9 +- code/modules/unit_tests/nuke_cinematic.dm | 2 +- code/modules/unit_tests/objectives.dm | 2 +- code/modules/unit_tests/say.dm | 2 +- code/modules/unit_tests/unit_test.dm | 2 +- code/modules/vehicles/_vehicle.dm | 2 +- code/modules/vehicles/bicycle.dm | 2 +- code/modules/vehicles/cars/car.dm | 2 +- code/modules/vehicles/cars/clowncar.dm | 16 ++-- code/modules/vehicles/cars/vim.dm | 6 +- code/modules/vehicles/mecha/_mecha.dm | 12 +-- code/modules/vehicles/mecha/combat/durand.dm | 14 +-- .../vehicles/mecha/combat/savannah_ivanov.dm | 16 ++-- .../mecha/equipment/mecha_equipment.dm | 4 +- .../mecha/equipment/tools/medical_tools.dm | 6 +- .../mecha/equipment/weapons/weapons.dm | 2 +- .../modules/vehicles/mecha/mech_fabricator.dm | 4 +- .../mecha/mecha_construction_paths.dm | 2 +- code/modules/vehicles/mecha/mecha_defense.dm | 2 +- .../vehicles/mecha/mecha_mob_interaction.dm | 6 +- code/modules/vehicles/mecha/mecha_wreckage.dm | 2 +- code/modules/vehicles/mecha/working/clarke.dm | 4 +- code/modules/vehicles/pimpin_ride.dm | 4 +- code/modules/vehicles/scooter.dm | 2 +- code/modules/vehicles/sealed.dm | 4 +- code/modules/vehicles/vehicle_actions.dm | 2 +- code/modules/vehicles/vehicle_key.dm | 8 +- code/modules/vending/_vending.dm | 2 +- .../wiremod/components/abstract/module.dm | 6 +- .../wiremod/components/abstract/variable.dm | 2 +- code/modules/wiremod/components/action/mmi.dm | 8 +- .../wiremod/components/action/pathfind.dm | 2 +- .../modules/wiremod/components/action/pull.dm | 2 +- .../wiremod/components/action/radio.dm | 2 +- .../wiremod/components/admin/animate.dm | 2 +- .../wiremod/components/admin/input_request.dm | 2 +- .../wiremod/components/admin/proccall.dm | 2 +- .../wiremod/components/admin/save_shell.dm | 4 +- code/modules/wiremod/components/admin/sdql.dm | 2 +- .../admin/signal_handler/signal_handler.dm | 10 +-- code/modules/wiremod/components/atom/hear.dm | 2 +- .../components/bci/hud/counter_overlay.dm | 2 +- .../components/bci/hud/object_overlay.dm | 2 +- .../components/bci/hud/target_intercept.dm | 2 +- .../components/bci/thought_listener.dm | 2 +- .../wiremod/components/id/access_checker.dm | 2 +- .../modules/wiremod/components/list/filter.dm | 2 +- .../wiremod/components/list/foreach.dm | 4 +- .../wiremod/components/ntnet/ntnet_receive.dm | 2 +- .../wiremod/components/utility/delay.dm | 6 +- code/modules/wiremod/core/component.dm | 10 +-- .../modules/wiremod/core/component_printer.dm | 8 +- .../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/core/variable.dm | 2 +- .../dcs_components/component_add_port.dm | 6 +- code/modules/wiremod/shell/airlock.dm | 14 +-- code/modules/wiremod/shell/assembly.dm | 2 +- 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/dispenser.dm | 12 +-- code/modules/wiremod/shell/drone.dm | 2 +- code/modules/wiremod/shell/gun.dm | 4 +- code/modules/wiremod/shell/keyboard.dm | 4 +- code/modules/wiremod/shell/module.dm | 24 ++--- code/modules/wiremod/shell/moneybot.dm | 6 +- code/modules/wiremod/shell/scanner.dm | 2 +- code/modules/wiremod/shell/scanner_gate.dm | 8 +- code/modules/zombie/organs.dm | 2 +- .../code/controllers/subsystem/dbcore.dm | 2 +- .../code/datums/components/fullauto.dm | 28 +++--- .../code/datums/quirks/neutral.dm | 2 +- .../code/game/gamemodes/objective.dm | 2 +- .../items/devices/anomaly_neutralizer.dm | 2 +- .../traitor/objectives/smuggling.dm | 2 +- .../preferences/middleware/languages.dm | 4 +- .../middleware/limbs_and_markings.dm | 18 ++-- .../modules/client/preferences_savefile.dm | 2 +- .../head/monkey_magnification_helmet.dm | 4 +- .../code/modules/events/spacevine.dm | 2 +- .../code/modules/mob/living/emote_popup.dm | 4 +- .../code/modules/mob/living/sillicon/robot.dm | 4 +- .../mob/living/simple_animal/friendly/dogs.dm | 12 +-- .../living/simple_animal/friendly/poppy.dm | 4 +- .../code/modules/projectiles/guns/gun.dm | 8 +- .../aesthetics/lights/code/lighting.dm | 6 +- .../modules/alerts/code/priority_announce.dm | 2 +- .../ammo_workbench/code/ammo_workbench.dm | 12 +-- .../armaments/code/armament_component.dm | 6 +- .../ashwalkers/code/buildings/ash_farming.dm | 6 +- .../ashwalkers/code/buildings/ash_tendril.dm | 2 +- .../code/buildings/tendril_cursing.dm | 6 +- .../ashwalkers/code/effects/ash_rituals.dm | 2 +- .../ashwalkers/code/species/Ashwalkers.dm | 6 +- .../ashwalkers/code/species/damage_datum.dm | 2 +- .../assault_operatives/code/base_alarm.dm | 4 +- .../assault_operatives/code/goldeneye.dm | 2 +- .../assault_operatives/code/interrogator.dm | 8 +- .../automapper/code/area_spawn_subsystem.dm | 2 +- .../modules/barricades/code/barricade.dm | 2 +- .../code/biohazard_blob_structures.dm | 6 +- .../black_mesa/code/follow_component.dm | 10 +-- .../black_mesa/code/mobs/gordon_freeman.dm | 4 +- .../black_mesa/code/mobs/mob_spawners.dm | 2 +- .../modules/black_mesa/code/shield_pylon.dm | 6 +- .../modules/black_mesa/code/shockplant.dm | 2 +- .../modules/bsa_overhaul/code/bsa_cannon.dm | 4 +- .../modules/cargoborg/code/robot_items.dm | 6 +- .../cell_component/code/cell_component.dm | 10 +-- .../modules/cell_component/code/flashlight.dm | 2 +- .../modules/cellguns/code/medigun_cells.dm | 4 +- .../modules/chaplain/code/mortis.dm | 2 +- modular_skyrat/modules/cme/code/cme.dm | 2 +- .../code/connectable_component.dm | 2 +- .../contractor/code/datums/contract.dm | 16 ++-- .../code/cortical_borer_items.dm | 2 +- .../evolution_things/empowered_egg.dm | 2 +- .../modules/clothing/toggle_base.dm | 4 +- .../modules/hydroponics/grown/bananaspider.dm | 2 +- .../modules/mob/living/carbon/human/human.dm | 2 +- .../carbon/human/species/robotic/ipc.dm | 4 +- .../surgery/organs/silicon_alt_brains.dm | 2 +- .../modules/decay_subsystem/code/nests.dm | 6 +- .../decay_subsystem/code/spawn_nest.dm | 2 +- .../drone_adjustments/slide_component.dm | 4 +- .../electric_welder/code/electric_welder.dm | 2 +- .../code/emergency_spacesuit.dm | 2 +- .../code/additionalemotes/turf_emote.dm | 4 +- .../modules/energy_axe/code/energy_fireaxe.dm | 4 +- .../modules/event_vote/code/event_vote.dm | 8 +- .../ghostcafe/code/dusts_on_leaving_area.dm | 2 +- .../game/objects/items/gladiator_items.dm | 2 +- .../hostile/megafauna/markedone.dm | 64 ++++++------- .../goofsec/code/sec_clothing_overrides.dm | 2 +- .../modules/gunhud/code/gun_hud_component.dm | 6 +- .../modules/gunpoint/code/gunpoint_datum.dm | 20 ++--- .../modules/gunsgalore/code/guns/mg34.dm | 6 +- .../modules/hev_suit/code/hev_suit.dm | 30 +++---- .../horrorform/code/true_changeling.dm | 4 +- .../modules/hyposprays/code/hypospray_kits.dm | 2 +- .../implants/code/augments_internal.dm | 4 +- .../indicators/code/combat_indicator.dm | 2 +- .../modules/indicators/code/sealed.dm | 2 +- .../modules/inflatables/code/inflatable.dm | 2 +- .../code/interaction_component.dm | 2 +- .../modules/jukebox/code/dance_machine.dm | 4 +- modular_skyrat/modules/liquids/code/drains.dm | 2 +- .../code/liquid_systems/liquid_effect.dm | 16 ++-- .../code/liquid_systems/liquid_height.dm | 2 +- .../code/liquid_systems/liquid_interaction.dm | 2 +- .../code/liquid_systems/liquid_plumbers.dm | 2 +- .../loadouts/loadout_ui/loadout_manager.dm | 4 +- .../modules/marines/code/modsuit_modules.dm | 2 +- .../modules/marines/code/smartgun.dm | 2 +- .../modules/medical/code/wounds/bones.dm | 18 ++-- .../modules/medical/code/wounds/burns.dm | 2 +- .../modules/medical/code/wounds/muscle.dm | 8 +- .../modules/medical/code/wounds/pierce.dm | 4 +- .../modules/medical/code/wounds/slash.dm | 8 +- .../microfusion/code/microfusion_cell.dm | 2 +- .../code/microfusion_energy_master.dm | 10 +-- .../modules/modsuit_pai/code/mod_pai.dm | 2 +- .../code/lewd_clothing/bdsm_mask.dm | 4 +- .../code/lewd_clothing/deprivation_helmet.dm | 2 +- .../code/lewd_clothing/hypnogoggles.dm | 2 +- .../code/lewd_clothing/kinky_blindfold.dm | 2 +- .../code/lewd_clothing/kinky_headphones.dm | 2 +- .../code/lewd_clothing/kinky_sleepbag.dm | 2 +- .../code/lewd_clothing/lewd_maid.dm | 2 +- .../lewd_items/code/lewd_clothing/shackles.dm | 2 +- .../code/lewd_clothing/shibari_worn_legs.dm | 4 +- .../lewd_clothing/shibari_worn_uniform.dm | 4 +- .../lewd_items/code/lewd_clothing/strapon.dm | 2 +- .../code/lewd_items/attachable_vibrator.dm | 2 +- .../lewd_items/code/lewd_items/buttplug.dm | 4 +- .../lewd_items/code/lewd_items/dildo.dm | 4 +- .../lewd_items/code/lewd_items/fleshlight.dm | 2 +- .../code/lewd_items/leather_whip.dm | 4 +- .../lewd_items/code/lewd_items/shibari.dm | 14 +-- .../code/lewd_items/spanking_pad.dm | 2 +- .../code/lewd_items/torture_candle.dm | 2 +- .../lewd_items/code/lewd_items/vibrator.dm | 2 +- .../lewd_items/code/lewd_items/vibroring.dm | 2 +- .../code/lewd_machinery/lustwish.dm | 2 +- .../code/lewd_machinery/milking_machine.dm | 2 +- .../lewd_items/code/lewd_quirks.dm | 2 +- .../code/lewd_structures/dancing_pole.dm | 2 +- .../lewd_items/code/lewd_structures/pillow.dm | 4 +- .../code/reagents/medicine.dm | 2 +- .../modules/moretraitoritems/code/weaponry.dm | 2 +- .../code/mounted_machine_gun.dm | 20 ++--- .../modules/mutants/code/mutant_component.dm | 16 ++-- .../modules/mutants/code/mutant_cure.dm | 4 +- .../modules/novaya_ert/code/mod_suit.dm | 6 +- .../modules/opposing_force/code/items.dm | 2 +- .../code/opposing_force_datum.dm | 2 +- modular_skyrat/modules/oversized/code/door.dm | 2 +- .../temporary_pollution_emission_component.dm | 2 +- .../modules/reagent_forging/code/forge.dm | 2 +- .../reagent_forging/code/forge_weapons.dm | 4 +- .../reagent_forging/code/reagent_component.dm | 10 +-- .../modules/rod-stopper/code/rodstopper.dm | 2 +- .../modules/sec_haul/code/guns/bullets.dm | 2 +- .../modules/sec_haul/code/guns/guns.dm | 2 +- .../code/peacekeeper/peacekeeper_hammer.dm | 8 +- .../code/self_actualization_device.dm | 2 +- .../code/borg_shapeshifter.dm | 6 +- .../code/particle_accelerator/particle.dm | 4 +- .../code/components/return_on_death.dm | 4 +- .../modules/stone/code/ore_veins.dm | 2 +- .../modules/tableflip/code/flipped_table.dm | 2 +- .../code/title_screen_subsystem.dm | 2 +- .../window_airbags/code/window_airbag.dm | 12 +-- .../wrestlingring/code/wrestlingring.dm | 6 +- .../research/xenoarch/xenoarch_machine.dm | 16 ++-- .../research/xenoarch/xenoarch_tool.dm | 2 +- .../code/base_skyrat_xeno.dm | 2 +- .../code/xeno_types/drone.dm | 2 +- .../code/xeno_types/queen.dm | 2 +- .../code/xeno_types/ravager.dm | 2 +- .../code/xeno_types/rouny.dm | 8 +- tgstation.dme | 1 + tgui/docs/tgui-for-custom-html-popups.md | 2 +- tgui/packages/tgui-dev-server/dreamseeker.js | 3 + tgui/packages/tgui-dev-server/reloader.js | 5 +- tgui/public/tgui.html | 5 +- tools/ci/check_grep.sh | 7 ++ 1577 files changed, 5030 insertions(+), 4847 deletions(-) create mode 100644 .github/workflows/has_515_compatibility.yml create mode 100644 code/__byond_version_compat.dm diff --git a/.github/alternate_byond_versions.txt b/.github/alternate_byond_versions.txt index 877afb1d372..d04ca181973 100644 --- a/.github/alternate_byond_versions.txt +++ b/.github/alternate_byond_versions.txt @@ -6,5 +6,5 @@ # Example: # 500.1337: runtimestation -# AnturK uncomment this and then remove this line -# 515.1594: runtimestation +# Commented out until 515 is fully ready +# 515.1595: runtimestation diff --git a/.github/guides/HARDDELETES.md b/.github/guides/HARDDELETES.md index db2db3bf446..defc09360af 100644 --- a/.github/guides/HARDDELETES.md +++ b/.github/guides/HARDDELETES.md @@ -258,7 +258,7 @@ Here's an example UnregisterSignal(target, COMSIG_PARENT_QDELETING) //We need to make sure any old signals are cleared target = new_target if(target) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/clear_target) //Call clear_target if target is ever qdel()'d + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_target)) //Call clear_target if target is ever qdel()'d /somemob/proc/clear_target(datum/source) SIGNAL_HANDLER diff --git a/.github/guides/STANDARDS.md b/.github/guides/STANDARDS.md index 59e80f938e1..fd3679cb41f 100644 --- a/.github/guides/STANDARDS.md +++ b/.github/guides/STANDARDS.md @@ -99,6 +99,50 @@ While we normally encourage (and in some cases, even require) bringing out of da ### RegisterSignal() +#### PROC_REF Macros +When referencing procs in RegisterSignal, Callback and other procs you should use PROC_REF,TYPE_PROC_REF and GLOBAL_PROC_REF macros. +They ensure compilation fails if the reffered to procs change names or get removed. +The macro to be used depends on how the proc you're in relates to the proc you want to use: + +PROC_REF if the proc you want to use is defined on the current proc type or any of it's ancestor types. +Example: +``` +/mob/proc/funny() + to_chat(world,"knock knock") + +/mob/subtype/proc/very_funny() + to_chat(world,"who's there?") + +/mob/subtype/proc/do_something() + // Proc on our own type + RegisterSignal(x, COMSIG_OTHER_FAKE, PROC_REF(very_funny)) + // Proc on ancestor type, /mob is parent type of /mob/subtype + RegisterSignal(x, COMSIG_FAKE, PROC_REF(funny)) +``` + +TYPE_PROC_REF if the proc you want to use is defined on a different unrelated type +Example: +``` +/obj/thing/proc/funny() + to_chat(world,"knock knock") + +/mob/subtype/proc/do_something() + var/obj/thing/x = new() + // we're referring to /obj/thing proc inside /mob/subtype proc + RegisterSignal(x, COMSIG_FAKE, TYPE_PROC_REF(/obj/thing, funny)) +``` + +GLOBAL_PROC_REF if the proc you want to use is a global proc. +Example: +``` +/proc/funny() + to_chat(world,"knock knock") + +/mob/subtype/proc/do_something() + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(funny)), 100)) +``` + + #### Signal Handlers All procs that are registered to listen for signals using `RegisterSignal()` must contain at the start of the proc `SIGNAL_HANDLER` eg; @@ -116,7 +160,7 @@ Any sleeping behaviour that you need to perform inside a `SIGNAL_HANDLER` proc m Each atom can only register a signal on the same object once, or else you will get a runtime. Overriding signals is usually a bug, but if you are confident that it is not, you can silence this runtime with `override = TRUE`. ```dm -RegisterSignal(fork, COMSIG_FORK_STAB, .proc/on_fork_stab, override = TRUE) +RegisterSignal(fork, COMSIG_FORK_STAB, PROC_REF(on_fork_stab), override = TRUE) ``` If you decide to do this, you should make it clear with a comment explaining why it is necessary. This helps us to understand that the signal override is not a bug, and may help us to remove it in the future if the assumptions change. diff --git a/.github/workflows/has_515_compatibility.yml b/.github/workflows/has_515_compatibility.yml new file mode 100644 index 00000000000..a026105d7c2 --- /dev/null +++ b/.github/workflows/has_515_compatibility.yml @@ -0,0 +1,17 @@ +# This workflow was added in the 515 compatibility PR - https://github.com/tgstation/tgstation/pull/71161 +# By having this in your repository, we know that you have that PR merged as well. +# This will be REMOVED when 515 is fully compatible and ready, but for now we need this +# to prevent merge skew. +# In the future, this will be a more proper system where commits can be added into a text file, +# but that's a lot more difficult and I'm in a huge time crunch right now. +name: "515 Compatibility Pass" +on: + pull_request: + branches: + - master +jobs: + has_515_compatibility: + name: Has 515 Compatibility + runs-on: ubuntu-20.04 + steps: + - run: echo "You're ready to go!" diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index edf68a16109..c94ea9b45b7 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -68,7 +68,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) @@ -81,7 +81,7 @@ * A bit more expensive than the regular timers, but can be reset before they end and the time left can be checked. */ -#define S_TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, /proc/end_cooldown, cd_source, cd_index), cd_time, TIMER_STOPPABLE)) +#define S_TIMER_COOLDOWN_START(cd_source, cd_index, cd_time) LAZYSET(cd_source.cooldowns, cd_index, addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(end_cooldown), cd_source, cd_index), cd_time, TIMER_STOPPABLE)) #define S_TIMER_COOLDOWN_RESET(cd_source, cd_index) reset_cooldown(cd_source, cd_index) diff --git a/code/__DEFINES/qdel.dm b/code/__DEFINES/qdel.dm index 9c83523b852..cb28143d392 100644 --- a/code/__DEFINES/qdel.dm +++ b/code/__DEFINES/qdel.dm @@ -46,10 +46,10 @@ #define QDELETED(X) (!X || QDELING(X)) #define QDESTROYING(X) (!X || X.gc_destroyed == GC_CURRENTLY_BEING_QDELETED) -#define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, (time) > GC_FILTER_QUEUE ? WEAKREF(item) : item), time, TIMER_STOPPABLE) -#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/qdel, item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME) +#define QDEL_IN(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), (time) > GC_FILTER_QUEUE ? WEAKREF(item) : item), time, TIMER_STOPPABLE) +#define QDEL_IN_CLIENT_TIME(item, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), item), time, TIMER_STOPPABLE | TIMER_CLIENT_TIME) #define QDEL_NULL(item) qdel(item); item = null #define QDEL_LIST(L) if(L) { for(var/I in L) qdel(I); L.Cut(); } -#define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, .proc/______qdel_list_wrapper, L), time, TIMER_STOPPABLE) +#define QDEL_LIST_IN(L, time) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(______qdel_list_wrapper), L), time, TIMER_STOPPABLE) #define QDEL_LIST_ASSOC(L) if(L) { for(var/I in L) { qdel(L[I]); qdel(I); } L.Cut(); } #define QDEL_LIST_ASSOC_VAL(L) if(L) { for(var/I in L) qdel(L[I]); L.Cut(); } diff --git a/code/__HELPERS/_auxtools_api.dm b/code/__HELPERS/_auxtools_api.dm index c7c63b6c63f..4dc83e2f44e 100644 --- a/code/__HELPERS/_auxtools_api.dm +++ b/code/__HELPERS/_auxtools_api.dm @@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(auxtools_initialized) #define AUXTOOLS_CHECK(LIB)\ if (GLOB.auxtools_initialized[LIB] != AUXTOOLS_FULL_INIT) {\ if (fexists(LIB)) {\ - var/string = call(LIB,"auxtools_init")();\ + var/string = LIBCALL(LIB,"auxtools_init")();\ if(findtext(string, "SUCCESS")) {\ GLOB.auxtools_initialized[LIB] = AUXTOOLS_FULL_INIT;\ } else {\ @@ -19,12 +19,12 @@ GLOBAL_LIST_EMPTY(auxtools_initialized) #define AUXTOOLS_SHUTDOWN(LIB)\ if (GLOB.auxtools_initialized[LIB] == AUXTOOLS_FULL_INIT && fexists(LIB)){\ - call(LIB,"auxtools_shutdown")();\ + LIBCALL(LIB,"auxtools_shutdown")();\ GLOB.auxtools_initialized[LIB] = AUXTOOLS_PARTIAL_INIT;\ }\ #define AUXTOOLS_FULL_SHUTDOWN(LIB)\ if (GLOB.auxtools_initialized[LIB] && fexists(LIB)){\ - call(LIB,"auxtools_full_shutdown")();\ + LIBCALL(LIB,"auxtools_full_shutdown")();\ GLOB.auxtools_initialized[LIB] = FALSE;\ }\ diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index ed26e47f551..2abc292228a 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -550,12 +550,12 @@ ///for sorting clients or mobs by ckey /proc/sort_key(list/ckey_list, order=1) - return sortTim(ckey_list, order >= 0 ? /proc/cmp_ckey_asc : /proc/cmp_ckey_dsc) + return sortTim(ckey_list, order >= 0 ? GLOBAL_PROC_REF(cmp_ckey_asc) : GLOBAL_PROC_REF(cmp_ckey_dsc)) ///Specifically for record datums in a list. /proc/sort_record(list/record_list, field = "name", order = 1) GLOB.cmp_field = field - return sortTim(record_list, order >= 0 ? /proc/cmp_records_asc : /proc/cmp_records_dsc) + return sortTim(record_list, order >= 0 ? GLOBAL_PROC_REF(cmp_records_asc) : GLOBAL_PROC_REF(cmp_records_dsc)) ///sort any value in a list /proc/sort_list(list/list_to_sort, cmp=/proc/cmp_text_asc) @@ -563,7 +563,7 @@ ///uses sort_list() but uses the var's name specifically. This should probably be using mergeAtom() instead /proc/sort_names(list/list_to_sort, order=1) - return sortTim(list_to_sort.Copy(), order >= 0 ? /proc/cmp_name_asc : /proc/cmp_name_dsc) + return sortTim(list_to_sort.Copy(), order >= 0 ? GLOBAL_PROC_REF(cmp_name_asc) : GLOBAL_PROC_REF(cmp_name_dsc)) ///Converts a bitfield to a list of numbers (or words if a wordlist is provided) /proc/bitfield_to_list(bitfield = 0, list/wordlist) @@ -836,7 +836,7 @@ else . += list(recursive_list_resolve_element(element)) -///Helper for /proc/recursive_list_resolve +///Helper for recursive_list_resolve() /proc/recursive_list_resolve_element(element) if(islist(element)) var/list/inner_list = element @@ -1039,7 +1039,7 @@ return ret /// Runtimes if the passed in list is not sorted -/proc/assert_sorted(list/list, name, cmp = /proc/cmp_numeric_asc) +/proc/assert_sorted(list/list, name, cmp = GLOBAL_PROC_REF(cmp_numeric_asc)) var/last_value = list[1] for (var/index in 2 to list.len) diff --git a/code/__HELPERS/_string_lists.dm b/code/__HELPERS/_string_lists.dm index a1331c8ea04..e0ff247a1c3 100644 --- a/code/__HELPERS/_string_lists.dm +++ b/code/__HELPERS/_string_lists.dm @@ -14,7 +14,7 @@ GLOBAL_VAR(string_filename_current_key) if((filepath in GLOB.string_cache) && (key in GLOB.string_cache[filepath])) var/response = pick(GLOB.string_cache[filepath][key]) var/regex/r = regex("@pick\\((\\D+?)\\)", "g") - response = r.Replace(response, /proc/strings_subkey_lookup) + response = r.Replace(response, GLOBAL_PROC_REF(strings_subkey_lookup)) return response else CRASH("strings list not found: [STRING_DIRECTORY]/[filepath], index=[key]") diff --git a/code/__HELPERS/areas.dm b/code/__HELPERS/areas.dm index 9f307118c3c..7f454de1916 100644 --- a/code/__HELPERS/areas.dm +++ b/code/__HELPERS/areas.dm @@ -150,11 +150,11 @@ GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/station/en 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 1d9183ceea0..a72a7a23e34 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -126,7 +126,7 @@ /proc/flick_overlay(image/image_to_show, list/show_to, duration) for(var/client/add_to in show_to) add_to.images += image_to_show - addtimer(CALLBACK(GLOBAL_PROC, /proc/remove_images_from_clients, image_to_show, show_to), duration, TIMER_CLIENT_TIME) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_images_from_clients), image_to_show, show_to), duration, TIMER_CLIENT_TIME) ///wrapper for flick_overlay(), flicks to everyone who can see the target atom /proc/flick_overlay_view(image/image_to_show, atom/target, duration) diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index b01db66560b..288987697af 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -42,25 +42,25 @@ for(var/spath in subtypesof(/datum/scream_type)) var/datum/scream_type/S = new spath() GLOB.scream_types[S.name] = spath - sort_list(GLOB.scream_types, /proc/cmp_typepaths_asc) + sort_list(GLOB.scream_types, GLOBAL_PROC_REF(cmp_typepaths_asc)) //Laugh types for(var/spath in subtypesof(/datum/laugh_type)) var/datum/laugh_type/L = new spath() GLOB.laugh_types[L.name] = spath - sort_list(GLOB.laugh_types, /proc/cmp_typepaths_asc) + sort_list(GLOB.laugh_types, GLOBAL_PROC_REF(cmp_typepaths_asc)) //SKYRAT EDIT END //Species for(var/spath in subtypesof(/datum/species)) var/datum/species/S = new spath() GLOB.species_list[S.id] = spath - sort_list(GLOB.species_list, /proc/cmp_typepaths_asc) + sort_list(GLOB.species_list, GLOBAL_PROC_REF(cmp_typepaths_asc)) //Surgeries for(var/path in subtypesof(/datum/surgery)) GLOB.surgeries_list += new path() - sort_list(GLOB.surgeries_list, /proc/cmp_typepaths_asc) + sort_list(GLOB.surgeries_list, GLOBAL_PROC_REF(cmp_typepaths_asc)) // Hair Gradients - Initialise all /datum/sprite_accessory/hair_gradient into an list indexed by gradient-style name for(var/path in subtypesof(/datum/sprite_accessory/gradient)) @@ -82,7 +82,7 @@ /proc/init_crafting_recipes(list/crafting_recipes) for(var/path in subtypesof(/datum/crafting_recipe)) var/datum/crafting_recipe/recipe = new path() - recipe.reqs = sort_list(recipe.reqs, /proc/cmp_crafting_req_priority) + recipe.reqs = sort_list(recipe.reqs, GLOBAL_PROC_REF(cmp_crafting_req_priority)) crafting_recipes += recipe return crafting_recipes diff --git a/code/__HELPERS/hallucinations.dm b/code/__HELPERS/hallucinations.dm index 1c860ec616b..dcc8b77f64c 100644 --- a/code/__HELPERS/hallucinations.dm +++ b/code/__HELPERS/hallucinations.dm @@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(random_hallucination_weighted_list, generate_hallucination_weig last_type_weight = this_weight // Sort by weight descending, where weight is the values (not the keys). We assoc_to_keys later to get JUST the text - all_weights = sortTim(all_weights, /proc/cmp_numeric_dsc, associative = TRUE) + all_weights = sortTim(all_weights, GLOBAL_PROC_REF(cmp_numeric_dsc), associative = TRUE) var/page_style = "" var/page_contents = "[page_style][header][jointext(assoc_to_keys(all_weights), "")]
" diff --git a/code/__HELPERS/hearted.dm b/code/__HELPERS/hearted.dm index 27e4fb723b5..7ae75e6cc32 100644 --- a/code/__HELPERS/hearted.dm +++ b/code/__HELPERS/hearted.dm @@ -17,7 +17,7 @@ if(!check_mob?.mind || !check_mob.client) continue // maybe some other filters like bans or whatever - INVOKE_ASYNC(check_mob, /mob.proc/query_heart, 1) + INVOKE_ASYNC(check_mob, TYPE_PROC_REF(/mob, query_heart), 1) number_to_ask-- if(number_to_ask <= 0) break diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index e0efe8c645e..1b5b5039d68 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -1342,7 +1342,7 @@ GLOBAL_LIST_EMPTY(transformation_animation_objects) GLOB.transformation_animation_objects[src] = transformation_objects for(var/A in transformation_objects) vis_contents += A - 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/code/__HELPERS/nameof.dm b/code/__HELPERS/nameof.dm index 2de37b5b8c9..7cd5777f465 100644 --- a/code/__HELPERS/nameof.dm +++ b/code/__HELPERS/nameof.dm @@ -4,3 +4,12 @@ * datum may be null, but it does need to be a typed var. **/ #define NAMEOF(datum, X) (#X || ##datum.##X) + +/** + * NAMEOF that actually works in static definitions because src::type requires src to be defined + */ +#if DM_VERSION >= 515 +#define NAMEOF_STATIC(datum, X) (nameof(type::##X)) +#else +#define NAMEOF_STATIC(datum, X) (#X || ##datum.##X) +#endif diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index 20852fa2396..c24c0167a0a 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -70,7 +70,7 @@ to_chat(mob_to_teleport, announcement) SEND_SOUND(mob_to_teleport, meeting_sound) //no preferences here, you must hear the funny sound mob_to_teleport.overlay_fullscreen("emergency_meeting", /atom/movable/screen/fullscreen/emergency_meeting, 1) - addtimer(CALLBACK(mob_to_teleport, /mob/.proc/clear_fullscreen, "emergency_meeting"), 3 SECONDS) + addtimer(CALLBACK(mob_to_teleport, TYPE_PROC_REF(/mob/, clear_fullscreen), "emergency_meeting"), 3 SECONDS) if (is_station_level(mob_to_teleport.z)) //teleport the mob to the crew meeting var/turf/target diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 42cd8dc25ec..8294fbbde3a 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -631,7 +631,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/antagonists in all_antagonists) if(!antagonists.show_in_roundend) diff --git a/code/__HELPERS/sorts/__main.dm b/code/__HELPERS/sorts/__main.dm index cc642998229..8a34a26de6d 100644 --- a/code/__HELPERS/sorts/__main.dm +++ b/code/__HELPERS/sorts/__main.dm @@ -8,14 +8,14 @@ //When we get into galloping mode, we stay there until both runs win less often than MIN_GALLOP consecutive times. #define MIN_GALLOP 7 - //This is a global instance to allow much of this code to be reused. The interfaces are kept separately +//This is a global instance to allow much of this code to be reused. The interfaces are kept separately GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) /datum/sort_instance //The array being sorted. var/list/L //The comparator proc-reference - var/cmp = /proc/cmp_numeric_asc + var/cmp = GLOBAL_PROC_REF(cmp_numeric_asc) //whether we are sorting list keys (0: L[i]) or associated values (1: L[L[i]]) var/associative = 0 diff --git a/code/__HELPERS/stat_tracking.dm b/code/__HELPERS/stat_tracking.dm index 6dcf15af403..1fda8abdc83 100644 --- a/code/__HELPERS/stat_tracking.dm +++ b/code/__HELPERS/stat_tracking.dm @@ -1,4 +1,4 @@ -/proc/render_stats(list/stats, user, sort = /proc/cmp_generic_stat_item_time) +/proc/render_stats(list/stats, user, sort = GLOBAL_PROC_REF(cmp_generic_stat_item_time)) sortTim(stats, sort, TRUE) var/list/lines = list() diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm index 068b147b3d5..75526f7d86d 100644 --- a/code/__HELPERS/traits.dm +++ b/code/__HELPERS/traits.dm @@ -1,5 +1,5 @@ -#define TRAIT_CALLBACK_ADD(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitAdd, ##target, ##trait, ##source) -#define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitRemove, ##target, ##trait, ##source) +#define TRAIT_CALLBACK_ADD(target, trait, source) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___TraitAdd), ##target, ##trait, ##source) +#define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___TraitRemove), ##target, ##trait, ##source) ///DO NOT USE ___TraitAdd OR ___TraitRemove as a replacement for ADD_TRAIT / REMOVE_TRAIT defines. To be used explicitly for callback. /proc/___TraitAdd(target,trait,source) diff --git a/code/__HELPERS/varset_callback.dm b/code/__HELPERS/varset_callback.dm index 0c3f87328a1..54fc821cacc 100644 --- a/code/__HELPERS/varset_callback.dm +++ b/code/__HELPERS/varset_callback.dm @@ -1,6 +1,6 @@ -#define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, /proc/___callbackvarset, ##target, ##var_name, ##var_value) +#define VARSET_LIST_CALLBACK(target, var_name, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##target, ##var_name, ##var_value) //dupe code because dm can't handle 3 level deep macros -#define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, /proc/___callbackvarset, ##datum, NAMEOF(##datum, ##var), ##var_value) +#define VARSET_CALLBACK(datum, var, var_value) CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(___callbackvarset), ##datum, NAMEOF(##datum, ##var), ##var_value) /proc/___callbackvarset(list_or_datum, var_name, var_value) if(length(list_or_datum)) diff --git a/code/__byond_version_compat.dm b/code/__byond_version_compat.dm new file mode 100644 index 00000000000..4b79bdb8e68 --- /dev/null +++ b/code/__byond_version_compat.dm @@ -0,0 +1,53 @@ +// This file contains defines allowing targeting byond versions newer than the supported + +//Update this whenever you need to take advantage of more recent byond features +#define MIN_COMPILER_VERSION 514 +#define MIN_COMPILER_BUILD 1556 +#if (DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD) && !defined(SPACEMAN_DMM) +//Don't forget to update this part +#error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. +#error You need version 514.1556 or higher +#endif + +#if (DM_VERSION == 514 && DM_BUILD > 1575 && DM_BUILD <= 1577) +#error Your version of BYOND currently has a crashing issue that will prevent you from running Dream Daemon test servers. +#error We require developers to test their content, so an inability to test means we cannot allow the compile. +#error Please consider downgrading to 514.1575 or lower. +#endif + +// Keep savefile compatibilty at minimum supported level +#if DM_VERSION >= 515 +/savefile/byond_version = MIN_COMPILER_VERSION +#endif + +// Temporary 515 block until it is completely compatible. +// AnturK says there are issues with savefiles that would make it dangerous to test merge, +// and so this check is in place to stop serious damage. +// That being said, if you really are ready, you can give YES_I_WANT_515 to TGS. +#if !defined(YES_I_WANT_515) && DM_VERSION >= 515 +#error We do not yet completely support BYOND 515. +#endif + +// 515 split call for external libraries into call_ext +#if DM_VERSION < 515 +#define LIBCALL call +#else +#define LIBCALL call_ext +#endif + +// So we want to have compile time guarantees these procs exist on local type, unfortunately 515 killed the .proc/procname syntax so we have to use nameof() +#if DM_VERSION < 515 +/// Call by name proc reference, checks if the proc exists on this type or as a global proc +#define PROC_REF(X) (.proc/##X) +/// Call by name proc reference, checks if the proc exists on given type or as a global proc +#define TYPE_PROC_REF(TYPE, X) (##TYPE.proc/##X) +/// Call by name proc reference, checks if the proc is existing global proc +#define GLOBAL_PROC_REF(X) (/proc/##X) +#else +/// Call by name proc reference, checks if the proc exists on this type or as a global proc +#define PROC_REF(X) (nameof(.proc/##X)) +/// Call by name proc reference, checks if the proc exists on given type or as a global proc +#define TYPE_PROC_REF(TYPE, X) (nameof(##TYPE.proc/##X)) +/// Call by name proc reference, checks if the proc is existing global proc +#define GLOBAL_PROC_REF(X) (/proc/##X) +#endif diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 95293ef5c05..e81be8873df 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -90,21 +90,6 @@ #define FORCE_MAP_DIRECTORY "_maps" #endif -//Update this whenever you need to take advantage of more recent byond features -#define MIN_COMPILER_VERSION 514 -#define MIN_COMPILER_BUILD 1557 //SKYRAT EDIT CHANGE - Compiler failure due to insufficent memory when running previous builds. -#if (DM_VERSION < MIN_COMPILER_VERSION || DM_BUILD < MIN_COMPILER_BUILD) && !defined(SPACEMAN_DMM) -//Don't forget to update this part -#error Your version of BYOND is too out-of-date to compile this project. Go to https://secure.byond.com/download and update. -#error You need version 514.1556 or higher -#endif - -#if (DM_VERSION == 514 && DM_BUILD > 1575 && DM_BUILD <= 1577) -#error Your version of BYOND currently has a crashing issue that will prevent you from running Dream Daemon test servers. -#error We require developers to test their content, so an inability to test means we cannot allow the compile. -#error Please consider downgrading to 514.1575 or lower. -#endif - //Additional code for the above flags. #ifdef TESTING #warn compiling in TESTING mode. testing() debug messages will be visible. diff --git a/code/_debugger.dm b/code/_debugger.dm index dafc759ec56..1518908fa9a 100644 --- a/code/_debugger.dm +++ b/code/_debugger.dm @@ -9,5 +9,5 @@ /datum/debugger/proc/enable_debugger() var/dll = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") if (dll) - call(dll, "auxtools_init")() + LIBCALL(dll, "auxtools_init")() enable_debugging() diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 1dcb7d34677..50ea68c04aa 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -532,7 +532,7 @@ /atom/movable/screen/click_catcher/Initialize(mapload) . = ..() - RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, .proc/offset_increased) + RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, PROC_REF(offset_increased)) offset_increased(SSmapping, 0, SSmapping.max_plane_offset) // Draw to the lowest plane level offered diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm index 68c3e481611..04b5a02be29 100644 --- a/code/_onclick/hud/action_button.dm +++ b/code/_onclick/hud/action_button.dm @@ -247,7 +247,7 @@ GLOBAL_LIST_INIT(palette_removed_matrix, list(1.4,0,0,0, 0.7,0.4,0,0, 0.4,0,0.6, if(color_timer_id) return add_atom_colour(color, TEMPORARY_COLOUR_PRIORITY) //We unfortunately cannot animate matrix colors. Curse you lummy it would be ~~non~~trivial to interpolate between the two valuessssssssss - color_timer_id = addtimer(CALLBACK(src, .proc/remove_color, color), 2 SECONDS) + color_timer_id = addtimer(CALLBACK(src, PROC_REF(remove_color), color), 2 SECONDS) /atom/movable/screen/button_palette/proc/remove_color(list/to_remove) color_timer_id = null @@ -297,7 +297,7 @@ GLOBAL_LIST_INIT(palette_removed_matrix, list(1.4,0,0,0, 0.7,0.4,0,0, 0.4,0,0.6, return if(expanded) - RegisterSignal(usr.client, COMSIG_CLIENT_CLICK, .proc/clicked_while_open) + RegisterSignal(usr.client, COMSIG_CLIENT_CLICK, PROC_REF(clicked_while_open)) else UnregisterSignal(usr.client, COMSIG_CLIENT_CLICK) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 6d09d471109..869a937318e 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -64,7 +64,7 @@ animate(thealert, transform = matrix(), time = 2.5, easing = CUBIC_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 @@ -346,7 +346,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 @@ -365,7 +365,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() diff --git a/code/_onclick/hud/credits.dm b/code/_onclick/hud/credits.dm index a21293345f0..7dc57670b41 100644 --- a/code/_onclick/hud/credits.dm +++ b/code/_onclick/hud/credits.dm @@ -53,7 +53,7 @@ animate(src, transform = M, time = CREDIT_ROLL_SPEED) target = M animate(src, alpha = 255, time = CREDIT_EASE_DURATION, flags = ANIMATION_PARALLEL) - addtimer(CALLBACK(src, .proc/FadeOut), CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION) + addtimer(CALLBACK(src, PROC_REF(FadeOut)), CREDIT_ROLL_SPEED - CREDIT_EASE_DURATION) QDEL_IN(src, CREDIT_ROLL_SPEED) if(parent) parent.screen += src diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index d888871edae..b4d0a9d7184 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -27,7 +27,7 @@ if(animated) animate(screen, alpha = 0, time = animated) - addtimer(CALLBACK(src, .proc/clear_fullscreen_after_animate, screen), animated, TIMER_CLIENT_TIME) + addtimer(CALLBACK(src, PROC_REF(clear_fullscreen_after_animate), screen), animated, TIMER_CLIENT_TIME) else if(client) client.screen -= screen diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 6b3913449f0..f1b0e89a77d 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -149,15 +149,15 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( owner.overlay_fullscreen("see_through_darkness", /atom/movable/screen/fullscreen/see_through_darkness) - RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, .proc/on_plane_increase) - RegisterSignal(mymob, COMSIG_MOB_LOGIN, .proc/client_refresh) - RegisterSignal(mymob, COMSIG_MOB_LOGOUT, .proc/clear_client) - RegisterSignal(mymob, COMSIG_MOB_SIGHT_CHANGE, .proc/update_sightflags) - RegisterSignal(mymob, COMSIG_VIEWDATA_UPDATE, .proc/on_viewdata_update) + RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, PROC_REF(on_plane_increase)) + RegisterSignal(mymob, COMSIG_MOB_LOGIN, PROC_REF(client_refresh)) + RegisterSignal(mymob, COMSIG_MOB_LOGOUT, PROC_REF(clear_client)) + RegisterSignal(mymob, COMSIG_MOB_SIGHT_CHANGE, PROC_REF(update_sightflags)) + RegisterSignal(mymob, COMSIG_VIEWDATA_UPDATE, PROC_REF(on_viewdata_update)) update_sightflags(mymob, mymob.sight, NONE) /datum/hud/proc/client_refresh(datum/source) - RegisterSignal(mymob.client, COMSIG_CLIENT_SET_EYE, .proc/on_eye_change) + RegisterSignal(mymob.client, COMSIG_CLIENT_SET_EYE, PROC_REF(on_eye_change)) on_eye_change(null, null, mymob.client.eye) /datum/hud/proc/clear_client(datum/source) @@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list( // By the time logout runs, the client's eye has already changed // There's just no log of the old eye, so we need to override // :sadkirby: - RegisterSignal(new_eye, COMSIG_MOVABLE_Z_CHANGED, .proc/eye_z_changed, override = TRUE) + RegisterSignal(new_eye, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(eye_z_changed), override = TRUE) eye_z_changed(new_eye) /datum/hud/proc/update_sightflags(datum/source, new_sight, old_sight) diff --git a/code/_onclick/hud/new_player.dm b/code/_onclick/hud/new_player.dm index 6853c4ec89c..4af0b5c2cd7 100644 --- a/code/_onclick/hud/new_player.dm +++ b/code/_onclick/hud/new_player.dm @@ -127,10 +127,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) @@ -138,13 +138,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) . = ..() @@ -179,10 +179,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) @@ -230,13 +230,13 @@ SIGNAL_HANDLER set_button_status(TRUE) UnregisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP) - RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, .proc/hide_join_button) + RegisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP, PROC_REF(hide_join_button)) /atom/movable/screen/lobby/button/join/proc/hide_join_button() SIGNAL_HANDLER set_button_status(FALSE) UnregisterSignal(SSticker, COMSIG_TICKER_ERROR_SETTING_UP) - RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, .proc/show_join_button) + RegisterSignal(SSticker, COMSIG_TICKER_ENTER_SETTING_UP, PROC_REF(show_join_button)) /atom/movable/screen/lobby/button/observe screen_loc = "TOP:-40,CENTER:-54" @@ -250,7 +250,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) . = ..() @@ -263,7 +263,7 @@ SIGNAL_HANDLER flick("[base_icon_state]_enabled", src) set_button_status(TRUE) - UnregisterSignal(SSticker, COMSIG_TICKER_ENTER_PREGAME, .proc/enable_observing) + UnregisterSignal(SSticker, COMSIG_TICKER_ENTER_PREGAME, PROC_REF(enable_observing)) /atom/movable/screen/lobby/button/settings icon = 'icons/hud/lobby/bottom_buttons.dmi' diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index ad8ab9ca1ab..05f3f6e48cc 100755 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -140,7 +140,7 @@ C.parallax_movedir = new_parallax_movedir if (C.parallax_animate_timer) deltimer(C.parallax_animate_timer) - var/datum/callback/CB = CALLBACK(src, .proc/update_parallax_motionblur, C, animatedir, new_parallax_movedir, newtransform) + var/datum/callback/CB = CALLBACK(src, PROC_REF(update_parallax_motionblur), C, animatedir, new_parallax_movedir, newtransform) if(skip_windups) CB.Invoke() else @@ -267,7 +267,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer) // I do not want to know bestie var/view = boss.view || world.view update_o(view) - RegisterSignal(boss, COMSIG_VIEW_SET, .proc/on_view_change) + RegisterSignal(boss, COMSIG_VIEW_SET, PROC_REF(on_view_change)) /atom/movable/screen/parallax_layer/proc/on_view_change(datum/source, new_size) SIGNAL_HANDLER @@ -337,8 +337,8 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/parallax_layer) if(!owner?.client) return var/static/list/connections = list( - COMSIG_MOVABLE_Z_CHANGED = .proc/on_z_change, - COMSIG_MOB_LOGOUT = .proc/on_mob_logout, + COMSIG_MOVABLE_Z_CHANGED = PROC_REF(on_z_change), + COMSIG_MOB_LOGOUT = PROC_REF(on_mob_logout), ) AddComponent(/datum/component/connect_mob_behalf, owner.client, connections) on_z_change(owner) diff --git a/code/_onclick/hud/picture_in_picture.dm b/code/_onclick/hud/picture_in_picture.dm index 9c0fd3e43a4..005188b3722 100644 --- a/code/_onclick/hud/picture_in_picture.dm +++ b/code/_onclick/hud/picture_in_picture.dm @@ -16,7 +16,7 @@ /atom/movable/screen/movable/pic_in_pic/Initialize(mapload) . = ..() make_backgrounds() - RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, .proc/multiz_offset_increase) + RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, PROC_REF(multiz_offset_increase)) multiz_offset_increase(SSmapping) /atom/movable/screen/movable/pic_in_pic/proc/multiz_offset_increase(datum/source) diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 7dde4267acd..44c143eed51 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -14,7 +14,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/rendering/plane_master.dm b/code/_onclick/hud/rendering/plane_master.dm index f0c1c99a9b7..048b7185a42 100644 --- a/code/_onclick/hud/rendering/plane_master.dm +++ b/code/_onclick/hud/rendering/plane_master.dm @@ -176,7 +176,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/plane_master) /atom/movable/screen/plane_master/clickcatcher/Initialize(mapload, datum/plane_master_group/home, offset) . = ..() - RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, .proc/offset_increased) + RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, PROC_REF(offset_increased)) offset_increased(SSmapping, 0, SSmapping.max_plane_offset) /atom/movable/screen/plane_master/clickcatcher/proc/offset_increased(datum/source, old_off, new_off) @@ -211,7 +211,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/plane_master) if(offset != 0) // You aren't the source? don't change yourself return - RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, .proc/on_offset_increase) + RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, PROC_REF(on_offset_increase)) offset_increase(0, SSmapping.max_plane_offset) /atom/movable/screen/plane_master/parallax/proc/on_offset_increase(datum/source, old_offset, new_offset) @@ -342,11 +342,11 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/plane_master) if(offset != 0) // You aren't the source? don't change yourself return - RegisterSignal(mymob, COMSIG_MOB_SIGHT_CHANGE, .proc/handle_sight_value) + RegisterSignal(mymob, COMSIG_MOB_SIGHT_CHANGE, PROC_REF(handle_sight_value)) handle_sight_value(mymob, mymob.sight, 0) var/datum/hud/hud = home.our_hud if(hud) - RegisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, .proc/on_offset_change) + RegisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, PROC_REF(on_offset_change)) offset_change(0, hud?.current_plane_offset || 0) /atom/movable/screen/plane_master/blackness/hide_from(mob/oldmob) @@ -356,7 +356,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/plane_master) UnregisterSignal(oldmob, COMSIG_MOB_SIGHT_CHANGE) var/datum/hud/hud = home.our_hud if(hud) - UnregisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, .proc/on_offset_change) + UnregisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, PROC_REF(on_offset_change)) /// Reacts to some new plane master value /atom/movable/screen/plane_master/blackness/proc/handle_sight_value(datum/source, new_sight, old_sight) diff --git a/code/_onclick/hud/rendering/render_plate.dm b/code/_onclick/hud/rendering/render_plate.dm index ff35ebfbd62..5c0bc5b985f 100644 --- a/code/_onclick/hud/rendering/render_plate.dm +++ b/code/_onclick/hud/rendering/render_plate.dm @@ -44,7 +44,7 @@ // Non 0 offset render plates will relay up to the transparent plane above them, assuming they're not on the same z level as their target of course var/datum/hud/hud = home.our_hud if(hud) - RegisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, .proc/on_offset_change) + RegisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, PROC_REF(on_offset_change)) offset_change(hud?.current_plane_offset || 0) /atom/movable/screen/plane_master/rendering_plate/master/hide_from(mob/oldmob) @@ -53,7 +53,7 @@ return var/datum/hud/hud = home.our_hud if(hud) - UnregisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, .proc/on_offset_change) + UnregisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, PROC_REF(on_offset_change)) /atom/movable/screen/plane_master/rendering_plate/master/proc/on_offset_change(datum/source, old_offset, new_offset) SIGNAL_HANDLER @@ -137,7 +137,7 @@ // If we don't our lower plane gets totally overriden by the black void of the upper plane var/datum/hud/hud = home.our_hud if(hud) - RegisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, .proc/on_offset_change) + RegisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, PROC_REF(on_offset_change)) offset_change(hud?.current_plane_offset || 0) set_alpha(mymob.lighting_alpha) @@ -148,7 +148,7 @@ oldmob.clear_fullscreen("lighting_backdrop_unlit") var/datum/hud/hud = home.our_hud if(hud) - UnregisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, .proc/on_offset_change) + UnregisterSignal(hud, COMSIG_HUD_OFFSET_CHANGED, PROC_REF(on_offset_change)) /atom/movable/screen/plane_master/rendering_plate/lighting/proc/on_offset_change(datum/source, old_offset, new_offset) SIGNAL_HANDLER diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 187d9110666..8f029dcab9d 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -680,7 +680,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) /atom/movable/screen/combo/proc/clear_streak() animate(src, alpha = 0, 2 SECONDS, SINE_EASING) - timerid = addtimer(CALLBACK(src, .proc/reset_icons), 2 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(reset_icons)), 2 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) /atom/movable/screen/combo/proc/reset_icons() cut_overlays() @@ -693,7 +693,7 @@ INITIALIZE_IMMEDIATE(/atom/movable/screen/splash) alpha = 255 if(!streak) return ..() - timerid = addtimer(CALLBACK(src, .proc/clear_streak), time, TIMER_UNIQUE | TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(clear_streak)), time, TIMER_UNIQUE | TIMER_STOPPABLE) icon_state = "combo" for(var/i = 1; i <= length(streak); ++i) var/intent_text = copytext(streak, i, i + 1) diff --git a/code/controllers/admin.dm b/code/controllers/admin.dm index 7a7e1f40ff6..0d90319f863 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(isdatum(target)) //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/config_entry.dm b/code/controllers/configuration/config_entry.dm index 99d1c3270d3..35eb07c5b47 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -62,7 +62,7 @@ . &= !(protection & CONFIG_ENTRY_HIDDEN) /datum/config_entry/vv_edit_var(var_name, var_value) - var/static/list/banned_edits = list(NAMEOF(src, name), NAMEOF(src, vv_VAS), NAMEOF(src, default), NAMEOF(src, resident_file), NAMEOF(src, protection), NAMEOF(src, abstract_type), NAMEOF(src, modified), NAMEOF(src, dupes_allowed)) + var/static/list/banned_edits = list(NAMEOF_STATIC(src, name), NAMEOF_STATIC(src, vv_VAS), NAMEOF_STATIC(src, default), NAMEOF_STATIC(src, resident_file), NAMEOF_STATIC(src, protection), NAMEOF_STATIC(src, abstract_type), NAMEOF_STATIC(src, modified), NAMEOF_STATIC(src, dupes_allowed)) if(var_name == NAMEOF(src, config_entry_value)) if(protection & CONFIG_ENTRY_LOCKED) return FALSE @@ -129,7 +129,7 @@ return FALSE /datum/config_entry/number/vv_edit_var(var_name, var_value) - var/static/list/banned_edits = list(NAMEOF(src, max_val), NAMEOF(src, min_val), NAMEOF(src, integer)) + var/static/list/banned_edits = list(NAMEOF_STATIC(src, max_val), NAMEOF_STATIC(src, min_val), NAMEOF_STATIC(src, integer)) return !(var_name in banned_edits) && ..() /datum/config_entry/flag diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index 88896ab57c6..d40a38b981e 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -499,4 +499,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 b9c23d9975b..96597548435 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 369aa05d7aa..5b3162d72a4 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -105,7 +105,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/subsystem_types = subtypesof(/datum/controller/subsystem) - sortTim(subsystem_types, /proc/cmp_subsystem_init) + sortTim(subsystem_types, GLOBAL_PROC_REF(cmp_subsystem_init)) //Find any abandoned subsystem from the previous master (if there was any) var/list/existing_subsystems = list() @@ -131,7 +131,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /datum/controller/master/Shutdown() processing = FALSE - sortTim(subsystems, /proc/cmp_subsystem_init) + sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_init)) reverse_range(subsystems) for(var/datum/controller/subsystem/ss in subsystems) log_world("Shutting down [ss.name] subsystem...") @@ -226,7 +226,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new stage_sorted_subsystems[i] = list() // 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)) for (var/datum/controller/subsystem/subsystem as anything in subsystems) var/subsystem_init_stage = subsystem.init_stage @@ -236,7 +236,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new stage_sorted_subsystems[subsystem_init_stage] += subsystem // Sort subsystems by display setting for easy access. - sortTim(subsystems, /proc/cmp_subsystem_display) + sortTim(subsystems, GLOBAL_PROC_REF(cmp_subsystem_display)) var/start_timeofday = REALTIMEOFDAY for (var/current_init_stage in 1 to INITSTAGE_MAX) @@ -430,9 +430,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(I, /proc/cmp_subsystem_priority) + sortTim(I, GLOBAL_PROC_REF(cmp_subsystem_priority)) I += tickersubsystems var/cached_runlevel = current_runlevel diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm index cb8f62df461..135b4a25dde 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(augury) /datum/controller/subsystem/augury/proc/register_doom(atom/A, severity) doombringers[A] = severity - RegisterSignal(A, COMSIG_PARENT_QDELETING, .proc/unregister_doom) + RegisterSignal(A, COMSIG_PARENT_QDELETING, PROC_REF(unregister_doom)) /datum/controller/subsystem/augury/proc/unregister_doom(atom/A) SIGNAL_HANDLER diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index d3a6af8d5d4..e5bf7287f82 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -345,9 +345,9 @@ SUBSYSTEM_DEF(dbcore) continue 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/datum/db_query/query as anything in queries) query.sync() diff --git a/code/controllers/subsystem/dcs.dm b/code/controllers/subsystem/dcs.dm index ddf2ebe0939..a6fafed4511 100644 --- a/code/controllers/subsystem/dcs.dm +++ b/code/controllers/subsystem/dcs.dm @@ -54,7 +54,7 @@ PROCESSING_SUBSYSTEM_DEF(dcs) fullid += REF(key) if(length(named_arguments)) - named_arguments = sortTim(named_arguments, /proc/cmp_text_asc) + named_arguments = sortTim(named_arguments, GLOBAL_PROC_REF(cmp_text_asc)) fullid += named_arguments return list2params(fullid) diff --git a/code/controllers/subsystem/eigenstate.dm b/code/controllers/subsystem/eigenstate.dm index b1d6c266f52..d95f0b6b5ee 100644 --- a/code/controllers/subsystem/eigenstate.dm +++ b/code/controllers/subsystem/eigenstate.dm @@ -37,9 +37,9 @@ SUBSYSTEM_DEF(eigenstates) for(var/atom/target as anything in targets) eigen_targets["[id_counter]"] += target eigen_id[target] = "[id_counter]" - RegisterSignal(target, COMSIG_CLOSET_INSERT, .proc/use_eigenlinked_atom) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/remove_eigen_entry) - RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), .proc/tool_interact) + RegisterSignal(target, COMSIG_CLOSET_INSERT, PROC_REF(use_eigenlinked_atom)) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(remove_eigen_entry)) + RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), PROC_REF(tool_interact)) target.RegisterSignal(target, COMSIG_EIGENSTATE_ACTIVATE, /obj/structure/closet/proc/bust_open) ADD_TRAIT(target, TRAIT_BANNED_FROM_CARGO_SHUTTLE, REF(src)) var/obj/item = target diff --git a/code/controllers/subsystem/explosions.dm b/code/controllers/subsystem/explosions.dm index 3a8ba842a97..8f3166cf5aa 100644 --- a/code/controllers/subsystem/explosions.dm +++ b/code/controllers/subsystem/explosions.dm @@ -146,7 +146,7 @@ SUBSYSTEM_DEF(explosions) else continue - addtimer(CALLBACK(GLOBAL_PROC, .proc/wipe_color_and_text, wipe_colours), 100) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(wipe_color_and_text), wipe_colours), 100) /proc/wipe_color_and_text(list/atom/wiping) for(var/i in wiping) diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index d7405b6ffed..6fbe0741564 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -153,22 +153,22 @@ SUBSYSTEM_DEF(job) new_joinable_departments_by_type[department_type] = department department.add_job(job) - sortTim(new_all_occupations, /proc/cmp_job_display_asc) + sortTim(new_all_occupations, GLOBAL_PROC_REF(cmp_job_display_asc)) for(var/datum/job/job as anything in new_all_occupations) if(!job.exp_granted_type) continue new_experience_jobs_map[job.exp_granted_type] += list(job) - sortTim(new_joinable_departments_by_type, /proc/cmp_department_display_asc, associative = TRUE) + sortTim(new_joinable_departments_by_type, GLOBAL_PROC_REF(cmp_department_display_asc), associative = TRUE) for(var/department_type in new_joinable_departments_by_type) var/datum/job_department/department = new_joinable_departments_by_type[department_type] - sortTim(department.department_jobs, /proc/cmp_job_display_asc) + sortTim(department.department_jobs, GLOBAL_PROC_REF(cmp_job_display_asc)) new_joinable_departments += department if(department.department_experience_type) new_experience_jobs_map[department.department_experience_type] = department.department_jobs.Copy() all_occupations = new_all_occupations - joinable_occupations = sortTim(new_joinable_occupations, /proc/cmp_job_display_asc) + joinable_occupations = sortTim(new_joinable_occupations, GLOBAL_PROC_REF(cmp_job_display_asc)) joinable_departments = new_joinable_departments joinable_departments_by_type = new_joinable_departments_by_type experience_jobs_map = new_experience_jobs_map @@ -882,7 +882,7 @@ SUBSYSTEM_DEF(job) var/oldjobs = SSjob.all_occupations sleep(2 SECONDS) for (var/datum/job/job as anything in oldjobs) - INVOKE_ASYNC(src, .proc/RecoverJob, job) + INVOKE_ASYNC(src, PROC_REF(RecoverJob), job) /datum/controller/subsystem/job/proc/RecoverJob(datum/job/J) var/datum/job/newjob = GetJob(J.title) diff --git a/code/controllers/subsystem/lag_switch.dm b/code/controllers/subsystem/lag_switch.dm index b06ea4053e4..dac4e272640 100644 --- a/code/controllers/subsystem/lag_switch.dm +++ b/code/controllers/subsystem/lag_switch.dm @@ -23,7 +23,7 @@ SUBSYSTEM_DEF(lag_switch) if(auto_switch_pop) auto_switch = TRUE trigger_pop = auto_switch_pop - RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, .proc/client_connected) + RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, PROC_REF(client_connected)) return SS_INIT_SUCCESS /datum/controller/subsystem/lag_switch/proc/client_connected(datum/source, client/connected) @@ -33,7 +33,7 @@ SUBSYSTEM_DEF(lag_switch) auto_switch = FALSE UnregisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT) - veto_timer_id = addtimer(CALLBACK(src, .proc/set_all_measures, TRUE, TRUE), 20 SECONDS, TIMER_STOPPABLE) + veto_timer_id = addtimer(CALLBACK(src, PROC_REF(set_all_measures), TRUE, TRUE), 20 SECONDS, TIMER_STOPPABLE) message_admins("Lag Switch population threshold reached. Automatic activation of lag mitigation measures occuring in 20 seconds. (CANCEL)") log_admin("Lag Switch population threshold reached. Automatic activation of lag mitigation measures occuring in 20 seconds.") @@ -41,7 +41,7 @@ SUBSYSTEM_DEF(lag_switch) /datum/controller/subsystem/lag_switch/proc/toggle_auto_enable() auto_switch = !auto_switch if(auto_switch) - RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, .proc/client_connected) + RegisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT, PROC_REF(client_connected)) else UnregisterSignal(SSdcs, COMSIG_GLOB_CLIENT_CONNECT) diff --git a/code/controllers/subsystem/lua.dm b/code/controllers/subsystem/lua.dm index b10cd4c9d58..55b4856b890 100644 --- a/code/controllers/subsystem/lua.dm +++ b/code/controllers/subsystem/lua.dm @@ -132,4 +132,4 @@ SUBSYSTEM_DEF(lua) // Update every lua editor TGUI open for each state that had a task awakened or resumed for(var/datum/lua_state/state in affected_states) - INVOKE_ASYNC(state, /datum/lua_state.proc/update_editors) + INVOKE_ASYNC(state, TYPE_PROC_REF(/datum/lua_state, update_editors)) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 7394bca207f..1c2270f0938 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -261,7 +261,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 @@ -542,7 +542,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) banned += generateMapList("spaceruinblacklist.txt") banned += generateMapList("iceruinblacklist.txt") - for(var/item in sort_list(subtypesof(/datum/map_template/ruin), /proc/cmp_ruincost_priority)) + for(var/item in sort_list(subtypesof(/datum/map_template/ruin), GLOBAL_PROC_REF(cmp_ruincost_priority))) var/datum/map_template/ruin/ruin_type = item // screen out the abstract subtypes if(!initial(ruin_type.id)) diff --git a/code/controllers/subsystem/materials.dm b/code/controllers/subsystem/materials.dm index 6276cb3af46..b682b35e1de 100644 --- a/code/controllers/subsystem/materials.dm +++ b/code/controllers/subsystem/materials.dm @@ -155,7 +155,7 @@ SUBSYSTEM_DEF(materials) for(var/x in materials_declaration) var/datum/material/mat = x combo_params += "[istype(mat) ? mat.id : mat]=[materials_declaration[mat] * multiplier]" - sortTim(combo_params, /proc/cmp_text_asc) // We have to sort now in case the declaration was not in order + sortTim(combo_params, GLOBAL_PROC_REF(cmp_text_asc)) // We have to sort now in case the declaration was not in order var/combo_index = combo_params.Join("-") var/list/combo = material_combos[combo_index] if(!combo) diff --git a/code/controllers/subsystem/movement/movement_types.dm b/code/controllers/subsystem/movement/movement_types.dm index 8b2ced243f2..a3d1165b8a3 100644 --- a/code/controllers/subsystem/movement/movement_types.dm +++ b/code/controllers/subsystem/movement/movement_types.dm @@ -31,7 +31,7 @@ src.controller = controller src.extra_info = extra_info if(extra_info) - RegisterSignal(extra_info, COMSIG_PARENT_QDELETING, .proc/info_deleted) + RegisterSignal(extra_info, COMSIG_PARENT_QDELETING, PROC_REF(info_deleted)) src.moving = moving src.priority = priority src.flags = flags @@ -240,7 +240,7 @@ target = chasing if(!isturf(target)) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/handle_no_target) //Don't do this for turfs, because we don't care + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(handle_no_target)) //Don't do this for turfs, because we don't care /datum/move_loop/has_target/compare_loops(datum/move_loop/loop_type, priority, flags, extra_info, delay, timeout, atom/chasing) if(..() && chasing == target) @@ -369,7 +369,7 @@ src.avoid = avoid src.skip_first = skip_first if(isidcard(id)) - RegisterSignal(id, COMSIG_PARENT_QDELETING, .proc/handle_no_id) //I prefer erroring to harddels. If this breaks anything consider making id info into a datum or something + RegisterSignal(id, COMSIG_PARENT_QDELETING, PROC_REF(handle_no_id)) //I prefer erroring to harddels. If this breaks anything consider making id info into a datum or something /datum/move_loop/has_target/jps/compare_loops(datum/move_loop/loop_type, priority, flags, extra_info, delay, timeout, atom/chasing, repath_delay, max_path_length, minimum_distance, obj/item/card/id/id, simulated_only, turf/avoid, skip_first) if(..() && repath_delay == src.repath_delay && max_path_length == src.max_path_length && minimum_distance == src.minimum_distance && id == src.id && simulated_only == src.simulated_only && avoid == src.avoid) @@ -378,7 +378,7 @@ /datum/move_loop/has_target/jps/start_loop() . = ..() - INVOKE_ASYNC(src, .proc/recalculate_path) + INVOKE_ASYNC(src, PROC_REF(recalculate_path)) /datum/move_loop/has_target/jps/Destroy() id = null //Kill me @@ -399,7 +399,7 @@ /datum/move_loop/has_target/jps/move() if(!length(movement_path)) - INVOKE_ASYNC(src, .proc/recalculate_path) + INVOKE_ASYNC(src, PROC_REF(recalculate_path)) if(!length(movement_path)) return FALSE @@ -413,7 +413,7 @@ if(get_turf(moving) == next_step) movement_path.Cut(1,2) else - INVOKE_ASYNC(src, .proc/recalculate_path) + INVOKE_ASYNC(src, PROC_REF(recalculate_path)) return FALSE @@ -572,8 +572,8 @@ if(home) if(ismovable(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/update_slope) //If it can move, update your slope when it does - RegisterSignal(moving, COMSIG_MOVABLE_MOVED, .proc/handle_move) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(update_slope)) //If it can move, update your slope when it does + RegisterSignal(moving, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) update_slope() /datum/move_loop/has_target/move_towards/compare_loops(datum/move_loop/loop_type, priority, flags, extra_info, delay, timeout, atom/chasing, home = FALSE) diff --git a/code/controllers/subsystem/pathfinder.dm b/code/controllers/subsystem/pathfinder.dm index fbbe51003a6..b13d3d465f2 100644 --- a/code/controllers/subsystem/pathfinder.dm +++ b/code/controllers/subsystem/pathfinder.dm @@ -29,7 +29,7 @@ SUBSYSTEM_DEF(pathfinder) while(flow[free]) CHECK_TICK free = (free % lcount) + 1 - var/t = addtimer(CALLBACK(src, /datum/flowcache.proc/toolong, free), 150, TIMER_STOPPABLE) + var/t = addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/flowcache, toolong), free), 150, TIMER_STOPPABLE) flow[free] = t flow[t] = M return free diff --git a/code/controllers/subsystem/points_of_interest.dm b/code/controllers/subsystem/points_of_interest.dm index 505c9163d1c..4280d747b61 100644 --- a/code/controllers/subsystem/points_of_interest.dm +++ b/code/controllers/subsystem/points_of_interest.dm @@ -221,7 +221,7 @@ SUBSYSTEM_DEF(points_of_interest) else return sort_difference -/// Priority list broadly stolen from /proc/sortmobs. Lower numbers are higher priorities when sorted and appear closer to the top or start of lists. +/// Priority list broadly stolen from /proc/sortmobs(). Lower numbers are higher priorities when sorted and appear closer to the top or start of lists. /datum/point_of_interest/mob_poi/proc/get_type_sort_priority() if(isAI(target)) return 0 diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index e177cd26166..09400c6675a 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -51,7 +51,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks) /datum/controller/subsystem/processing/quirks/proc/SetupQuirks() // Sort by Positive, Negative, Neutral; and then by name - var/list/quirk_list = sort_list(subtypesof(/datum/quirk), /proc/cmp_quirk_asc) + var/list/quirk_list = sort_list(subtypesof(/datum/quirk), GLOBAL_PROC_REF(cmp_quirk_asc)) for(var/type in quirk_list) var/datum/quirk/quirk_type = type diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 6116f72ff0c..19d27ae6f12 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -244,10 +244,10 @@ SUBSYSTEM_DEF(shuttle) /datum/controller/subsystem/shuttle/proc/block_recall(lockout_timer) if(admin_emergency_no_recall) priority_announce("Error!", "Emergency Shuttle Uplink Alert", 'sound/misc/announce_dig.ogg') - addtimer(CALLBACK(src, .proc/unblock_recall), lockout_timer) + addtimer(CALLBACK(src, PROC_REF(unblock_recall)), lockout_timer) return emergency_no_recall = TRUE - addtimer(CALLBACK(src, .proc/unblock_recall), lockout_timer) + addtimer(CALLBACK(src, PROC_REF(unblock_recall)), lockout_timer) /datum/controller/subsystem/shuttle/proc/unblock_recall() if(admin_emergency_no_recall) diff --git a/code/controllers/subsystem/spatial_gridmap.dm b/code/controllers/subsystem/spatial_gridmap.dm index 6afa8a95055..9d8bc5356b7 100644 --- a/code/controllers/subsystem/spatial_gridmap.dm +++ b/code/controllers/subsystem/spatial_gridmap.dm @@ -125,13 +125,13 @@ SUBSYSTEM_DEF(spatial_grid) pregenerate_more_oranges_ears(NUMBER_OF_PREGENERATED_ORANGES_EARS) - RegisterSignal(SSdcs, COMSIG_GLOB_NEW_Z, .proc/propogate_spatial_grid_to_new_z) - RegisterSignal(SSdcs, COMSIG_GLOB_EXPANDED_WORLD_BOUNDS, .proc/after_world_bounds_expanded) + RegisterSignal(SSdcs, COMSIG_GLOB_NEW_Z, PROC_REF(propogate_spatial_grid_to_new_z)) + RegisterSignal(SSdcs, COMSIG_GLOB_EXPANDED_WORLD_BOUNDS, PROC_REF(after_world_bounds_expanded)) return SS_INIT_SUCCESS ///add a movable to the pre init queue for whichever type is specified so that when the subsystem initializes they get added to the grid /datum/controller/subsystem/spatial_grid/proc/enter_pre_init_queue(atom/movable/waiting_movable, type) - RegisterSignal(waiting_movable, COMSIG_PARENT_QDELETING, .proc/queued_item_deleted, override = TRUE) + RegisterSignal(waiting_movable, COMSIG_PARENT_QDELETING, PROC_REF(queued_item_deleted), override = TRUE) //override because something can enter the queue for two different types but that is done through unrelated procs that shouldnt know about eachother waiting_to_add_by_type[type] += waiting_movable diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 87c4d11f8e4..08edac0381b 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -382,8 +382,8 @@ SUBSYSTEM_DEF(statpanels) if(actively_tracking) stop_turf_tracking() var/static/list/connections = list( - COMSIG_MOVABLE_MOVED = .proc/on_mob_move, - COMSIG_MOB_LOGOUT = .proc/on_mob_logout, + COMSIG_MOVABLE_MOVED = PROC_REF(on_mob_move), + COMSIG_MOB_LOGOUT = PROC_REF(on_mob_logout), ) AddComponent(/datum/component/connect_mob_behalf, parent, connections) actively_tracking = TRUE diff --git a/code/controllers/subsystem/tcgsetup.dm b/code/controllers/subsystem/tcgsetup.dm index ffd3c1c56e5..763581eb24d 100644 --- a/code/controllers/subsystem/tcgsetup.dm +++ b/code/controllers/subsystem/tcgsetup.dm @@ -180,7 +180,7 @@ SUBSYSTEM_DEF(trading_card_game) totalCards++ cardsByCount[id] += 1 var/toSend = "Out of [totalCards] cards" - for(var/id in sort_list(cardsByCount, /proc/cmp_num_string_asc)) + for(var/id in sort_list(cardsByCount, GLOBAL_PROC_REF(cmp_num_string_asc))) if(id) var/datum/card/template = cached_cards[pack.series]["ALL"][id] toSend += "\nID:[id] [template.name] [(cardsByCount[id] * 100) / totalCards]% Total:[cardsByCount[id]]" diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index b48c43a5744..bc3c698fde3 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -94,7 +94,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.starting_turf = get_turf(thrownthing) src.target_turf = get_turf(target) if(target_turf != target) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index afb1e3538e9..20cc2d6cb81 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -161,7 +161,7 @@ SUBSYSTEM_DEF(ticker) send2chat("<@&[CONFIG_GET(string/game_alert_role_id)]> New round starting on [SSmapping.config.map_name], [CONFIG_GET(string/servername)]! \nIf you wish to be pinged for game related stuff, go to <#[CONFIG_GET(string/role_assign_channel_id)]> and assign yourself the roles.", CONFIG_GET(string/chat_announce_new_game)) // Skyrat EDIT -- role pingcurrent_state = GAME_STATE_PREGAME current_state = GAME_STATE_PREGAME SStitle.change_title_screen() //SKYRAT EDIT ADDITION - Title screen - addtimer(CALLBACK(SStitle, /datum/controller/subsystem/title/.proc/change_title_screen), 1 SECONDS) //SKYRAT EDIT ADDITION - Title screen + addtimer(CALLBACK(SStitle, TYPE_PROC_REF(/datum/controller/subsystem/title, change_title_screen)), 1 SECONDS) //SKYRAT EDIT ADDITION - Title screen //Everyone who wants to be an observer is now spawned SEND_SIGNAL(src, COMSIG_TICKER_ENTER_PREGAME) fire() @@ -424,7 +424,7 @@ SUBSYSTEM_DEF(ticker) captainless = FALSE var/acting_captain = !is_captain_job(player_assigned_role) SSjob.promote_to_captain(new_player_living, acting_captain) - OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/minor_announce, player_assigned_role.get_captaincy_announcement(new_player_living))) + OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(minor_announce), player_assigned_role.get_captaincy_announcement(new_player_living))) if((player_assigned_role.job_flags & JOB_ASSIGN_QUIRKS) && ishuman(new_player_living) && CONFIG_GET(flag/roundstart_traits)) if(new_player_mob.client?.prefs?.should_be_random_hardcore(player_assigned_role, new_player_living.mind)) new_player_mob.client.prefs.hardcore_random_setup(new_player_living) @@ -486,7 +486,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) @@ -531,7 +531,7 @@ SUBSYSTEM_DEF(ticker) return if(world.time - SSticker.round_start_time < 10 MINUTES) //Not forcing map rotation for very short rounds. return - INVOKE_ASYNC(SSmapping, /datum/controller/subsystem/mapping/.proc/maprotate) + INVOKE_ASYNC(SSmapping, TYPE_PROC_REF(/datum/controller/subsystem/mapping/, maprotate)) /datum/controller/subsystem/ticker/proc/HasRoundStarted() return current_state >= GAME_STATE_PLAYING diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm index 3cf91c71e50..ab6d5fb2ed5 100644 --- a/code/controllers/subsystem/time_track.dm +++ b/code/controllers/subsystem/time_track.dm @@ -101,7 +101,13 @@ SUBSYSTEM_DEF(time_track) last_tick_tickcount = current_tickcount var/sendmaps_json = world.Profile(PROFILE_REFRESH, type = "sendmaps", format="json") - var/list/send_maps_data = json_decode(sendmaps_json) + var/list/send_maps_data = null + try + send_maps_data = json_decode(sendmaps_json) + catch + text2file(sendmaps_json,"bad_sendmaps.json") + can_fire = FALSE + return var/send_maps_sort = send_maps_data.Copy() //Doing it like this guarentees us a properly sorted list for(var/list/packet in send_maps_data) diff --git a/code/controllers/subsystem/timer.dm b/code/controllers/subsystem/timer.dm index b71139ffffa..9a043ffba41 100644 --- a/code/controllers/subsystem/timer.dm +++ b/code/controllers/subsystem/timer.dm @@ -277,7 +277,7 @@ SUBSYSTEM_DEF(timer) return // Sort all timers by time to run - sortTim(alltimers, .proc/cmp_timer) + sortTim(alltimers, GLOBAL_PROC_REF(cmp_timer)) // Get the earliest timer, and if the TTR is earlier than the current world.time, // then set the head offset appropriately to be the earliest time tracked by the diff --git a/code/controllers/subsystem/traitor.dm b/code/controllers/subsystem/traitor.dm index 1fbdf0c8d49..bae2bebecd1 100644 --- a/code/controllers/subsystem/traitor.dm +++ b/code/controllers/subsystem/traitor.dm @@ -89,7 +89,7 @@ SUBSYSTEM_DEF(traitor) uplink_handlers |= uplink_handler // An uplink handler can be registered multiple times if they get assigned to new uplinks, so // override is set to TRUE here because it is intentional that they could get added multiple times. - RegisterSignal(uplink_handler, COMSIG_PARENT_QDELETING, .proc/uplink_handler_deleted, override = TRUE) + RegisterSignal(uplink_handler, COMSIG_PARENT_QDELETING, PROC_REF(uplink_handler_deleted), override = TRUE) /datum/controller/subsystem/traitor/proc/uplink_handler_deleted(datum/uplink_handler/uplink_handler) SIGNAL_HANDLER diff --git a/code/controllers/subsystem/verb_manager.dm b/code/controllers/subsystem/verb_manager.dm index 438916b5ae8..71d6fe25b03 100644 --- a/code/controllers/subsystem/verb_manager.dm +++ b/code/controllers/subsystem/verb_manager.dm @@ -81,7 +81,7 @@ SUBSYSTEM_DEF(verb_manager) #ifdef UNIT_TESTS if(QDELETED(usr) && ismob(incoming_callback.object)) incoming_callback.user = WEAKREF(incoming_callback.object) - var/datum/callback/new_us = CALLBACK(arglist(list(GLOBAL_PROC, /proc/_queue_verb) + args.Copy())) + var/datum/callback/new_us = CALLBACK(arglist(list(GLOBAL_PROC, GLOBAL_PROC_REF(_queue_verb)) + args.Copy())) return world.push_usr(incoming_callback.object, new_us) #endif diff --git a/code/controllers/subsystem/weather.dm b/code/controllers/subsystem/weather.dm index 34d51f679cc..97f25a98a5a 100644 --- a/code/controllers/subsystem/weather.dm +++ b/code/controllers/subsystem/weather.dm @@ -30,7 +30,7 @@ SUBSYSTEM_DEF(weather) run_weather(our_event, list(text2num(z))) eligible_zlevels -= z var/randTime = rand(3000, 6000) - next_hit_by_zlevel["[z]"] = addtimer(CALLBACK(src, .proc/make_eligible, z, possible_weather), randTime + initial(our_event.weather_duration_upper), TIMER_UNIQUE|TIMER_STOPPABLE) //Around 5-10 minutes between weathers + next_hit_by_zlevel["[z]"] = addtimer(CALLBACK(src, PROC_REF(make_eligible), z, possible_weather), randTime + initial(our_event.weather_duration_upper), TIMER_UNIQUE|TIMER_STOPPABLE) //Around 5-10 minutes between weathers /datum/controller/subsystem/weather/Initialize() for(var/V in subtypesof(/datum/weather)) diff --git a/code/datums/actions/action.dm b/code/datums/actions/action.dm index e8974d303a3..04e8a44a086 100644 --- a/code/datums/actions/action.dm +++ b/code/datums/actions/action.dm @@ -42,13 +42,13 @@ /// Links the passed target to our action, registering any relevant signals /datum/action/proc/link_to(Target) target = Target - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/clear_ref, override = TRUE) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_ref), override = TRUE) if(isatom(target)) - RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, .proc/update_icon_on_signal) + RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_icon_on_signal)) if(istype(target, /datum/mind)) - RegisterSignal(target, COMSIG_MIND_TRANSFERRED, .proc/on_target_mind_swapped) + RegisterSignal(target, COMSIG_MIND_TRANSFERRED, PROC_REF(on_target_mind_swapped)) /datum/action/Destroy() if(owner) @@ -77,18 +77,18 @@ Remove(owner) SEND_SIGNAL(src, COMSIG_ACTION_GRANTED, grant_to) owner = grant_to - RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/clear_ref, override = TRUE) + RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(clear_ref), override = TRUE) // Register some signals based on our check_flags // so that our button icon updates when relevant if(check_flags & AB_CHECK_CONSCIOUS) - RegisterSignal(owner, COMSIG_MOB_STATCHANGE, .proc/update_icon_on_signal) + RegisterSignal(owner, COMSIG_MOB_STATCHANGE, PROC_REF(update_icon_on_signal)) if(check_flags & AB_CHECK_IMMOBILE) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_IMMOBILIZED), .proc/update_icon_on_signal) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_IMMOBILIZED), PROC_REF(update_icon_on_signal)) if(check_flags & AB_CHECK_HANDS_BLOCKED) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), .proc/update_icon_on_signal) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), PROC_REF(update_icon_on_signal)) if(check_flags & AB_CHECK_LYING) - RegisterSignal(owner, COMSIG_LIVING_SET_BODY_POSITION, .proc/update_icon_on_signal) + RegisterSignal(owner, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(update_icon_on_signal)) if(owner_has_control) GiveAction(grant_to) @@ -117,7 +117,7 @@ )) if(target == owner) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/clear_ref) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_ref)) owner = null /// Actually triggers the effects of the action. diff --git a/code/datums/actions/cooldown_action.dm b/code/datums/actions/cooldown_action.dm index 1126ee6e6d0..91abc2f7b07 100644 --- a/code/datums/actions/cooldown_action.dm +++ b/code/datums/actions/cooldown_action.dm @@ -59,7 +59,7 @@ UpdateButtons() if(next_use_time > world.time) START_PROCESSING(SSfastprocess, src) - RegisterSignal(granted_to, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, .proc/handle_melee_attack) + RegisterSignal(granted_to, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(handle_melee_attack)) for(var/datum/action/cooldown/ability as anything in initialized_actions) ability.Grant(granted_to) @@ -192,7 +192,7 @@ for(var/datum/action/cooldown/ability as anything in initialized_actions) if(LAZYLEN(ability.initialized_actions) > 0) ability.initialized_actions = list() - addtimer(CALLBACK(ability, .proc/Activate, target), total_delay) + addtimer(CALLBACK(ability, PROC_REF(Activate), target), total_delay) total_delay += initialized_actions[ability] StartCooldown() diff --git a/code/datums/actions/items/stealth_box.dm b/code/datums/actions/items/stealth_box.dm index 010b624f904..99a685728c1 100644 --- a/code/datums/actions/items/stealth_box.dm +++ b/code/datums/actions/items/stealth_box.dm @@ -34,7 +34,7 @@ /datum/action/item_action/agent_box/Grant(mob/grant_to) . = ..() if(owner) - RegisterSignal(owner, COMSIG_HUMAN_SUICIDE_ACT, .proc/suicide_act) + RegisterSignal(owner, COMSIG_HUMAN_SUICIDE_ACT, PROC_REF(suicide_act)) /datum/action/item_action/agent_box/Remove(mob/M) if(owner) diff --git a/code/datums/actions/mobs/charge.dm b/code/datums/actions/mobs/charge.dm index 9a0c8e0b9f4..beb9ab63d26 100644 --- a/code/datums/actions/mobs/charge.dm +++ b/code/datums/actions/mobs/charge.dm @@ -48,9 +48,9 @@ charging += charger actively_moving = FALSE SEND_SIGNAL(owner, COMSIG_STARTED_CHARGE) - RegisterSignal(charger, COMSIG_MOVABLE_BUMP, .proc/on_bump, TRUE) - RegisterSignal(charger, COMSIG_MOVABLE_PRE_MOVE, .proc/on_move, TRUE) - RegisterSignal(charger, COMSIG_MOVABLE_MOVED, .proc/on_moved, TRUE) + RegisterSignal(charger, COMSIG_MOVABLE_BUMP, PROC_REF(on_bump), TRUE) + RegisterSignal(charger, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(on_move), TRUE) + RegisterSignal(charger, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved), TRUE) DestroySurroundings(charger) charger.setDir(dir) do_charge_indicator(charger, target) @@ -62,11 +62,11 @@ var/datum/move_loop/new_loop = SSmove_manager.home_onto(charger, target, delay = charge_speed, timeout = time_to_hit, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) if(!new_loop) return - RegisterSignal(new_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(new_loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) - RegisterSignal(new_loop, COMSIG_PARENT_QDELETING, .proc/charge_end) + RegisterSignal(new_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(new_loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) + RegisterSignal(new_loop, COMSIG_PARENT_QDELETING, PROC_REF(charge_end)) if(ismob(charger)) - RegisterSignal(charger, COMSIG_MOB_STATCHANGE, .proc/stat_changed) + RegisterSignal(charger, COMSIG_MOB_STATCHANGE, PROC_REF(stat_changed)) // Yes this is disgusting. But we need to queue this stuff, and this code just isn't setup to support that right now. So gotta do it with sleeps sleep(time_to_hit + charge_speed) @@ -109,12 +109,12 @@ if(!actively_moving) return COMPONENT_MOVABLE_BLOCK_PRE_MOVE new /obj/effect/temp_visual/decoy/fading(source.loc, source) - INVOKE_ASYNC(src, .proc/DestroySurroundings, source) + INVOKE_ASYNC(src, PROC_REF(DestroySurroundings), source) /datum/action/cooldown/mob_cooldown/charge/proc/on_moved(atom/source) SIGNAL_HANDLER playsound(source, 'sound/effects/meteorimpact.ogg', 200, TRUE, 2, TRUE) - INVOKE_ASYNC(src, .proc/DestroySurroundings, source) + INVOKE_ASYNC(src, PROC_REF(DestroySurroundings), source) /datum/action/cooldown/mob_cooldown/charge/proc/DestroySurroundings(atom/movable/charger) if(!destroy_objects) @@ -154,7 +154,7 @@ if(isobj(target) && target.density) SSexplosions.med_mov_atom += target - INVOKE_ASYNC(src, .proc/DestroySurroundings, source) + INVOKE_ASYNC(src, PROC_REF(DestroySurroundings), source) hit_target(source, target, charge_damage) /datum/action/cooldown/mob_cooldown/charge/proc/hit_target(atom/movable/source, atom/target, damage_dealt) @@ -261,7 +261,7 @@ our_clone.alpha = 127.5 our_clone.move_through_mob = owner our_clone.spawn_blood = spawn_blood - INVOKE_ASYNC(src, .proc/do_charge, our_clone, target_atom, delay, past) + INVOKE_ASYNC(src, PROC_REF(do_charge), our_clone, target_atom, delay, past) if(use_self) do_charge(owner, target_atom, delay, past) diff --git a/code/datums/actions/mobs/fire_breath.dm b/code/datums/actions/mobs/fire_breath.dm index 1099ef01599..34398473de4 100644 --- a/code/datums/actions/mobs/fire_breath.dm +++ b/code/datums/actions/mobs/fire_breath.dm @@ -41,7 +41,7 @@ /datum/action/cooldown/mob_cooldown/fire_breath/cone/attack_sequence(atom/target) playsound(owner.loc, fire_sound, 200, TRUE) for(var/offset in angles) - INVOKE_ASYNC(src, .proc/fire_line, target, offset) + INVOKE_ASYNC(src, PROC_REF(fire_line), target, offset) /datum/action/cooldown/mob_cooldown/fire_breath/mass_fire name = "Mass Fire" @@ -59,5 +59,5 @@ playsound(owner.loc, fire_sound, 200, TRUE) var/increment = 360 / spiral_count for(var/j = 1 to spiral_count) - INVOKE_ASYNC(src, .proc/fire_line, target, j * increment + i * increment / 2) + INVOKE_ASYNC(src, PROC_REF(fire_line), target, j * increment + i * increment / 2) SLEEP_CHECK_DEATH(delay_time, owner) diff --git a/code/datums/actions/mobs/lava_swoop.dm b/code/datums/actions/mobs/lava_swoop.dm index a93dc2f9e35..af1cafa29e9 100644 --- a/code/datums/actions/mobs/lava_swoop.dm +++ b/code/datums/actions/mobs/lava_swoop.dm @@ -32,7 +32,7 @@ if(enraged) swoop_attack(target, TRUE) return - INVOKE_ASYNC(src, .proc/lava_pools, target) + INVOKE_ASYNC(src, PROC_REF(lava_pools), target) swoop_attack(target) /datum/action/cooldown/mob_cooldown/lava_swoop/proc/swoop_attack(atom/target, lava_arena = FALSE) @@ -213,7 +213,7 @@ /obj/effect/temp_visual/dragon_flight/Initialize(mapload, negative) . = ..() - INVOKE_ASYNC(src, .proc/flight, negative) + INVOKE_ASYNC(src, PROC_REF(flight), negative) /obj/effect/temp_visual/dragon_flight/proc/flight(negative) if(negative) diff --git a/code/datums/actions/mobs/projectileattack.dm b/code/datums/actions/mobs/projectileattack.dm index 2858a3e9795..c048c3977b5 100644 --- a/code/datums/actions/mobs/projectileattack.dm +++ b/code/datums/actions/mobs/projectileattack.dm @@ -93,7 +93,7 @@ /datum/action/cooldown/mob_cooldown/projectile_attack/rapid_fire/shrapnel/attack_sequence(mob/living/firer, atom/target) for(var/i in 1 to shot_count) var/obj/projectile/to_explode = shoot_projectile(firer, target, null, firer, rand(-default_projectile_spread, default_projectile_spread), null) - addtimer(CALLBACK(src, .proc/explode_into_shrapnel, firer, target, to_explode), break_time) + addtimer(CALLBACK(src, PROC_REF(explode_into_shrapnel), firer, target, to_explode), break_time) SLEEP_CHECK_DEATH(shot_delay, src) /datum/action/cooldown/mob_cooldown/projectile_attack/rapid_fire/shrapnel/proc/explode_into_shrapnel(mob/living/firer, atom/target, obj/projectile/to_explode) @@ -123,7 +123,7 @@ /datum/action/cooldown/mob_cooldown/projectile_attack/spiral_shots/attack_sequence(mob/living/firer, atom/target) if(enraged) SLEEP_CHECK_DEATH(1 SECONDS, firer) - INVOKE_ASYNC(src, .proc/create_spiral_attack, firer, target, TRUE) + INVOKE_ASYNC(src, PROC_REF(create_spiral_attack), firer, target, TRUE) create_spiral_attack(firer, target, FALSE) return create_spiral_attack(firer, target) diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index 386ed8fbc9f..d3562a9d24e 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -104,7 +104,7 @@ multiple modular subtrees with behaviors else set_ai_status(AI_STATUS_ON) - RegisterSignal(pawn, COMSIG_MOB_LOGIN, .proc/on_sentience_gained) + RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained)) ///Abstract proc for initializing the pawn to the new controller /datum/ai_controller/proc/TryPossessPawn(atom/new_pawn) @@ -254,13 +254,13 @@ multiple modular subtrees with behaviors UnregisterSignal(pawn, COMSIG_MOB_LOGIN) if(!continue_processing_when_client) set_ai_status(AI_STATUS_OFF) //Can't do anything while player is connected - RegisterSignal(pawn, COMSIG_MOB_LOGOUT, .proc/on_sentience_lost) + RegisterSignal(pawn, COMSIG_MOB_LOGOUT, PROC_REF(on_sentience_lost)) /datum/ai_controller/proc/on_sentience_lost() SIGNAL_HANDLER UnregisterSignal(pawn, COMSIG_MOB_LOGOUT) set_ai_status(AI_STATUS_ON) //Can't do anything while player is connected - RegisterSignal(pawn, COMSIG_MOB_LOGIN, .proc/on_sentience_gained) + RegisterSignal(pawn, COMSIG_MOB_LOGIN, PROC_REF(on_sentience_gained)) /// Use this proc to define how your controller defines what access the pawn has for the sake of pathfinding, likely pointing to whatever ID slot is relevant /datum/ai_controller/proc/get_access() diff --git a/code/datums/ai/basic_mobs/base_basic_controller.dm b/code/datums/ai/basic_mobs/base_basic_controller.dm index 31ce1f5c9aa..93e9e795d57 100644 --- a/code/datums/ai/basic_mobs/base_basic_controller.dm +++ b/code/datums/ai/basic_mobs/base_basic_controller.dm @@ -8,7 +8,7 @@ update_speed(basic_mob) - RegisterSignal(basic_mob, POST_BASIC_MOB_UPDATE_VARSPEED, .proc/update_speed) + RegisterSignal(basic_mob, POST_BASIC_MOB_UPDATE_VARSPEED, PROC_REF(update_speed)) return ..() //Run parent at end diff --git a/code/datums/ai/cursed/cursed_controller.dm b/code/datums/ai/cursed/cursed_controller.dm index 468273fa5c8..4d0f6c6f5fd 100644 --- a/code/datums/ai/cursed/cursed_controller.dm +++ b/code/datums/ai/cursed/cursed_controller.dm @@ -18,8 +18,8 @@ /datum/ai_controller/cursed/TryPossessPawn(atom/new_pawn) if(!isitem(new_pawn)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_MOVABLE_IMPACT, .proc/on_throw_hit) - RegisterSignal(new_pawn, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(new_pawn, COMSIG_MOVABLE_IMPACT, PROC_REF(on_throw_hit)) + RegisterSignal(new_pawn, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) return ..() //Run parent at end /datum/ai_controller/cursed/UnpossessPawn() @@ -32,12 +32,12 @@ if(!iscarbon(hit_atom)) return //equipcode has sleeps all over it. - INVOKE_ASYNC(src, .proc/try_equipping_to_target_slot, hit_atom) + INVOKE_ASYNC(src, PROC_REF(try_equipping_to_target_slot), hit_atom) ///signal called by picking up the pawn, will try to equip to where it should actually be and start the curse /datum/ai_controller/cursed/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/try_equipping_to_target_slot, equipper, slot) + INVOKE_ASYNC(src, PROC_REF(try_equipping_to_target_slot), equipper, slot) /** * curse of hunger component; for very hungry items. diff --git a/code/datums/ai/dog/dog_controller.dm b/code/datums/ai/dog/dog_controller.dm index 2b3ea434c3c..79d112f9a10 100644 --- a/code/datums/ai/dog/dog_controller.dm +++ b/code/datums/ai/dog/dog_controller.dm @@ -27,11 +27,11 @@ if(!isliving(new_pawn)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, .proc/on_examined) - RegisterSignal(new_pawn, COMSIG_CLICK_ALT, .proc/check_altclicked) - RegisterSignal(new_pawn, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING), .proc/on_death) - RegisterSignal(SSdcs, COMSIG_GLOB_CARBON_THROW_THING, .proc/listened_throw) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + RegisterSignal(new_pawn, COMSIG_CLICK_ALT, PROC_REF(check_altclicked)) + RegisterSignal(new_pawn, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING), PROC_REF(on_death)) + RegisterSignal(SSdcs, COMSIG_GLOB_CARBON_THROW_THING, PROC_REF(listened_throw)) return ..() //Run parent at end /datum/ai_controller/dog/UnpossessPawn(destroy) @@ -73,7 +73,7 @@ if(blackboard[BB_FETCH_IGNORE_LIST][WEAKREF(thrown_thing)]) return - RegisterSignal(thrown_thing, COMSIG_MOVABLE_THROW_LANDED, .proc/listen_throw_land) + RegisterSignal(thrown_thing, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(listen_throw_land)) /// A throw we were listening to has finished, see if it's in range for us to try grabbing it /datum/ai_controller/dog/proc/listen_throw_land(obj/item/thrown_thing, datum/thrownthing/throwing_datum) @@ -125,8 +125,8 @@ if(in_range(pawn, new_friend)) new_friend.visible_message("[pawn] licks at [new_friend] in a friendly manner!", span_notice("[pawn] licks at you in a friendly manner!")) friends[friend_ref] = TRUE - RegisterSignal(new_friend, COMSIG_MOB_POINTED, .proc/check_point) - RegisterSignal(new_friend, COMSIG_MOB_SAY, .proc/check_verbal_command) + RegisterSignal(new_friend, COMSIG_MOB_POINTED, PROC_REF(check_point)) + RegisterSignal(new_friend, COMSIG_MOB_SAY, PROC_REF(check_verbal_command)) /// Someone is being mean to us, take them off our friends (add actual enemies behavior later) /datum/ai_controller/dog/proc/unfriend(mob/living/ex_friend) @@ -169,7 +169,7 @@ if(!istype(clicker) || !blackboard[BB_DOG_FRIENDS][WEAKREF(clicker)]) return . = COMPONENT_CANCEL_CLICK_ALT - INVOKE_ASYNC(src, .proc/command_radial, clicker) + INVOKE_ASYNC(src, PROC_REF(command_radial), clicker) /// Show the command radial menu /datum/ai_controller/dog/proc/command_radial(mob/living/clicker) @@ -180,7 +180,7 @@ COMMAND_DIE = image(icon = 'icons/mob/simple/pets.dmi', icon_state = "puppy_dead") ) - var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, .proc/check_menu, clicker), tooltips = TRUE) + var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, PROC_REF(check_menu), clicker), tooltips = TRUE) if(!choice || !check_menu(clicker)) return set_command_mode(clicker, choice) diff --git a/code/datums/ai/generic/generic_behaviors.dm b/code/datums/ai/generic/generic_behaviors.dm index 547cd7e9280..33b3c4ea9eb 100644 --- a/code/datums/ai/generic/generic_behaviors.dm +++ b/code/datums/ai/generic/generic_behaviors.dm @@ -12,7 +12,7 @@ /datum/ai_behavior/battle_screech/perform(delta_time, datum/ai_controller/controller) . = ..() var/mob/living/living_pawn = controller.pawn - INVOKE_ASYNC(living_pawn, /mob.proc/emote, pick(screeches)) + INVOKE_ASYNC(living_pawn, TYPE_PROC_REF(/mob, emote), pick(screeches)) finish_action(controller, TRUE) ///Moves to target then finishes diff --git a/code/datums/ai/hauntium/haunted_controller.dm b/code/datums/ai/hauntium/haunted_controller.dm index 9613ae0ea95..8783fff5296 100644 --- a/code/datums/ai/hauntium/haunted_controller.dm +++ b/code/datums/ai/hauntium/haunted_controller.dm @@ -13,7 +13,7 @@ /datum/ai_controller/haunted/TryPossessPawn(atom/new_pawn) if(!isitem(new_pawn)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(new_pawn, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) return ..() //Run parent at end /datum/ai_controller/haunted/UnpossessPawn() @@ -36,12 +36,12 @@ else blackboard[BB_LIKES_EQUIPPER] = TRUE - RegisterSignal(pawn, COMSIG_ITEM_DROPPED, .proc/on_dropped) + RegisterSignal(pawn, COMSIG_ITEM_DROPPED, PROC_REF(on_dropped)) ///Flip it so we listen for equip again but not for drop. /datum/ai_controller/haunted/proc/on_dropped(datum/source, mob/user) SIGNAL_HANDLER - RegisterSignal(pawn, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(pawn, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) blackboard[BB_LIKES_EQUIPPER] = FALSE UnregisterSignal(pawn, COMSIG_ITEM_DROPPED) diff --git a/code/datums/ai/idle_behaviors/idle_monkey.dm b/code/datums/ai/idle_behaviors/idle_monkey.dm index f7ca52d1a03..0e087b7c111 100644 --- a/code/datums/ai/idle_behaviors/idle_monkey.dm +++ b/code/datums/ai/idle_behaviors/idle_monkey.dm @@ -19,9 +19,9 @@ var/move_dir = pick(GLOB.alldirs) living_pawn.Move(get_step(living_pawn, move_dir), move_dir) else if(DT_PROB(5, delta_time)) - INVOKE_ASYNC(living_pawn, /mob.proc/emote, pick(common_emotes)) + INVOKE_ASYNC(living_pawn, TYPE_PROC_REF(/mob, emote), pick(common_emotes)) else if(DT_PROB(1, delta_time)) - INVOKE_ASYNC(living_pawn, /mob.proc/emote, pick(rare_emotes)) + INVOKE_ASYNC(living_pawn, TYPE_PROC_REF(/mob, emote), pick(rare_emotes)) /datum/idle_behavior/idle_monkey/pun_pun common_emotes = list( diff --git a/code/datums/ai/making_your_ai.md b/code/datums/ai/making_your_ai.md index 5ffc53cc2bd..fd55de0b314 100644 --- a/code/datums/ai/making_your_ai.md +++ b/code/datums/ai/making_your_ai.md @@ -151,7 +151,7 @@ Example: ```dm /datum/ai_planning_subtree/item_ghost_resist/SetupSubtree(datum/ai_controller/controller) - RegisterSignal(controller.pawn, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(controller.pawn, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) controller.blackboard[BB_LIKES_EQUIPPER] = FALSE controller.blackboard[BB_ITEM_AGGRO_LIST] = list() diff --git a/code/datums/ai/monkey/monkey_behaviors.dm b/code/datums/ai/monkey/monkey_behaviors.dm index ae6d6a9af38..ec478c2e798 100644 --- a/code/datums/ai/monkey/monkey_behaviors.dm +++ b/code/datums/ai/monkey/monkey_behaviors.dm @@ -73,7 +73,7 @@ . = ..() if(controller.blackboard[BB_MONKEY_PICKPOCKETING]) //We are pickpocketing, don't do ANYTHING!!!! return - INVOKE_ASYNC(src, .proc/attempt_pickpocket, controller) + INVOKE_ASYNC(src, PROC_REF(attempt_pickpocket), controller) /datum/ai_behavior/monkey_equip/pickpocket/proc/attempt_pickpocket(datum/ai_controller/controller) var/obj/item/target = controller.blackboard[BB_MONKEY_PICKUPTARGET] @@ -279,7 +279,7 @@ return if(living_pawn.Adjacent(disposal)) - INVOKE_ASYNC(src, .proc/try_disposal_mob, controller, attack_target_key, disposal_target_key) //put him in! + INVOKE_ASYNC(src, PROC_REF(try_disposal_mob), controller, attack_target_key, disposal_target_key) //put him in! else //This means we might be getting pissed! return diff --git a/code/datums/ai/monkey/monkey_controller.dm b/code/datums/ai/monkey/monkey_controller.dm index b70d1fd3788..5ca8accd319 100644 --- a/code/datums/ai/monkey/monkey_controller.dm +++ b/code/datums/ai/monkey/monkey_controller.dm @@ -53,18 +53,18 @@ have ways of interacting with a specific mob and control it. return AI_CONTROLLER_INCOMPATIBLE var/mob/living/living_pawn = new_pawn - RegisterSignal(new_pawn, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_PAW, .proc/on_attack_paw) - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_ANIMAL, .proc/on_attack_animal) - RegisterSignal(new_pawn, COMSIG_MOB_ATTACK_ALIEN, .proc/on_attack_alien) - RegisterSignal(new_pawn, COMSIG_ATOM_BULLET_ACT, .proc/on_bullet_act) - RegisterSignal(new_pawn, COMSIG_ATOM_HITBY, .proc/on_hitby) - RegisterSignal(new_pawn, COMSIG_LIVING_START_PULL, .proc/on_startpulling) - RegisterSignal(new_pawn, COMSIG_LIVING_TRY_SYRINGE, .proc/on_try_syringe) - RegisterSignal(new_pawn, COMSIG_ATOM_HULK_ATTACK, .proc/on_attack_hulk) - RegisterSignal(new_pawn, COMSIG_CARBON_CUFF_ATTEMPTED, .proc/on_attempt_cuff) - RegisterSignal(new_pawn, COMSIG_MOB_MOVESPEED_UPDATED, .proc/update_movespeed) + RegisterSignal(new_pawn, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_PAW, PROC_REF(on_attack_paw)) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(on_attack_animal)) + RegisterSignal(new_pawn, COMSIG_MOB_ATTACK_ALIEN, PROC_REF(on_attack_alien)) + RegisterSignal(new_pawn, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act)) + RegisterSignal(new_pawn, COMSIG_ATOM_HITBY, PROC_REF(on_hitby)) + RegisterSignal(new_pawn, COMSIG_LIVING_START_PULL, PROC_REF(on_startpulling)) + RegisterSignal(new_pawn, COMSIG_LIVING_TRY_SYRINGE, PROC_REF(on_try_syringe)) + RegisterSignal(new_pawn, COMSIG_ATOM_HULK_ATTACK, PROC_REF(on_attack_hulk)) + RegisterSignal(new_pawn, COMSIG_CARBON_CUFF_ATTEMPTED, PROC_REF(on_attempt_cuff)) + RegisterSignal(new_pawn, COMSIG_MOB_MOVESPEED_UPDATED, PROC_REF(update_movespeed)) movement_delay = living_pawn.cached_multiplicative_slowdown return ..() //Run parent at end diff --git a/code/datums/ai/movement/ai_movement_basic_avoidance.dm b/code/datums/ai/movement/ai_movement_basic_avoidance.dm index 83ab1044bb3..8a610a5aabc 100644 --- a/code/datums/ai/movement/ai_movement_basic_avoidance.dm +++ b/code/datums/ai/movement/ai_movement_basic_avoidance.dm @@ -8,8 +8,8 @@ var/min_dist = controller.blackboard[BB_CURRENT_MIN_MOVE_DISTANCE] var/delay = controller.movement_delay var/datum/move_loop/loop = SSmove_manager.move_to(moving, current_movement_target, min_dist, delay, subsystem = SSai_movement, extra_info = controller) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) /datum/ai_movement/basic_avoidance/allowed_to_move(datum/move_loop/has_target/dist_bound/source) . = ..() diff --git a/code/datums/ai/movement/ai_movement_dumb.dm b/code/datums/ai/movement/ai_movement_dumb.dm index b29511e0d7f..a38024ff2cc 100644 --- a/code/datums/ai/movement/ai_movement_dumb.dm +++ b/code/datums/ai/movement/ai_movement_dumb.dm @@ -8,8 +8,8 @@ var/atom/movable/moving = controller.pawn var/delay = controller.movement_delay var/datum/move_loop/loop = SSmove_manager.move_towards_legacy(moving, current_movement_target, delay, subsystem = SSai_movement, extra_info = controller) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) /datum/ai_movement/dumb/allowed_to_move(datum/move_loop/has_target/source) . = ..() diff --git a/code/datums/ai/movement/ai_movement_jps.dm b/code/datums/ai/movement/ai_movement_jps.dm index 8db33ebb8d5..136714b9de4 100644 --- a/code/datums/ai/movement/ai_movement_jps.dm +++ b/code/datums/ai/movement/ai_movement_jps.dm @@ -19,9 +19,9 @@ subsystem = SSai_movement, extra_info = controller) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) - RegisterSignal(loop, COMSIG_MOVELOOP_JPS_REPATH, .proc/repath_incoming) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_JPS_REPATH, PROC_REF(repath_incoming)) /datum/ai_movement/jps/proc/repath_incoming(datum/move_loop/has_target/jps/source) SIGNAL_HANDLER diff --git a/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm b/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm index 9be56a05558..de0ab6d622b 100644 --- a/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm +++ b/code/datums/ai/objects/vending_machines/vending_machine_behaviors.dm @@ -19,7 +19,7 @@ controller.blackboard[BB_VENDING_BUSY_TILTING] = TRUE var/turf/target_turf = get_turf(controller.blackboard[BB_VENDING_CURRENT_TARGET]) new /obj/effect/temp_visual/telegraphing/vending_machine_tilt(target_turf) - addtimer(CALLBACK(src, .proc/tiltonmob, controller, target_turf), time_to_tilt) + addtimer(CALLBACK(src, PROC_REF(tiltonmob), controller, target_turf), time_to_tilt) /datum/ai_behavior/vendor_crush/proc/tiltonmob(datum/ai_controller/controller, turf/target_turf) var/obj/machinery/vending/vendor_pawn = controller.pawn diff --git a/code/datums/ai/oldhostile/hostile_tameable.dm b/code/datums/ai/oldhostile/hostile_tameable.dm index 97fa31cb0d7..e3a90870538 100644 --- a/code/datums/ai/oldhostile/hostile_tameable.dm +++ b/code/datums/ai/oldhostile/hostile_tameable.dm @@ -26,10 +26,10 @@ if(!ishostile(new_pawn)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, .proc/on_examined) - RegisterSignal(new_pawn, COMSIG_CLICK_ALT, .proc/check_altclicked) - RegisterSignal(new_pawn, COMSIG_RIDDEN_DRIVER_MOVE, .proc/on_ridden_driver_move) - RegisterSignal(new_pawn, COMSIG_MOVABLE_PREBUCKLE, .proc/on_prebuckle) + RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + RegisterSignal(new_pawn, COMSIG_CLICK_ALT, PROC_REF(check_altclicked)) + RegisterSignal(new_pawn, COMSIG_RIDDEN_DRIVER_MOVE, PROC_REF(on_ridden_driver_move)) + RegisterSignal(new_pawn, COMSIG_MOVABLE_PREBUCKLE, PROC_REF(on_prebuckle)) return ..() //Run parent at end /datum/ai_controller/hostile_friend/UnpossessPawn(destroy) @@ -81,8 +81,8 @@ if(in_range(pawn, new_friend)) new_friend.visible_message("[pawn] looks at [new_friend] in a friendly manner!", span_notice("[pawn] looks at you in a friendly manner!")) blackboard[BB_HOSTILE_FRIEND] = friend_ref - RegisterSignal(new_friend, COMSIG_MOB_POINTED, .proc/check_point) - RegisterSignal(new_friend, COMSIG_MOB_SAY, .proc/check_verbal_command) + RegisterSignal(new_friend, COMSIG_MOB_POINTED, PROC_REF(check_point)) + RegisterSignal(new_friend, COMSIG_MOB_SAY, PROC_REF(check_verbal_command)) /// Someone is being mean to us, take them off our friends (add actual enemies behavior later) /datum/ai_controller/hostile_friend/proc/unfriend() @@ -112,7 +112,7 @@ if(!istype(clicker) || blackboard[BB_HOSTILE_FRIEND] == WEAKREF(clicker)) return . = COMPONENT_CANCEL_CLICK_ALT - INVOKE_ASYNC(src, .proc/command_radial, clicker) + INVOKE_ASYNC(src, PROC_REF(command_radial), clicker) /// Show the command radial menu /datum/ai_controller/hostile_friend/proc/command_radial(mob/living/clicker) @@ -122,7 +122,7 @@ COMMAND_ATTACK = image(icon = 'icons/effects/effects.dmi', icon_state = "bite"), ) - var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, .proc/check_menu, clicker), tooltips = TRUE) + var/choice = show_radial_menu(clicker, pawn, commands, custom_check = CALLBACK(src, PROC_REF(check_menu), clicker), tooltips = TRUE) if(!choice || !check_menu(clicker)) return set_command_mode(clicker, choice) diff --git a/code/datums/ai/robot_customer/robot_customer_controller.dm b/code/datums/ai/robot_customer/robot_customer_controller.dm index 1b1739f8bd4..901c0f2f69c 100644 --- a/code/datums/ai/robot_customer/robot_customer_controller.dm +++ b/code/datums/ai/robot_customer/robot_customer_controller.dm @@ -20,9 +20,9 @@ /datum/ai_controller/robot_customer/TryPossessPawn(atom/new_pawn) if(!istype(new_pawn, /mob/living/simple_animal/robot_customer)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) - RegisterSignal(new_pawn, COMSIG_LIVING_GET_PULLED, .proc/on_get_pulled) - RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, .proc/on_get_punched) + RegisterSignal(new_pawn, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(new_pawn, COMSIG_LIVING_GET_PULLED, PROC_REF(on_get_pulled)) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_get_punched)) return ..() //Run parent at end /datum/ai_controller/robot_customer/UnpossessPawn(destroy) @@ -37,7 +37,7 @@ eat_order(I, attending_venue) return COMPONENT_NO_AFTERATTACK else - INVOKE_ASYNC(src, .proc/warn_greytider, user) + INVOKE_ASYNC(src, PROC_REF(warn_greytider), user) /datum/ai_controller/robot_customer/proc/eat_order(obj/item/order_item, datum/venue/attending_venue) @@ -55,7 +55,7 @@ SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/async_on_get_pulled, source, puller) + INVOKE_ASYNC(src, PROC_REF(async_on_get_pulled), source, puller) /datum/ai_controller/robot_customer/proc/async_on_get_pulled(datum/source, mob/living/puller) var/mob/living/simple_animal/robot_customer/customer = pawn @@ -104,4 +104,4 @@ return if(living_hitter.combat_mode) - INVOKE_ASYNC(src, .proc/warn_greytider, living_hitter) + INVOKE_ASYNC(src, PROC_REF(warn_greytider), living_hitter) diff --git a/code/datums/alarm.dm b/code/datums/alarm.dm index 16a590cff53..86e7593a28d 100644 --- a/code/datums/alarm.dm +++ b/code/datums/alarm.dm @@ -111,8 +111,8 @@ src.allowed_z_levels = allowed_z_levels src.allowed_areas = allowed_areas for(var/alarm_type in alarms_to_listen_for) - RegisterSignal(SSdcs, COMSIG_GLOB_ALARM_FIRE(alarm_type), .proc/add_alarm) - RegisterSignal(SSdcs, COMSIG_GLOB_ALARM_CLEAR(alarm_type), .proc/clear_alarm) + RegisterSignal(SSdcs, COMSIG_GLOB_ALARM_FIRE(alarm_type), PROC_REF(add_alarm)) + RegisterSignal(SSdcs, COMSIG_GLOB_ALARM_CLEAR(alarm_type), PROC_REF(clear_alarm)) return ..() @@ -146,7 +146,7 @@ var/list/cameras = source_area.cameras if(optional_camera) cameras = list(optional_camera) // This will cause harddels, so we need to clear manually - RegisterSignal(optional_camera, COMSIG_PARENT_QDELETING, .proc/clear_camera_ref, override = TRUE) //It's just fine to override, cause we clear all refs in the proc + RegisterSignal(optional_camera, COMSIG_PARENT_QDELETING, PROC_REF(clear_camera_ref), override = TRUE) //It's just fine to override, cause we clear all refs in the proc //This does mean that only the first alarm of that camera type in the area will send a ping, but jesus what else can ya do alarms_of_our_type[source_area.name] = list(source_area, cameras, list(handler)) diff --git a/code/datums/beam.dm b/code/datums/beam.dm index f85d2922967..c1bd16ac90f 100644 --- a/code/datums/beam.dm +++ b/code/datums/beam.dm @@ -66,8 +66,8 @@ visuals.vis_flags = VIS_INHERIT_PLANE visuals.update_appearance() Draw() - RegisterSignal(origin, COMSIG_MOVABLE_MOVED, .proc/redrawing) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/redrawing) + RegisterSignal(origin, COMSIG_MOVABLE_MOVED, PROC_REF(redrawing)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(redrawing)) /** * Triggered by signals set up when the beam is set up. If it's still sane to create a beam, it removes the old beam, creates a new one. Otherwise it kills the beam. @@ -81,7 +81,7 @@ SIGNAL_HANDLER if(origin && target && get_dist(origin,target)") owner.forceMove(veil) COOLDOWN_START(src, crisis_cooldown, 1 MINUTES) - 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 290cb5ac398..2012aa50fbf 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -222,7 +222,7 @@ var/message = hearing_args[HEARING_RAW_MESSAGE] if(findtext(message, codeword)) hearing_args[HEARING_RAW_MESSAGE] = replacetext(message, codeword, span_warning("[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 77b7b3ddf43..65da53e5a6a 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) @@ -236,7 +236,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 279ac647535..03d25f1d8f1 100644 --- a/code/datums/callback.dm +++ b/code/datums/callback.dm @@ -5,10 +5,10 @@ * ## USAGE * * ``` - * var/datum/callback/C = new(object|null, /proc/type/path|"procstring", arg1, arg2, ... argn) + * var/datum/callback/C = new(object|null, PROC_REF(procname), arg1, arg2, ... argn) * var/timerid = addtimer(C, time, timertype) * you can also use the compiler define shorthand - * var/timerid = addtimer(CALLBACK(object|null, /proc/type/path|procstring, arg1, arg2, ... argn), time, timertype) + * var/timerid = addtimer(CALLBACK(object|null, PROC_REF(procname), arg1, arg2, ... argn), time, timertype) * ``` * * Note: proc strings can only be given for datum proc calls, global procs must be proc paths @@ -26,27 +26,19 @@ * ## PROC TYPEPATH SHORTCUTS * (these operate on paths, not types, so to these shortcuts, datum is NOT a parent of atom, etc...) * - * ### global proc while in another global proc: - * .procname + * ### proc defined on current(src) object OR overridden at src or any of it's parents: + * PROC_REF(procname) * - * `CALLBACK(GLOBAL_PROC, .some_proc_here)` + * `CALLBACK(src, PROC_REF(some_proc_here))` * - * ### proc defined on current(src) object (when in a /proc/ and not an override) OR overridden at src or any of it's parents: - * .procname + * ### global proc + * GLOBAL_PROC_REF(procname) * - * `CALLBACK(src, .some_proc_here)` - * - * ### when the above doesn't apply: - *.proc/procname - * - * `CALLBACK(src, .proc/some_proc_here)` + * `CALLBACK(src, GLOBAL_PROC_REF(some_proc_here))` * * - * proc defined on a parent of a some type - * - * `/some/type/.proc/some_proc_here` - * - * Otherwise you must always provide the full typepath of the proc (/type/of/thing/proc/procname) + * ### proc defined on some type + * TYPE_PROC_REF(/some/type/, some_proc_here) */ /datum/callback diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 4a6c726c0f4..692bb17fdad 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -74,7 +74,7 @@ stack_trace("/datum/chatmessage created with [isnull(owner) ? "null" : "invalid"] mob owner") qdel(src) return - INVOKE_ASYNC(src, .proc/generate_image, text, target, owner, language, extra_classes, lifespan) + INVOKE_ASYNC(src, PROC_REF(generate_image), text, target, owner, language, extra_classes, lifespan) /datum/chatmessage/Destroy() if (owned_by) @@ -110,7 +110,7 @@ // Register client who owns this message owned_by = owner.client - RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, .proc/on_parent_qdel) + RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_qdel)) // Remove spans in the message from things like the recorder var/static/regex/span_check = new(@"<\/?span[^>]*>", "gi") @@ -176,7 +176,7 @@ if(!TICK_CHECK) return finish_image_generation(mheight, target, owner, complete_text, lifespan) - var/datum/callback/our_callback = CALLBACK(src, .proc/finish_image_generation, mheight, target, owner, complete_text, lifespan) + var/datum/callback/our_callback = CALLBACK(src, PROC_REF(finish_image_generation), mheight, target, owner, complete_text, lifespan) SSrunechat.message_queue += our_callback return @@ -202,7 +202,7 @@ var/remaining_time = max(0, (sched_remaining) * (CHAT_MESSAGE_EXP_DECAY ** idx++) * (CHAT_MESSAGE_HEIGHT_DECAY ** combined_height)) if (remaining_time) deltimer(m.fadertimer, SSrunechat) - m.fadertimer = addtimer(CALLBACK(m, .proc/end_of_life), remaining_time, TIMER_STOPPABLE|TIMER_DELETE_ME, SSrunechat) + m.fadertimer = addtimer(CALLBACK(m, PROC_REF(end_of_life)), remaining_time, TIMER_STOPPABLE|TIMER_DELETE_ME, SSrunechat) else m.end_of_life() @@ -226,11 +226,11 @@ LAZYADDASSOCLIST(owned_by.seen_messages, message_loc, src) owned_by.images |= message animate(message, alpha = 255, time = CHAT_MESSAGE_SPAWN_TIME) - RegisterSignal(message_loc, COMSIG_MOVABLE_Z_CHANGED, .proc/loc_z_changed) + RegisterSignal(message_loc, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(loc_z_changed)) // Register with the runechat SS to handle EOL and destruction var/duration = lifespan - CHAT_MESSAGE_EOL_FADE - fadertimer = addtimer(CALLBACK(src, .proc/end_of_life), duration, TIMER_STOPPABLE|TIMER_DELETE_ME, SSrunechat) + fadertimer = addtimer(CALLBACK(src, PROC_REF(end_of_life)), duration, TIMER_STOPPABLE|TIMER_DELETE_ME, SSrunechat) /** * Applies final animations to overlay CHAT_MESSAGE_EOL_FADE deciseconds prior to message deletion, @@ -242,7 +242,7 @@ /datum/chatmessage/proc/end_of_life(fadetime = CHAT_MESSAGE_EOL_FADE) isFading = TRUE animate(message, alpha = 0, time = fadetime, flags = ANIMATION_PARALLEL) - addtimer(CALLBACK(GLOBAL_PROC, /proc/qdel, src), fadetime, TIMER_DELETE_ME, SSrunechat) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(qdel), src), fadetime, TIMER_DELETE_ME, SSrunechat) /datum/chatmessage/proc/loc_z_changed(datum/source, turf/old_turf, turf/new_turf, same_z_layer) SIGNAL_HANDLER diff --git a/code/datums/cinematics/_cinematic.dm b/code/datums/cinematics/_cinematic.dm index f6f3bc43ef9..6659fde0c51 100644 --- a/code/datums/cinematics/_cinematic.dm +++ b/code/datums/cinematics/_cinematic.dm @@ -63,7 +63,7 @@ return // Register a signal to handle what happens when a different cinematic tries to play over us. - RegisterSignal(SSdcs, COMSIG_GLOB_PLAY_CINEMATIC, .proc/handle_replacement_cinematics) + RegisterSignal(SSdcs, COMSIG_GLOB_PLAY_CINEMATIC, PROC_REF(handle_replacement_cinematics)) // Pause OOC var/ooc_toggled = FALSE @@ -74,7 +74,7 @@ // Place the /atom/movable/screen/cinematic into everyone's screens, and prevent movement. for(var/mob/watching_mob in watchers) show_to(watching_mob, GET_CLIENT(watching_mob)) - RegisterSignal(watching_mob, COMSIG_MOB_CLIENT_LOGIN, .proc/show_to) + RegisterSignal(watching_mob, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(show_to)) // Close watcher ui's, too, so they can watch it. SStgui.close_user_uis(watching_mob) @@ -82,7 +82,7 @@ play_cinematic() // Cleans up after it's done playing. - addtimer(CALLBACK(src, .proc/clean_up_cinematic, ooc_toggled), cleanup_time) + addtimer(CALLBACK(src, PROC_REF(clean_up_cinematic), ooc_toggled), cleanup_time) /// Cleans up the cinematic after a set timer of it sticking on the end screen. /datum/cinematic/proc/clean_up_cinematic(was_ooc_toggled = FALSE) @@ -121,7 +121,7 @@ watching += watching_client watching_mob.overlay_fullscreen("cinematic", /atom/movable/screen/fullscreen/cinematic_backdrop) watching_client.screen += screen - RegisterSignal(watching_client, COMSIG_PARENT_QDELETING, .proc/remove_watcher) + RegisterSignal(watching_client, COMSIG_PARENT_QDELETING, PROC_REF(remove_watcher)) /// Simple helper for playing sounds from the cinematic. /datum/cinematic/proc/play_cinematic_sound(sound_to_play) diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index 3f3873b5ce1..bdf64fc11b8 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -170,6 +170,8 @@ * * This sets up a listening relationship such that when the target object emits a signal * the source datum this proc is called upon, will receive a callback to the given proctype + * Use PROC_REF(procname), TYPE_PROC_REF(type,procname) or GLOBAL_PROC_REF(procname) macros to validate the passed in proc at compile time. + * PROC_REF for procs defined on current type or it's ancestors, TYPE_PROC_REF for procs defined on unrelated type and GLOBAL_PROC_REF for global procs. * Return values from procs registered must be a bitfield * * Arguments: diff --git a/code/datums/components/acid.dm b/code/datums/components/acid.dm index 2a857a0aaa3..4a96313513a 100644 --- a/code/datums/components/acid.dm +++ b/code/datums/components/acid.dm @@ -36,19 +36,19 @@ return COMPONENT_INCOMPATIBLE max_volume = OBJ_ACID_VOLUME_MAX - process_effect = CALLBACK(src, .proc/process_obj, parent) + process_effect = CALLBACK(src, PROC_REF(process_obj), parent) else if(isliving(parent)) max_volume = MOB_ACID_VOLUME_MAX - process_effect = CALLBACK(src, .proc/process_mob, parent) + process_effect = CALLBACK(src, PROC_REF(process_mob), parent) else if(isturf(parent)) max_volume = TURF_ACID_VOLUME_MAX - process_effect = CALLBACK(src, .proc/process_turf, parent) + process_effect = CALLBACK(src, PROC_REF(process_turf), parent) acid_power = _acid_power set_volume(_acid_volume) var/atom/parent_atom = parent - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) parent_atom.update_appearance() sizzle = new(parent, TRUE) START_PROCESSING(SSacid, src) @@ -65,12 +65,12 @@ return ..() /datum/component/acid/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(parent, COMSIG_ATOM_EXPOSE_REAGENT, .proc/on_expose_reagent) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(parent, COMSIG_ATOM_EXPOSE_REAGENT, PROC_REF(on_expose_reagent)) if(isturf(parent)) - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/on_entered) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) /datum/component/acid/UnregisterFromParent() UnregisterSignal(parent, list( diff --git a/code/datums/components/admin_popup.dm b/code/datums/components/admin_popup.dm index c552c596c80..fd179fd930b 100644 --- a/code/datums/components/admin_popup.dm +++ b/code/datums/components/admin_popup.dm @@ -23,7 +23,7 @@ COMSIG_ADMIN_HELP_REPLIED, COMSIG_PARENT_QDELETING, ), - .proc/delete_self, + PROC_REF(delete_self), ) /datum/component/admin_popup/Destroy(force, silent) diff --git a/code/datums/components/anti_magic.dm b/code/datums/components/anti_magic.dm index a931df70d5d..3668b7f905a 100644 --- a/code/datums/components/anti_magic.dm +++ b/code/datums/components/anti_magic.dm @@ -40,11 +40,11 @@ ) 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/block_receiving_magic, override = TRUE) - RegisterSignal(parent, COMSIG_MOB_RESTRICT_MAGIC, .proc/restrict_casting_magic, override = TRUE) + RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, PROC_REF(block_receiving_magic), override = TRUE) + RegisterSignal(parent, COMSIG_MOB_RESTRICT_MAGIC, PROC_REF(restrict_casting_magic), override = TRUE) to_chat(parent, span_warning("Magic seems to flee from you. You are immune to spells but are unable to cast magic.")) else return COMPONENT_INCOMPATIBLE @@ -68,8 +68,8 @@ UnregisterSignal(equipper, COMSIG_MOB_RESTRICT_MAGIC) equipper.update_action_buttons() return - RegisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC, .proc/block_receiving_magic, override = TRUE) - RegisterSignal(equipper, COMSIG_MOB_RESTRICT_MAGIC, .proc/restrict_casting_magic, override = TRUE) + RegisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC, PROC_REF(block_receiving_magic), override = TRUE) + RegisterSignal(equipper, COMSIG_MOB_RESTRICT_MAGIC, PROC_REF(restrict_casting_magic), override = TRUE) equipper.update_action_buttons() if(!casting_restriction_alert) diff --git a/code/datums/components/aquarium.dm b/code/datums/components/aquarium.dm index 81dc6e7735a..b302532c14a 100644 --- a/code/datums/components/aquarium.dm +++ b/code/datums/components/aquarium.dm @@ -68,7 +68,7 @@ src.animation_getter = animation_getter src.animation_update_signals = animation_update_signals if(animation_update_signals) - RegisterSignal(parent, animation_update_signals, .proc/generate_animation) + RegisterSignal(parent, animation_update_signals, PROC_REF(generate_animation)) if(istype(parent,/obj/item/fish)) InitializeFromFish() @@ -78,7 +78,7 @@ InitializeOther() ADD_TRAIT(parent, TRAIT_FISH_CASE_COMPATIBILE, REF(src)) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/enter_aquarium) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(enter_aquarium)) //If component is added to something already in aquarium at the time initialize it properly. var/atom/movable/movable_parent = parent @@ -160,9 +160,9 @@ /datum/component/aquarium_content/proc/on_inserted(atom/aquarium) current_aquarium = aquarium - RegisterSignal(current_aquarium, COMSIG_ATOM_EXITED, .proc/on_removed) - RegisterSignal(current_aquarium, COMSIG_AQUARIUM_SURFACE_CHANGED, .proc/on_surface_changed) - RegisterSignal(current_aquarium, COMSIG_AQUARIUM_FLUID_CHANGED,.proc/on_fluid_changed) + RegisterSignal(current_aquarium, COMSIG_ATOM_EXITED, PROC_REF(on_removed)) + RegisterSignal(current_aquarium, COMSIG_AQUARIUM_SURFACE_CHANGED, PROC_REF(on_surface_changed)) + RegisterSignal(current_aquarium, COMSIG_AQUARIUM_FLUID_CHANGED, PROC_REF(on_fluid_changed)) if(processing) START_PROCESSING(SSobj, src) diff --git a/code/datums/components/area_sound_manager.dm b/code/datums/components/area_sound_manager.dm index 5ce3129ed67..ffbc63ebe97 100644 --- a/code/datums/components/area_sound_manager.dm +++ b/code/datums/components/area_sound_manager.dm @@ -16,10 +16,10 @@ accepted_zs = acceptable_zs change_the_track() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/react_to_move) - RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, .proc/react_to_z_move) - RegisterSignal(parent, change_on, .proc/handle_change) - RegisterSignal(parent, remove_on, .proc/handle_removal) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(react_to_move)) + RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(react_to_z_move)) + RegisterSignal(parent, change_on, PROC_REF(handle_change)) + RegisterSignal(parent, remove_on, PROC_REF(handle_removal)) /datum/component/area_sound_manager/Destroy(force, silent) QDEL_NULL(our_loop) @@ -66,7 +66,7 @@ //If we're still playing, wait a bit before changing the sound so we don't double up if(time_remaining) - timerid = addtimer(CALLBACK(src, .proc/start_looping_sound), time_remaining, TIMER_UNIQUE | TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_NO_HASH_WAIT | TIMER_DELETE_ME, SSsound_loops) + timerid = addtimer(CALLBACK(src, PROC_REF(start_looping_sound)), time_remaining, TIMER_UNIQUE | TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_NO_HASH_WAIT | TIMER_DELETE_ME, SSsound_loops) return timerid = null our_loop.start() diff --git a/code/datums/components/areabound.dm b/code/datums/components/areabound.dm index 90b2e3007ee..f952d5db2e1 100644 --- a/code/datums/components/areabound.dm +++ b/code/datums/components/areabound.dm @@ -10,7 +10,7 @@ return COMPONENT_INCOMPATIBLE bound_area = get_area(parent) reset_turf = get_turf(parent) - move_tracker = new(parent,CALLBACK(src,.proc/check_bounds)) + move_tracker = new(parent,CALLBACK(src, PROC_REF(check_bounds))) /datum/component/areabound/proc/check_bounds() var/atom/movable/AM = parent diff --git a/code/datums/components/armor_plate.dm b/code/datums/components/armor_plate.dm index 9feddd9ca2e..26d88ee5892 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_QDELETING, .proc/dropplates) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(applyplate)) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, 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/atmos_reaction_recorder.dm b/code/datums/components/atmos_reaction_recorder.dm index 02ec672655c..824ebc7a813 100644 --- a/code/datums/components/atmos_reaction_recorder.dm +++ b/code/datums/components/atmos_reaction_recorder.dm @@ -33,14 +33,14 @@ copied_reaction_results = list() registered_signals = list() - RegisterSignal(parent_air, COMSIG_GASMIX_REACTED, .proc/update_data) + RegisterSignal(parent_air, COMSIG_GASMIX_REACTED, PROC_REF(update_data)) registered_signals += list(COMSIG_GASMIX_REACTED = parent_air) for(var/signal in reset_criteria) // We currently dont implement the same signal registered twice even from different sources. This allows this component to be simpler. if(signal in registered_signals) return COMPONENT_INCOMPATIBLE - RegisterSignal(reset_criteria[signal], signal, .proc/reset_data) + RegisterSignal(reset_criteria[signal], signal, PROC_REF(reset_data)) registered_signals[signal] = reset_criteria[signal] /// Fetches reaction_results and updates the list. diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index 9481f9f8e5d..d33586f4625 100644 --- a/code/datums/components/bakeable.dm +++ b/code/datums/components/bakeable.dm @@ -35,9 +35,9 @@ src.positive_result = positive_result /datum/component/bakeable/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_OVEN_PLACED_IN, .proc/on_baking_start) - RegisterSignal(parent, COMSIG_ITEM_OVEN_PROCESS, .proc/on_bake) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_ITEM_OVEN_PLACED_IN, PROC_REF(on_baking_start)) + RegisterSignal(parent, COMSIG_ITEM_OVEN_PROCESS, PROC_REF(on_bake)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/bakeable/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_OVEN_PLACED_IN, COMSIG_ITEM_OVEN_PROCESS, COMSIG_PARENT_EXAMINE)) diff --git a/code/datums/components/beetlejuice.dm b/code/datums/components/beetlejuice.dm index c8b4b53c26b..1b7bc8b3afc 100644 --- a/code/datums/components/beetlejuice.dm +++ b/code/datums/components/beetlejuice.dm @@ -23,7 +23,7 @@ keyword = M.real_name update_regex() - RegisterSignal(SSdcs, COMSIG_GLOB_LIVING_SAY_SPECIAL, .proc/say_react) + RegisterSignal(SSdcs, COMSIG_GLOB_LIVING_SAY_SPECIAL, PROC_REF(say_react)) /datum/component/beetlejuice/proc/update_regex() R = regex("[REGEX_QUOTE(keyword)]","g[case_sensitive ? "" : "i"]") diff --git a/code/datums/components/blood_walk.dm b/code/datums/components/blood_walk.dm index 0e14da29e0d..3864157dc1d 100644 --- a/code/datums/components/blood_walk.dm +++ b/code/datums/components/blood_walk.dm @@ -41,7 +41,7 @@ blood_remaining = max_blood /datum/component/blood_walk/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/spread_blood) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(spread_blood)) /datum/component/blood_walk/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) diff --git a/code/datums/components/bloodysoles.dm b/code/datums/components/bloodysoles.dm index 5b5f988bcfd..e2f8a7d064f 100644 --- a/code/datums/components/bloodysoles.dm +++ b/code/datums/components/bloodysoles.dm @@ -26,9 +26,9 @@ return COMPONENT_INCOMPATIBLE parent_atom = parent - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) /** * Unregisters from the wielder if necessary @@ -76,7 +76,7 @@ if(bloody_shoes[index] <= BLOOD_FOOTPRINTS_MIN * 2)//need twice that amount to make footprints UnregisterSignal(wielder, COMSIG_MOVABLE_MOVED) else - RegisterSignal(wielder, COMSIG_MOVABLE_MOVED, .proc/on_moved, override = TRUE) + RegisterSignal(wielder, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved), override = TRUE) /** * Run to equally share the blood between us and a decal @@ -129,8 +129,8 @@ equipped_slot = slot wielder = equipper if(bloody_shoes[last_blood_state] > BLOOD_FOOTPRINTS_MIN * 2) - RegisterSignal(wielder, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(wielder, COMSIG_STEP_ON_BLOOD, .proc/on_step_blood) + RegisterSignal(wielder, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(wielder, COMSIG_STEP_ON_BLOOD, PROC_REF(on_step_blood)) /** * Called when the parent item has been dropped @@ -253,12 +253,14 @@ return COMPONENT_INCOMPATIBLE parent_atom = parent wielder = parent + if(!bloody_feet) bloody_feet = mutable_appearance('icons/effects/blood.dmi', "shoeblood", SHOES_LAYER) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean) - RegisterSignal(parent, COMSIG_STEP_ON_BLOOD, .proc/on_step_blood) - RegisterSignal(parent, COMSIG_CARBON_UNEQUIP_SHOECOVER, .proc/unequip_shoecover) - RegisterSignal(parent, COMSIG_CARBON_EQUIP_SHOECOVER, .proc/equip_shoecover) + + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) + RegisterSignal(parent, COMSIG_STEP_ON_BLOOD, PROC_REF(on_step_blood)) + RegisterSignal(parent, COMSIG_CARBON_UNEQUIP_SHOECOVER, PROC_REF(unequip_shoecover)) + RegisterSignal(parent, COMSIG_CARBON_EQUIP_SHOECOVER, PROC_REF(equip_shoecover)) /datum/component/bloodysoles/feet/update_icon() if(ishuman(wielder)) @@ -303,7 +305,6 @@ ..() - /datum/component/bloodysoles/feet/proc/unequip_shoecover(datum/source) SIGNAL_HANDLER diff --git a/code/datums/components/boomerang.dm b/code/datums/components/boomerang.dm index 844baf475fc..2fb98d49be3 100644 --- a/code/datums/components/boomerang.dm +++ b/code/datums/components/boomerang.dm @@ -24,9 +24,9 @@ src.thrower_easy_catch_enabled = thrower_easy_catch_enabled /datum/component/boomerang/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/prepare_throw) //Collect data on current thrower and the throwing datum - RegisterSignal(parent, COMSIG_MOVABLE_THROW_LANDED, .proc/return_missed_throw) - RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/return_hit_throw) + RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(prepare_throw)) //Collect data on current thrower and the throwing datum + RegisterSignal(parent, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(return_missed_throw)) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(return_hit_throw)) /datum/component/boomerang/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOVABLE_POST_THROW, COMSIG_MOVABLE_THROW_LANDED, COMSIG_MOVABLE_IMPACT)) @@ -78,7 +78,7 @@ /datum/component/boomerang/proc/aerodynamic_swing(datum/thrownthing/throwing_datum, obj/item/true_parent) var/mob/thrown_by = true_parent.thrownby?.resolve() if(thrown_by) - addtimer(CALLBACK(true_parent, /atom/movable.proc/throw_at, thrown_by, boomerang_throw_range, throwing_datum.speed, null, TRUE), 1) + addtimer(CALLBACK(true_parent, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, boomerang_throw_range, throwing_datum.speed, null, TRUE), 1) COOLDOWN_START(src, last_boomerang_throw, BOOMERANG_REBOUND_INTERVAL) true_parent.visible_message(span_danger("[true_parent] is flying back at [throwing_datum.thrower]!"), \ span_danger("You see [true_parent] fly back at you!"), \ diff --git a/code/datums/components/bumpattack.dm b/code/datums/components/bumpattack.dm index 0f7955fb30c..ec8cd272a44 100644 --- a/code/datums/components/bumpattack.dm +++ b/code/datums/components/bumpattack.dm @@ -27,8 +27,8 @@ return ..() /datum/component/bumpattack/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/check_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/check_drop) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(check_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(check_drop)) /datum/component/bumpattack/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) @@ -51,7 +51,7 @@ return active = TRUE wearer = user - RegisterSignal(user, COMSIG_LIVING_MOB_BUMP, .proc/check_bump) + RegisterSignal(user, COMSIG_LIVING_MOB_BUMP, PROC_REF(check_bump)) /datum/component/bumpattack/proc/deactivate() active = FALSE @@ -66,7 +66,7 @@ CRASH("[our_weapon] somehow failed istype") if(!TIMER_COOLDOWN_CHECK(src, COOLDOWN_BUMP_ATTACK)) TIMER_COOLDOWN_START(src, COOLDOWN_BUMP_ATTACK, attack_cooldown) - INVOKE_ASYNC(target, /atom.proc/attackby , our_weapon, bumper) + INVOKE_ASYNC(target, TYPE_PROC_REF(/atom, attackby), our_weapon, bumper) bumper.visible_message(span_danger("[bumper] charges into [target], attacking with [our_weapon]!"), span_danger("You charge into [target], attacking with [our_weapon]!"), vision_distance = COMBAT_MESSAGE_RANGE) #undef COOLDOWN_BUMP_ATTACK diff --git a/code/datums/components/butchering.dm b/code/datums/components/butchering.dm index 3b464d8ab34..1047fe3b32f 100644 --- a/code/datums/components/butchering.dm +++ b/code/datums/components/butchering.dm @@ -32,7 +32,7 @@ src.can_be_blunt = can_be_blunt src.butcher_callback = butcher_callback if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/onItemAttack) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(onItemAttack)) /datum/component/butchering/proc/onItemAttack(obj/item/source, mob/living/M, mob/living/user) SIGNAL_HANDLER @@ -41,7 +41,7 @@ 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_CANCEL_ATTACK_CHAIN if(ishuman(M) && source.force && source.get_sharpness()) @@ -51,7 +51,7 @@ user.show_message(span_warning("[H]'s neck has already been already cut, you can't make the bleeding any worse!"), MSG_VISUAL, \ span_warning("Their neck has already been already cut, you can't make the bleeding any worse!")) return COMPONENT_CANCEL_ATTACK_CHAIN - INVOKE_ASYNC(src, .proc/startNeckSlice, source, H, user) + INVOKE_ASYNC(src, PROC_REF(startNeckSlice), source, H, user) return COMPONENT_CANCEL_ATTACK_CHAIN /datum/component/butchering/proc/startButcher(obj/item/source, mob/living/M, mob/living/user) @@ -169,7 +169,7 @@ return var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) @@ -189,9 +189,9 @@ /datum/component/butchering/mecha/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_MECHA_EQUIPMENT_ATTACHED, .proc/enable_butchering) - RegisterSignal(parent, COMSIG_MECHA_EQUIPMENT_DETACHED, .proc/disable_butchering) - RegisterSignal(parent, COMSIG_MECHA_DRILL_MOB, .proc/on_drill) + RegisterSignal(parent, COMSIG_MECHA_EQUIPMENT_ATTACHED, PROC_REF(enable_butchering)) + RegisterSignal(parent, COMSIG_MECHA_EQUIPMENT_DETACHED, PROC_REF(disable_butchering)) + RegisterSignal(parent, COMSIG_MECHA_DRILL_MOB, PROC_REF(on_drill)) /datum/component/butchering/mecha/UnregisterFromParent() . = ..() @@ -204,14 +204,14 @@ ///When we are ready to drill through a mob /datum/component/butchering/mecha/proc/on_drill(datum/source, obj/vehicle/sealed/mecha/chassis, mob/living/meat) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/on_butchering, chassis, meat) + INVOKE_ASYNC(src, PROC_REF(on_butchering), chassis, meat) /datum/component/butchering/wearable /datum/component/butchering/wearable/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/worn_enable_butchering) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/worn_disable_butchering) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(worn_enable_butchering)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(worn_disable_butchering)) /datum/component/butchering/wearable/UnregisterFromParent() . = ..() @@ -227,7 +227,7 @@ if(!(slot & source.slot_flags)) return butchering_enabled = TRUE - RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/butcher_target) + RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(butcher_target)) ///Same as disable_butchering but for worn items /datum/component/butchering/wearable/proc/worn_disable_butchering(obj/item/source, mob/user) diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 57cab668741..a9b3ebf7812 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -21,7 +21,7 @@ ///given to connect_loc to listen for something moving over target var/static/list/crossed_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) ///So we can update ant damage @@ -41,7 +41,7 @@ if(ismovable(parent)) AddComponent(/datum/component/connect_loc_behalf, parent, crossed_connections) else - RegisterSignal(get_turf(parent), COMSIG_ATOM_ENTERED, .proc/on_entered) + RegisterSignal(get_turf(parent), COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) // Inherit the new values passed to the component /datum/component/caltrop/InheritComponent(datum/component/caltrop/new_comp, original, min_damage, max_damage, probability, flags, soundfile) diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index ffd02dbbaa0..2a87d1072b3 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -35,7 +35,7 @@ GLOBAL_LIST_INIT(chasm_storage, list()) )) /datum/component/chasm/Initialize(turf/target) - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/Entered) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(Entered)) target_turf = target START_PROCESSING(SSobj, src) // process on create, in case stuff is still there src.parent.AddElement(/datum/element/lazy_fishing_spot, FISHING_SPOT_PRESET_CHASM) @@ -88,7 +88,7 @@ GLOBAL_LIST_INIT(chasm_storage, list()) for (var/thing in to_check) if (droppable(thing)) . = TRUE - INVOKE_ASYNC(src, .proc/drop, thing) + INVOKE_ASYNC(src, PROC_REF(drop), thing) /datum/component/chasm/proc/droppable(atom/movable/dropped_thing) var/datum/weakref/falling_ref = WEAKREF(dropped_thing) @@ -165,7 +165,7 @@ GLOBAL_LIST_INIT(chasm_storage, list()) if (!storage) storage = new(get_turf(parent)) - RegisterSignal(storage, COMSIG_ATOM_EXITED, .proc/left_chasm) + RegisterSignal(storage, COMSIG_ATOM_EXITED, PROC_REF(left_chasm)) GLOB.chasm_storage += WEAKREF(storage) if (storage.contains(dropped_thing)) @@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(chasm_storage, list()) if (dropped_thing.forceMove(storage)) if (isliving(dropped_thing)) - RegisterSignal(dropped_thing, COMSIG_LIVING_REVIVE, .proc/on_revive) + RegisterSignal(dropped_thing, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) else parent.visible_message(span_boldwarning("[parent] spits out [dropped_thing]!")) dropped_thing.throw_at(get_edge_target_turf(parent, pick(GLOB.alldirs)), rand(1, 10), rand(1, 10)) diff --git a/code/datums/components/cleaner.dm b/code/datums/components/cleaner.dm index 766ac47063b..69b36588da9 100644 --- a/code/datums/components/cleaner.dm +++ b/code/datums/components/cleaner.dm @@ -38,9 +38,9 @@ /datum/component/cleaner/RegisterWithParent() if(isbot(parent)) - RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, .proc/on_unarmed_attack) + RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_unarmed_attack)) return - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/on_afterattack) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack)) /datum/component/cleaner/UnregisterFromParent() if(isbot(parent)) @@ -74,7 +74,7 @@ clean_target = pre_clean_callback?.Invoke(source, target, user) if(clean_target == DO_NOT_CLEAN) return - INVOKE_ASYNC(src, .proc/clean, source, target, user, clean_target) //signal handlers can't have do_afters inside of them + INVOKE_ASYNC(src, PROC_REF(clean), source, target, user, clean_target) //signal handlers can't have do_afters inside of them /** * Cleans something using this cleaner. @@ -92,7 +92,7 @@ ADD_TRAIT(target, CURRENTLY_CLEANING, src) // We need to update our planes on overlay changes - RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, .proc/cleaning_target_moved) + RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(cleaning_target_moved)) var/mutable_appearance/low_bubble = mutable_appearance('icons/effects/effects.dmi', "bubbles", FLOOR_CLEAN_LAYER, target, GAME_PLANE) var/mutable_appearance/high_bubble = mutable_appearance('icons/effects/effects.dmi', "bubbles", FLOOR_CLEAN_LAYER, target, ABOVE_GAME_PLANE) if(target.plane > low_bubble.plane) //check if the higher overlay is necessary diff --git a/code/datums/components/clickbox.dm b/code/datums/components/clickbox.dm index 72aa4ebdcc5..88815cf2550 100644 --- a/code/datums/components/clickbox.dm +++ b/code/datums/components/clickbox.dm @@ -33,15 +33,15 @@ src.max_scale = max_scale src.min_scale = min_scale - RegisterSignal(parent, COMSIG_ATOM_VV_MODIFY_TRANSFORM, .proc/on_modify_or_update_transform) + RegisterSignal(parent, COMSIG_ATOM_VV_MODIFY_TRANSFORM, PROC_REF(on_modify_or_update_transform)) var/clickbox_icon_state = icon_state if(dead_state && isliving(parent)) var/mob/living/living_parent = parent src.dead_state = dead_state - RegisterSignal(living_parent, COMSIG_LIVING_POST_UPDATE_TRANSFORM, .proc/on_modify_or_update_transform) - RegisterSignal(living_parent, COMSIG_LIVING_DEATH, .proc/on_death) - RegisterSignal(living_parent, COMSIG_LIVING_REVIVE, .proc/on_revive) + RegisterSignal(living_parent, COMSIG_LIVING_POST_UPDATE_TRANSFORM, PROC_REF(on_modify_or_update_transform)) + RegisterSignal(living_parent, COMSIG_LIVING_DEATH, PROC_REF(on_death)) + RegisterSignal(living_parent, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) if(living_parent.stat == DEAD) clickbox_icon_state = dead_state update_underlay(clickbox_icon_state) diff --git a/code/datums/components/clothing_fov_visor.dm b/code/datums/components/clothing_fov_visor.dm index 06195285d0a..a3d9a333cb9 100644 --- a/code/datums/components/clothing_fov_visor.dm +++ b/code/datums/components/clothing_fov_visor.dm @@ -18,9 +18,9 @@ src.visor_up = clothing_parent.up //Initial values could vary, so we need to get it. /datum/component/clothing_fov_visor/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) - RegisterSignal(parent, COMSIG_CLOTHING_VISOR_TOGGLE, .proc/on_visor_toggle) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(parent, COMSIG_CLOTHING_VISOR_TOGGLE, PROC_REF(on_visor_toggle)) /datum/component/clothing_fov_visor/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_CLOTHING_VISOR_TOGGLE)) @@ -53,7 +53,7 @@ UnregisterSignal(wearer, COMSIG_PARENT_QDELETING) wearer.remove_fov_trait(src, fov_angle) wearer = equipper - RegisterSignal(wearer, COMSIG_PARENT_QDELETING, .proc/on_wearer_deleted) + RegisterSignal(wearer, COMSIG_PARENT_QDELETING, PROC_REF(on_wearer_deleted)) if(visor_up) return equipper.add_fov_trait(src, fov_angle) diff --git a/code/datums/components/codeword_hearing.dm b/code/datums/components/codeword_hearing.dm index a4bb24f4d3f..a0d0ea967ca 100644 --- a/code/datums/components/codeword_hearing.dm +++ b/code/datums/components/codeword_hearing.dm @@ -28,7 +28,7 @@ return ..() /datum/component/codeword_hearing/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_HEAR, .proc/handle_hearing) + RegisterSignal(parent, COMSIG_MOVABLE_HEAR, PROC_REF(handle_hearing)) /datum/component/codeword_hearing/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOVABLE_HEAR) diff --git a/code/datums/components/combustible_flooder.dm b/code/datums/components/combustible_flooder.dm index 39ddaebb6d2..cef6dfdd760 100644 --- a/code/datums/components/combustible_flooder.dm +++ b/code/datums/components/combustible_flooder.dm @@ -11,12 +11,12 @@ src.gas_amount = initialize_gas_amount src.temp_amount = initialize_temp_amount - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby_react) - RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, .proc/flame_react) - RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, .proc/projectile_react) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), .proc/welder_react) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_react)) + RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, PROC_REF(flame_react)) + RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, PROC_REF(projectile_react)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), PROC_REF(welder_react)) if(isturf(parent)) - RegisterSignal(parent, COMSIG_TURF_EXPOSE, .proc/hotspots_react) + RegisterSignal(parent, COMSIG_TURF_EXPOSE, PROC_REF(hotspots_react)) /datum/component/combustible_flooder/UnregisterFromParent() UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) diff --git a/code/datums/components/connect_containers.dm b/code/datums/components/connect_containers.dm index c386a096410..f8018168a13 100644 --- a/code/datums/components/connect_containers.dm +++ b/code/datums/components/connect_containers.dm @@ -37,8 +37,8 @@ tracked = new_tracked if(!tracked) return - RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(tracked, COMSIG_PARENT_QDELETING, .proc/handle_tracked_qdel) + RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel)) update_signals(tracked) /datum/component/connect_containers/proc/handle_tracked_qdel() @@ -50,7 +50,7 @@ return for(var/atom/movable/container as anything in get_nested_locs(listener)) - RegisterSignal(container, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(container, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) for(var/signal in connections) parent.RegisterSignal(container, signal, connections[signal]) diff --git a/code/datums/components/connect_loc_behalf.dm b/code/datums/components/connect_loc_behalf.dm index b758b6ad5f3..297227e2aed 100644 --- a/code/datums/components/connect_loc_behalf.dm +++ b/code/datums/components/connect_loc_behalf.dm @@ -20,8 +20,8 @@ src.tracked = tracked /datum/component/connect_loc_behalf/RegisterWithParent() - RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(tracked, COMSIG_PARENT_QDELETING, .proc/handle_tracked_qdel) + RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel)) update_signals() /datum/component/connect_loc_behalf/UnregisterFromParent() diff --git a/code/datums/components/connect_mob_behalf.dm b/code/datums/components/connect_mob_behalf.dm index 8991dd67f81..1c1a8a65234 100644 --- a/code/datums/components/connect_mob_behalf.dm +++ b/code/datums/components/connect_mob_behalf.dm @@ -19,7 +19,7 @@ src.tracked = tracked /datum/component/connect_mob_behalf/RegisterWithParent() - RegisterSignal(tracked, COMSIG_PARENT_QDELETING, .proc/handle_tracked_qdel) + RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel)) update_signals() /datum/component/connect_mob_behalf/UnregisterFromParent() @@ -41,7 +41,7 @@ if(QDELETED(tracked?.mob)) return tracked_mob = tracked.mob - RegisterSignal(tracked_mob, COMSIG_MOB_LOGOUT, .proc/on_logout) + RegisterSignal(tracked_mob, COMSIG_MOB_LOGOUT, PROC_REF(on_logout)) for (var/signal in connections) parent.RegisterSignal(tracked_mob, signal, connections[signal]) diff --git a/code/datums/components/connect_range.dm b/code/datums/components/connect_range.dm index b40643c5749..c87d203a2d6 100644 --- a/code/datums/components/connect_range.dm +++ b/code/datums/components/connect_range.dm @@ -58,8 +58,8 @@ if(!tracked) return //Register signals on the new tracked atom and its surroundings. - RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(tracked, COMSIG_PARENT_QDELETING, .proc/handle_tracked_qdel) + RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel)) update_signals(tracked) /datum/component/connect_range/proc/handle_tracked_qdel() @@ -79,7 +79,7 @@ return //Keep track of possible movement of all movables the target is in. for(var/atom/movable/container as anything in get_nested_locs(target)) - RegisterSignal(container, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(container, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) if(on_same_turf && !forced) return diff --git a/code/datums/components/construction.dm b/code/datums/components/construction.dm index 04fbd2d8652..df1f90c21b2 100644 --- a/code/datums/components/construction.dm +++ b/code/datums/components/construction.dm @@ -15,8 +15,8 @@ if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/action) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(action)) update_parent(index) /datum/component/construction/proc/examine(datum/source, mob/user, list/examine_list) @@ -34,7 +34,7 @@ /datum/component/construction/proc/action(datum/source, obj/item/I, mob/living/user) SIGNAL_HANDLER - return INVOKE_ASYNC(src, .proc/check_step, I, user) + return INVOKE_ASYNC(src, PROC_REF(check_step), I, user) /datum/component/construction/proc/update_index(diff) index += diff diff --git a/code/datums/components/container_item/container_item.dm b/code/datums/components/container_item/container_item.dm index f1eb742a4f8..af76b3116d4 100644 --- a/code/datums/components/container_item/container_item.dm +++ b/code/datums/components/container_item/container_item.dm @@ -3,7 +3,7 @@ /datum/component/container_item/Initialize() . = ..() - RegisterSignal(parent, COMSIG_CONTAINER_TRY_ATTACH, .proc/try_attach) + RegisterSignal(parent, COMSIG_CONTAINER_TRY_ATTACH, PROC_REF(try_attach)) /// Called when parent is added to the container. /datum/component/container_item/proc/try_attach(datum/source, atom/container, mob/user) diff --git a/code/datums/components/conveyor_movement.dm b/code/datums/components/conveyor_movement.dm index 689863c537e..99baf5be941 100644 --- a/code/datums/components/conveyor_movement.dm +++ b/code/datums/components/conveyor_movement.dm @@ -16,8 +16,8 @@ start_delay = speed var/atom/movable/moving_parent = parent var/datum/move_loop/loop = SSmove_manager.move(moving_parent, direction, delay = start_delay, subsystem = SSconveyors, flags=MOVEMENT_LOOP_IGNORE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/should_move) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/loop_ended) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(should_move)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_ended)) /datum/component/convey/proc/should_move(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/datums/components/cracked.dm b/code/datums/components/cracked.dm index f534d3fc13e..901f847cd06 100644 --- a/code/datums/components/cracked.dm +++ b/code/datums/components/cracked.dm @@ -18,7 +18,7 @@ /datum/component/cracked/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ATOM_INTEGRITY_CHANGED, .proc/IntegrityChanged) + RegisterSignal(parent, COMSIG_ATOM_INTEGRITY_CHANGED, PROC_REF(IntegrityChanged)) var/obj/master = parent var/integrity = master.get_integrity() IntegrityChanged(parent, integrity, integrity) diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index 8e71e306e67..a18e5cfd1a1 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_CLIENT_LOGIN, .proc/create_mob_button) + RegisterSignal(parent, COMSIG_MOB_CLIENT_LOGIN, PROC_REF(create_mob_button)) /datum/component/personal_crafting/proc/create_mob_button(mob/user, client/CL) SIGNAL_HANDLER @@ -10,7 +10,7 @@ C.icon = H.ui_style H.static_inventory += C CL.screen += C - RegisterSignal(C, COMSIG_CLICK, .proc/component_ui_interact) + RegisterSignal(C, COMSIG_CLICK, PROC_REF(component_ui_interact)) /datum/component/personal_crafting var/busy @@ -365,7 +365,7 @@ SIGNAL_HANDLER if(user == parent) - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) /datum/component/personal_crafting/ui_state(mob/user) return GLOB.not_incapacitated_turf_state diff --git a/code/datums/components/crate_carrier.dm b/code/datums/components/crate_carrier.dm index 6f570fca80a..c097ebb93c8 100644 --- a/code/datums/components/crate_carrier.dm +++ b/code/datums/components/crate_carrier.dm @@ -28,9 +28,9 @@ return ..() /datum/component/crate_carrier/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, .proc/on_unarm_attack) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_unarm_attack)) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /datum/component/crate_carrier/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_LIVING_DEATH, COMSIG_PARENT_EXAMINE)) diff --git a/code/datums/components/creamed.dm b/code/datums/components/creamed.dm index a00086a322a..cba28030189 100644 --- a/code/datums/components/creamed.dm +++ b/code/datums/components/creamed.dm @@ -53,7 +53,8 @@ GLOBAL_LIST_INIT(creamable, typecacheof(list( RegisterSignal(parent, list( COMSIG_COMPONENT_CLEAN_ACT, COMSIG_COMPONENT_CLEAN_FACE_ACT), - .proc/clean_up) + PROC_REF(clean_up) + ) /datum/component/creamed/UnregisterFromParent() UnregisterSignal(parent, list( diff --git a/code/datums/components/cult_ritual_item.dm b/code/datums/components/cult_ritual_item.dm index 0ebf6193c0b..b5defe4306d 100644 --- a/code/datums/components/cult_ritual_item.dm +++ b/code/datums/components/cult_ritual_item.dm @@ -45,13 +45,13 @@ return ..() /datum/component/cult_ritual_item/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/try_scribe_rune) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/try_purge_holywater) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, .proc/try_hit_object) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT, .proc/try_clear_rune) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(try_scribe_rune)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_purge_holywater)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(try_hit_object)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT, PROC_REF(try_clear_rune)) if(examine_message) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/cult_ritual_item/UnregisterFromParent() UnregisterSignal(parent, list( @@ -92,7 +92,7 @@ to_chat(user, span_warning("You are already drawing a rune.")) return - INVOKE_ASYNC(src, .proc/start_scribe_rune, source, user) + INVOKE_ASYNC(src, PROC_REF(start_scribe_rune), source, user) return COMPONENT_CANCEL_ATTACK_CHAIN @@ -112,7 +112,7 @@ if(!target.has_reagent(/datum/reagent/water/holywater)) return - INVOKE_ASYNC(src, .proc/do_purge_holywater, target, user) + INVOKE_ASYNC(src, PROC_REF(do_purge_holywater), target, user) /* * Signal proc for [COMSIG_ITEM_ATTACK_OBJ]. @@ -125,11 +125,11 @@ return if(istype(target, /obj/structure/girder/cult)) - INVOKE_ASYNC(src, .proc/do_destroy_girder, target, cultist) + INVOKE_ASYNC(src, PROC_REF(do_destroy_girder), target, cultist) return COMPONENT_NO_AFTERATTACK if(istype(target, /obj/structure/destructible/cult)) - INVOKE_ASYNC(src, .proc/do_unanchor_structure, target, cultist) + INVOKE_ASYNC(src, PROC_REF(do_unanchor_structure), target, cultist) return COMPONENT_NO_AFTERATTACK /* @@ -143,7 +143,7 @@ return if(istype(target, /obj/effect/rune)) - INVOKE_ASYNC(src, .proc/do_scrape_rune, target, cultist) + INVOKE_ASYNC(src, PROC_REF(do_scrape_rune), target, cultist) return COMPONENT_NO_AFTERATTACK @@ -225,7 +225,7 @@ qdel(rune) /* - * Wraps the entire act of [proc/do_scribe_rune] to ensure it properly enables or disables [var/drawing_a_rune]. + * Wraps the entire act of [/proc/do_scribe_rune] to ensure it properly enables or disables [var/drawing_a_rune].) * * tool - the parent, source of the signal - the item inscribing the rune, casted to item. * cultist - the mob scribing the rune diff --git a/code/datums/components/curse_of_hunger.dm b/code/datums/components/curse_of_hunger.dm index 29ead016db9..1d54f629772 100644 --- a/code/datums/components/curse_of_hunger.dm +++ b/code/datums/components/curse_of_hunger.dm @@ -31,13 +31,13 @@ /datum/component/curse_of_hunger/RegisterWithParent() . = ..() var/obj/item/cursed_item = parent - RegisterSignal(cursed_item, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(cursed_item, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) //checking slot_equipment_priority is the better way to decide if it should be an equip-curse (alternative being if it has slot_flags) //because it needs to know where to equip to (and stuff like buckets and cones can be on_pickup curses despite having slots to equip to) if(cursed_item.slot_equipment_priority) - RegisterSignal(cursed_item, COMSIG_ITEM_EQUIPPED, .proc/on_equip) + RegisterSignal(cursed_item, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) else - RegisterSignal(cursed_item, COMSIG_ITEM_PICKUP, .proc/on_pickup) + RegisterSignal(cursed_item, COMSIG_ITEM_PICKUP, PROC_REF(on_pickup)) /datum/component/curse_of_hunger/UnregisterFromParent() . = ..() @@ -87,9 +87,9 @@ cursed_item.item_flags |= DROPDEL return if(cursed_item.slot_equipment_priority) - RegisterSignal(cursed_item, COMSIG_ITEM_POST_UNEQUIP, .proc/on_unequip) + RegisterSignal(cursed_item, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(on_unequip)) else - RegisterSignal(cursed_item, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(cursed_item, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) /datum/component/curse_of_hunger/proc/the_curse_ends(mob/uncursed) var/obj/item/at_least_item = parent @@ -106,7 +106,7 @@ uncursed.dropItemToGround(at_least_item, force = TRUE) if(!QDELETED(at_least_item)) //gives a head start for the person to get away from the cursed item before it begins hunting again! - addtimer(CALLBACK(src, .proc/seek_new_target), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(seek_new_target)), 10 SECONDS) ///proc called after a timer to awaken the AI in the cursed item if it doesn't have a target already. /datum/component/curse_of_hunger/proc/seek_new_target() diff --git a/code/datums/components/customizable_reagent_holder.dm b/code/datums/components/customizable_reagent_holder.dm index 55f6dfa71fd..ea682da608b 100644 --- a/code/datums/components/customizable_reagent_holder.dm +++ b/code/datums/components/customizable_reagent_holder.dm @@ -56,9 +56,9 @@ /datum/component/customizable_reagent_holder/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/customizable_attack) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_ATOM_PROCESSED, .proc/on_processed) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(customizable_attack)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_PROCESSED, PROC_REF(on_processed)) ADD_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, REF(src)) diff --git a/code/datums/components/deadchat_control.dm b/code/datums/components/deadchat_control.dm index c0757c81746..6f1633d8591 100644 --- a/code/datums/components/deadchat_control.dm +++ b/code/datums/components/deadchat_control.dm @@ -16,7 +16,7 @@ /// The id for the DEMOCRACY_MODE looping vote timer. var/timerid - /// Assoc list of key-chat command string, value-callback pairs. list("right" = CALLBACK(GLOBAL_PROC, .proc/_step, src, EAST)) + /// Assoc list of key-chat command string, value-callback pairs. list("right" = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), src, EAST)) var/list/datum/callback/inputs = list() /// Assoc list of ckey:value pairings. In DEMOCRACY_MODE, value is the player's vote. In ANARCHY_MODE, value is world.time when their cooldown expires. var/list/ckey_to_cooldown = list() @@ -33,10 +33,10 @@ /datum/component/deadchat_control/Initialize(_deadchat_mode, _inputs, _input_cooldown = 12 SECONDS, _on_removal) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, .proc/orbit_begin) - RegisterSignal(parent, COMSIG_ATOM_ORBIT_STOP, .proc/orbit_stop) - RegisterSignal(parent, COMSIG_VV_TOPIC, .proc/handle_vv_topic) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_ATOM_ORBIT_BEGIN, PROC_REF(orbit_begin)) + RegisterSignal(parent, COMSIG_ATOM_ORBIT_STOP, PROC_REF(orbit_stop)) + RegisterSignal(parent, COMSIG_VV_TOPIC, PROC_REF(handle_vv_topic)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) deadchat_mode = _deadchat_mode inputs = _inputs input_cooldown = _input_cooldown @@ -44,7 +44,7 @@ if(deadchat_mode & DEMOCRACY_MODE) if(deadchat_mode & ANARCHY_MODE) // Choose one, please. stack_trace("deadchat_control component added to [parent.type] with both democracy and anarchy modes enabled.") - timerid = addtimer(CALLBACK(src, .proc/democracy_loop), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP) + timerid = addtimer(CALLBACK(src, PROC_REF(democracy_loop)), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP) notify_ghosts("[parent] is now deadchat controllable!", source = parent, action = NOTIFY_ORBIT, header="Something Interesting!") /datum/component/deadchat_control/Destroy(force, silent) @@ -70,7 +70,7 @@ to_chat(source, span_warning("Your deadchat control inputs are still on cooldown for another [CEILING(cooldown * 0.1, 1)] second\s.")) return MOB_DEADSAY_SIGNAL_INTERCEPT ckey_to_cooldown[source.ckey] = world.time + input_cooldown - addtimer(CALLBACK(src, .proc/end_cooldown, source.ckey), input_cooldown) + addtimer(CALLBACK(src, PROC_REF(end_cooldown), source.ckey), input_cooldown) inputs[message].Invoke() to_chat(source, span_notice("\"[message]\" input accepted. You are now on cooldown for [input_cooldown * 0.1] second\s.")) return MOB_DEADSAY_SIGNAL_INTERCEPT @@ -125,15 +125,15 @@ return ckey_to_cooldown = list() if(var_value == DEMOCRACY_MODE) - timerid = addtimer(CALLBACK(src, .proc/democracy_loop), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP) + timerid = addtimer(CALLBACK(src, PROC_REF(democracy_loop)), input_cooldown, TIMER_STOPPABLE | TIMER_LOOP) else deltimer(timerid) /datum/component/deadchat_control/proc/orbit_begin(atom/source, atom/orbiter) SIGNAL_HANDLER - RegisterSignal(orbiter, COMSIG_MOB_DEADSAY, .proc/deadchat_react) - RegisterSignal(orbiter, COMSIG_MOB_AUTOMUTE_CHECK, .proc/waive_automute) + RegisterSignal(orbiter, COMSIG_MOB_DEADSAY, PROC_REF(deadchat_react)) + RegisterSignal(orbiter, COMSIG_MOB_AUTOMUTE_CHECK, PROC_REF(waive_automute)) orbiters |= orbiter @@ -169,7 +169,7 @@ if(!href_list[VV_HK_DEADCHAT_PLAYS] || !check_rights(R_FUN)) return . = COMPONENT_VV_HANDLED - INVOKE_ASYNC(src, .proc/async_handle_vv_topic, user, href_list) + INVOKE_ASYNC(src, PROC_REF(async_handle_vv_topic), user, href_list) /// Async proc handling the alert input and associated logic for an admin removing this component via the VV dropdown. /datum/component/deadchat_control/proc/async_handle_vv_topic(mob/user, list/href_list) @@ -227,10 +227,10 @@ . = ..() - inputs["up"] = CALLBACK(GLOBAL_PROC, .proc/_step, parent, NORTH) - inputs["down"] = CALLBACK(GLOBAL_PROC, .proc/_step, parent, SOUTH) - inputs["left"] = CALLBACK(GLOBAL_PROC, .proc/_step, parent, WEST) - inputs["right"] = CALLBACK(GLOBAL_PROC, .proc/_step, parent, EAST) + inputs["up"] = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), parent, NORTH) + inputs["down"] = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), parent, SOUTH) + inputs["left"] = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), parent, WEST) + inputs["right"] = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), parent, EAST) /** * Deadchat Moves Things @@ -244,7 +244,7 @@ . = ..() - inputs["up"] = CALLBACK(parent, /obj/effect/immovablerod.proc/walk_in_direction, NORTH) - inputs["down"] = CALLBACK(parent, /obj/effect/immovablerod.proc/walk_in_direction, SOUTH) - inputs["left"] = CALLBACK(parent, /obj/effect/immovablerod.proc/walk_in_direction, WEST) - inputs["right"] = CALLBACK(parent, /obj/effect/immovablerod.proc/walk_in_direction, EAST) + inputs["up"] = CALLBACK(parent, TYPE_PROC_REF(/obj/effect/immovablerod, walk_in_direction), NORTH) + inputs["down"] = CALLBACK(parent, TYPE_PROC_REF(/obj/effect/immovablerod, walk_in_direction), SOUTH) + inputs["left"] = CALLBACK(parent, TYPE_PROC_REF(/obj/effect/immovablerod, walk_in_direction), WEST) + inputs["right"] = CALLBACK(parent, TYPE_PROC_REF(/obj/effect/immovablerod, walk_in_direction), EAST) diff --git a/code/datums/components/dejavu.dm b/code/datums/components/dejavu.dm index 7517f86f929..2f317d388bd 100644 --- a/code/datums/components/dejavu.dm +++ b/code/datums/components/dejavu.dm @@ -48,22 +48,22 @@ tox_loss = L.getToxLoss() oxy_loss = L.getOxyLoss() brain_loss = L.getOrganLoss(ORGAN_SLOT_BRAIN) - rewind_type = .proc/rewind_living + rewind_type = PROC_REF(rewind_living) if(iscarbon(parent)) var/mob/living/carbon/C = parent saved_bodyparts = C.save_bodyparts() - rewind_type = .proc/rewind_carbon + rewind_type = PROC_REF(rewind_carbon) else if(isanimal(parent)) var/mob/living/simple_animal/M = parent brute_loss = M.bruteloss - rewind_type = .proc/rewind_animal + rewind_type = PROC_REF(rewind_animal) else if(isobj(parent)) var/obj/O = parent integrity = O.get_integrity() - rewind_type = .proc/rewind_obj + rewind_type = PROC_REF(rewind_obj) addtimer(CALLBACK(src, rewind_type), rewind_interval) diff --git a/code/datums/components/deployable.dm b/code/datums/components/deployable.dm index f652c25de74..5308c847cd5 100644 --- a/code/datums/components/deployable.dm +++ b/code/datums/components/deployable.dm @@ -27,8 +27,8 @@ src.thing_to_be_deployed = thing_to_be_deployed src.delete_on_use = delete_on_use - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_hand) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_hand)) var/obj/item/typecast = thing_to_be_deployed deployed_name = initial(typecast.name) @@ -40,7 +40,7 @@ /datum/component/deployable/proc/on_attack_hand(datum/source, mob/user, location, direction) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/deploy, source, user, location, direction) + INVOKE_ASYNC(src, PROC_REF(deploy), source, user, location, direction) /datum/component/deployable/proc/deploy(obj/source, mob/user, location, direction) //If there's no user, location and direction are used var/obj/deployed_object //Used for spawning the deployed object diff --git a/code/datums/components/drift.dm b/code/datums/components/drift.dm index 5964d299252..58bcff8acdf 100644 --- a/code/datums/components/drift.dm +++ b/code/datums/components/drift.dm @@ -28,12 +28,12 @@ if(!drifting_loop) //Really want to qdel here but can't return COMPONENT_INCOMPATIBLE - RegisterSignal(drifting_loop, COMSIG_MOVELOOP_START, .proc/drifting_start) - RegisterSignal(drifting_loop, COMSIG_MOVELOOP_STOP, .proc/drifting_stop) - RegisterSignal(drifting_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/before_move) - RegisterSignal(drifting_loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/after_move) - RegisterSignal(drifting_loop, COMSIG_PARENT_QDELETING, .proc/loop_death) - RegisterSignal(movable_parent, COMSIG_MOVABLE_NEWTONIAN_MOVE, .proc/newtonian_impulse) + RegisterSignal(drifting_loop, COMSIG_MOVELOOP_START, PROC_REF(drifting_start)) + RegisterSignal(drifting_loop, COMSIG_MOVELOOP_STOP, PROC_REF(drifting_stop)) + RegisterSignal(drifting_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(before_move)) + RegisterSignal(drifting_loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(after_move)) + RegisterSignal(drifting_loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_death)) + RegisterSignal(movable_parent, COMSIG_MOVABLE_NEWTONIAN_MOVE, PROC_REF(newtonian_impulse)) if(drifting_loop.running) drifting_start(drifting_loop) // There's a good chance it'll autostart, gotta catch that @@ -87,12 +87,12 @@ SIGNAL_HANDLER var/atom/movable/movable_parent = parent inertia_last_loc = movable_parent.loc - RegisterSignal(movable_parent, COMSIG_MOVABLE_MOVED, .proc/handle_move) + RegisterSignal(movable_parent, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) // We will use glide size to intuit how long to delay our loop's next move for // This way you can't ride two movements at once while drifting, since that'd be dumb as fuck - RegisterSignal(movable_parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, .proc/handle_glidesize_update) + RegisterSignal(movable_parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(handle_glidesize_update)) // If you stop pulling something mid drift, I want it to retain that momentum - RegisterSignal(movable_parent, COMSIG_ATOM_NO_LONGER_PULLING, .proc/stopped_pulling) + RegisterSignal(movable_parent, COMSIG_ATOM_NO_LONGER_PULLING, PROC_REF(stopped_pulling)) /datum/component/drift/proc/drifting_stop() SIGNAL_HANDLER @@ -183,7 +183,7 @@ block_inputs_until = world.time + glide_for QDEL_IN(src, glide_for + 1) qdel(drifting_loop) - RegisterSignal(parent, COMSIG_MOB_CLIENT_PRE_MOVE, .proc/allow_final_movement) + RegisterSignal(parent, COMSIG_MOB_CLIENT_PRE_MOVE, PROC_REF(allow_final_movement)) /datum/component/drift/proc/allow_final_movement(datum/source) // Some things want to allow movement out of spacedrift, we should let them diff --git a/code/datums/components/earprotection.dm b/code/datums/components/earprotection.dm index 9256c4310a7..6439e49b831 100644 --- a/code/datums/components/earprotection.dm +++ b/code/datums/components/earprotection.dm @@ -1,7 +1,7 @@ /datum/component/wearertargeting/earprotection signals = list(COMSIG_CARBON_SOUNDBANG) mobtype = /mob/living/carbon - proctype = .proc/reducebang + proctype = PROC_REF(reducebang) /datum/component/wearertargeting/earprotection/Initialize(_valid_slots) . = ..() diff --git a/code/datums/components/edit_complainer.dm b/code/datums/components/edit_complainer.dm index da801bc9e0b..aaac9aed2d4 100644 --- a/code/datums/components/edit_complainer.dm +++ b/code/datums/components/edit_complainer.dm @@ -16,7 +16,7 @@ ) say_lines = text || default_lines - RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, .proc/var_edit_react) + RegisterSignal(SSdcs, COMSIG_GLOB_VAR_EDIT, PROC_REF(var_edit_react)) /datum/component/edit_complainer/proc/var_edit_react(datum/source, list/arguments) SIGNAL_HANDLER diff --git a/code/datums/components/effect_remover.dm b/code/datums/components/effect_remover.dm index 35d512aca0c..dd5544297fb 100644 --- a/code/datums/components/effect_remover.dm +++ b/code/datums/components/effect_remover.dm @@ -42,12 +42,12 @@ return ..() /datum/component/effect_remover/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT, .proc/try_remove_effect) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT, PROC_REF(try_remove_effect)) if(tip_text) var/obj/item/item_parent = parent item_parent.item_flags |= ITEM_HAS_CONTEXTUAL_SCREENTIPS - RegisterSignal(parent, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET, .proc/add_item_context) + RegisterSignal(parent, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET, PROC_REF(add_item_context)) /datum/component/effect_remover/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_EFFECT, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET)) @@ -62,7 +62,7 @@ return if(effects_we_clear[target.type]) // Make sure we get all subtypes and everything - INVOKE_ASYNC(src, .proc/do_remove_effect, target, user) + INVOKE_ASYNC(src, PROC_REF(do_remove_effect), target, user) return COMPONENT_NO_AFTERATTACK /* diff --git a/code/datums/components/egg_layer.dm b/code/datums/components/egg_layer.dm index 26231256ac6..f47fa17c20f 100644 --- a/code/datums/components/egg_layer.dm +++ b/code/datums/components/egg_layer.dm @@ -41,7 +41,7 @@ /datum/component/egg_layer/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/feed_food) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(feed_food)) /datum/component/egg_layer/UnregisterFromParent() . = ..() diff --git a/code/datums/components/electrified_buckle.dm b/code/datums/components/electrified_buckle.dm index b2c3ccb55fb..d40df49c82b 100644 --- a/code/datums/components/electrified_buckle.dm +++ b/code/datums/components/electrified_buckle.dm @@ -58,25 +58,25 @@ if(usage_flags & SHOCK_REQUIREMENT_ITEM) required_object = input_item required_object.Move(parent_as_movable) - RegisterSignal(required_object, COMSIG_PARENT_QDELETING, .proc/delete_self) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), .proc/move_required_object_from_contents) + RegisterSignal(required_object, COMSIG_PARENT_QDELETING, PROC_REF(delete_self)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), PROC_REF(move_required_object_from_contents)) if(usage_flags & SHOCK_REQUIREMENT_ON_SIGNAL_RECEIVED) shock_on_loop = FALSE - RegisterSignal(required_object, COMSIG_ASSEMBLY_PULSED, .proc/shock_on_demand) + RegisterSignal(required_object, COMSIG_ASSEMBLY_PULSED, PROC_REF(shock_on_demand)) else if(usage_flags & SHOCK_REQUIREMENT_SIGNAL_RECEIVED_TOGGLE) - RegisterSignal(required_object, COMSIG_ASSEMBLY_PULSED, .proc/toggle_shock_loop) + RegisterSignal(required_object, COMSIG_ASSEMBLY_PULSED, PROC_REF(toggle_shock_loop)) if((usage_flags & SHOCK_REQUIREMENT_PARENT_MOB_ISALIVE) && ismob(parent)) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/delete_self) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(delete_self)) - RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/on_buckle) + RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(on_buckle)) ADD_TRAIT(parent_as_movable, TRAIT_ELECTRIFIED_BUCKLE, INNATE_TRAIT) //if parent wants us to manually shock on some specified action if(signal_to_register_from_parent) - RegisterSignal(parent, signal_to_register_from_parent, .proc/shock_on_demand) + RegisterSignal(parent, signal_to_register_from_parent, PROC_REF(shock_on_demand)) requested_signal_parent_emits = signal_to_register_from_parent if(overlays_to_add) diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm index 9c86fb938ff..c838cd230fb 100644 --- a/code/datums/components/embedded.dm +++ b/code/datums/components/embedded.dm @@ -86,7 +86,7 @@ limb._embed_object(weapon) // on the inside... on the inside... weapon.forceMove(victim) - RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), .proc/weaponDeleted) + RegisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), PROC_REF(weaponDeleted)) victim.visible_message(span_danger("[weapon] [harmful ? "embeds" : "sticks"] itself [harmful ? "in" : "to"] [victim]'s [limb.plaintext_zone]!"), span_userdanger("[weapon] [harmful ? "embeds" : "sticks"] itself [harmful ? "in" : "to"] your [limb.plaintext_zone]!")) var/damage = weapon.throwforce @@ -113,10 +113,10 @@ return ..() /datum/component/embedded/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/jostleCheck) - RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, .proc/ripOut) - RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, .proc/safeRemove) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/checkTweeze) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(jostleCheck)) + RegisterSignal(parent, COMSIG_CARBON_EMBED_RIP, PROC_REF(ripOut)) + RegisterSignal(parent, COMSIG_CARBON_EMBED_REMOVAL, PROC_REF(safeRemove)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(checkTweeze)) /datum/component/embedded/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL, COMSIG_PARENT_ATTACKBY)) @@ -191,7 +191,7 @@ return var/mob/living/carbon/victim = parent var/time_taken = rip_time * weapon.w_class - INVOKE_ASYNC(src, .proc/complete_rip_out, victim, I, limb, time_taken) + INVOKE_ASYNC(src, PROC_REF(complete_rip_out), victim, I, limb, time_taken) /// everything async that ripOut used to do /datum/component/embedded/proc/complete_rip_out(mob/living/carbon/victim, obj/item/I, obj/item/bodypart/limb, time_taken) @@ -221,7 +221,7 @@ if(!weapon.unembedded()) // if it hasn't deleted itself due to drop del UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) if(to_hands) - INVOKE_ASYNC(to_hands, /mob.proc/put_in_hands, weapon) + INVOKE_ASYNC(to_hands, TYPE_PROC_REF(/mob, put_in_hands), weapon) else weapon.forceMove(get_turf(victim)) @@ -254,7 +254,7 @@ if(!victim_human.try_inject(user, limb.body_zone, INJECT_CHECK_IGNORE_SPECIES | INJECT_TRY_SHOW_ERROR_MESSAGE)) return TRUE - INVOKE_ASYNC(src, .proc/tweezePluck, possible_tweezers, user) + INVOKE_ASYNC(src, PROC_REF(tweezePluck), possible_tweezers, user) return COMPONENT_NO_AFTERATTACK /// The actual action for pulling out an embedded object with a hemostat diff --git a/code/datums/components/engraved.dm b/code/datums/components/engraved.dm index 9526e5bcad4..e0fc108d686 100644 --- a/code/datums/components/engraved.dm +++ b/code/datums/components/engraved.dm @@ -47,7 +47,7 @@ engraved_wall.AddElement(/datum/element/beauty, beauty_value / ENGRAVING_PERSISTENCE_BEAUTY_LOSS_FACTOR) //Old age does them harm icon_state_append = rand(1, 2) //must be here to allow overlays to be updated - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) engraved_wall.update_appearance() /datum/component/engraved/Destroy(force, silent) @@ -62,7 +62,7 @@ return ..() //call this after since we null out the parent /datum/component/engraved/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) //supporting component transfer means putting these here instead of initialize SSpersistence.wall_engravings += src ADD_TRAIT(parent, TRAIT_NOT_ENGRAVABLE, TRAIT_GENERIC) diff --git a/code/datums/components/evolutionary_leap.dm b/code/datums/components/evolutionary_leap.dm index 90d6ed23a61..3d5cdfeccc7 100644 --- a/code/datums/components/evolutionary_leap.dm +++ b/code/datums/components/evolutionary_leap.dm @@ -20,7 +20,7 @@ //don't setup timer yet, timer calc requires the round to have started if(!SSticker.HasRoundStarted()) - RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, .proc/comp_on_round_start) + RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, PROC_REF(comp_on_round_start)) return //if the round has already taken long enough, just leap right away. @@ -47,7 +47,7 @@ //in cases where this is calculating roundstart, world.time - SSticker.round_start_time should equal 0 var/sum = (world.time - SSticker.round_start_time) var/mark = evolve_mark - sum - timer_id = addtimer(CALLBACK(src, .proc/leap, FALSE), mark, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(leap), FALSE), mark, TIMER_STOPPABLE) /datum/component/evolutionary_leap/proc/leap(silent) var/mob/living/old_mob = parent diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index 020c41bac73..c200968a184 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -23,22 +23,22 @@ if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/explodable_attack) - RegisterSignal(parent, COMSIG_ATOM_EX_ACT, .proc/detonate) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), .proc/welder_react) - RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, .proc/projectile_react) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(explodable_attack)) + RegisterSignal(parent, COMSIG_ATOM_EX_ACT, PROC_REF(detonate)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), PROC_REF(welder_react)) + RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, PROC_REF(projectile_react)) if(ismovable(parent)) - RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/explodable_impact) - RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/explodable_bump) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(explodable_impact)) + RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(explodable_bump)) if(isitem(parent)) - RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), .proc/explodable_attack) + RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), PROC_REF(explodable_attack)) if(isclothing(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)) var/atom/atom_parent = parent if(atom_parent.atom_storage) - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/explodable_insert_item) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(explodable_insert_item)) if (devastation_range) src.devastation_range = devastation_range @@ -105,7 +105,7 @@ /datum/component/explodable/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER - RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMAGE, .proc/explodable_attack_zone, TRUE) + RegisterSignal(equipper, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(explodable_attack_zone), TRUE) /datum/component/explodable/proc/on_drop(datum/source, mob/user) SIGNAL_HANDLER @@ -162,7 +162,7 @@ if(EXPLODABLE_DELETE_PARENT) qdel(bomb) else - addtimer(CALLBACK(src, .proc/reset_exploding), 0.1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_exploding)), 0.1 SECONDS) /** * Resets the expoding flag diff --git a/code/datums/components/faction_granter.dm b/code/datums/components/faction_granter.dm index cbc9542e517..4ab7c098c4e 100644 --- a/code/datums/components/faction_granter.dm +++ b/code/datums/components/faction_granter.dm @@ -26,8 +26,8 @@ src.grant_message = grant_message /datum/component/faction_granter/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_self_attack) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_self_attack)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/faction_granter/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_PARENT_EXAMINE)) diff --git a/code/datums/components/fishing_spot.dm b/code/datums/components/fishing_spot.dm index 78b9d64cbd2..585c98c5917 100644 --- a/code/datums/components/fishing_spot.dm +++ b/code/datums/components/fishing_spot.dm @@ -17,8 +17,8 @@ stack_trace("Invalid fishing spot configuration \"[configuration]\" passed down to fishing spot component.") return COMPONENT_INCOMPATIBLE fish_source = preset_configuration - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/handle_attackby) - RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, .proc/handle_cast) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_attackby)) + RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, PROC_REF(handle_cast)) /datum/component/fishing_spot/proc/handle_cast(datum/source, obj/item/fishing_rod/rod, mob/user) @@ -54,7 +54,7 @@ var/datum/fishing_challenge/challenge = new(parent, result, rod, user) challenge.background = fish_source.background challenge.difficulty = fish_source.calculate_difficulty(result, rod, user) - RegisterSignal(challenge, COMSIG_FISHING_CHALLENGE_COMPLETED, .proc/fishing_completed) + RegisterSignal(challenge, COMSIG_FISHING_CHALLENGE_COMPLETED, PROC_REF(fishing_completed)) challenge.start(user) /datum/component/fishing_spot/proc/fishing_completed(datum/fishing_challenge/source, mob/user, success, perfect) diff --git a/code/datums/components/food/decomposition.dm b/code/datums/components/food/decomposition.dm index 43830f7daac..043cfac8664 100644 --- a/code/datums/components/food/decomposition.dm +++ b/code/datums/components/food/decomposition.dm @@ -33,16 +33,16 @@ handled = FALSE src.produce_ants = ant_attracting - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/handle_movement) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(handle_movement)) RegisterSignal(parent, list( COMSIG_ITEM_PICKUP, //person picks up an item COMSIG_ATOM_ENTERED), //Object enters a storage object (boxes, etc.) - .proc/picked_up) + PROC_REF(picked_up)) RegisterSignal(parent, list( COMSIG_ITEM_DROPPED, //Object is dropped anywhere COMSIG_ATOM_EXITED), //Object exits a storage object (boxes, etc) - .proc/dropped) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) + PROC_REF(dropped)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) if(custom_time) // We have a custom decomposition time, set it to that original_time = custom_time @@ -83,7 +83,7 @@ return // If all other checks fail, then begin decomposition. - timerid = addtimer(CALLBACK(src, .proc/decompose), time_remaining, TIMER_STOPPABLE | TIMER_UNIQUE) + timerid = addtimer(CALLBACK(src, PROC_REF(decompose)), time_remaining, TIMER_STOPPABLE | TIMER_UNIQUE) /datum/component/decomposition/Destroy() remove_timer() diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index 5698bcd3448..578ba8fbe20 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -73,30 +73,30 @@ Behavior that's still missing from this component that original food items had t setup_initial_reagents(initial_reagents) /datum/component/edible/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, .proc/UseByAnimal) - RegisterSignal(parent, COMSIG_ATOM_CHECKPARTS, .proc/OnCraft) - RegisterSignal(parent, COMSIG_ATOM_CREATEDBY_PROCESSING, .proc/OnProcessed) - RegisterSignal(parent, COMSIG_FOOD_INGREDIENT_ADDED, .proc/edible_ingredient_added) - RegisterSignal(parent, COMSIG_OOZE_EAT_ATOM, .proc/on_ooze_eat) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(UseByAnimal)) + RegisterSignal(parent, COMSIG_ATOM_CHECKPARTS, PROC_REF(OnCraft)) + RegisterSignal(parent, COMSIG_ATOM_CREATEDBY_PROCESSING, PROC_REF(OnProcessed)) + RegisterSignal(parent, COMSIG_FOOD_INGREDIENT_ADDED, PROC_REF(edible_ingredient_added)) + RegisterSignal(parent, COMSIG_OOZE_EAT_ATOM, PROC_REF(on_ooze_eat)) if(isturf(parent)) - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/on_entered) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) else - var/static/list/loc_connections = list(COMSIG_ATOM_ENTERED = .proc/on_entered) + var/static/list/loc_connections = list(COMSIG_ATOM_ENTERED = PROC_REF(on_entered)) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/UseFromHand) - RegisterSignal(parent, COMSIG_ITEM_FRIED, .proc/OnFried) - RegisterSignal(parent, COMSIG_ITEM_USED_AS_INGREDIENT, .proc/used_to_customize) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(UseFromHand)) + RegisterSignal(parent, COMSIG_ITEM_FRIED, PROC_REF(OnFried)) + RegisterSignal(parent, COMSIG_ITEM_USED_AS_INGREDIENT, PROC_REF(used_to_customize)) var/obj/item/item = parent if(!item.grind_results) item.grind_results = list() //If this doesn't already exist, add it as an empty list. This is needed for the grinder to accept it. else if(isturf(parent) || isstructure(parent)) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/TryToEatIt) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(TryToEatIt)) /datum/component/edible/UnregisterFromParent() UnregisterSignal(parent, list( @@ -412,7 +412,7 @@ Behavior that's still missing from this component that original food items had t //If we're not force-feeding and there's an eat delay, try take another bite if(eater == feeder && eat_time) - INVOKE_ASYNC(src, .proc/TryToEat, eater, feeder) + INVOKE_ASYNC(src, PROC_REF(TryToEat), eater, feeder) #undef EAT_TIME_FORCE_FEED #undef EAT_TIME_VORACIOUS_MULT diff --git a/code/datums/components/food/ice_cream_holder.dm b/code/datums/components/food/ice_cream_holder.dm index 7dc096b3e44..432d370dd90 100644 --- a/code/datums/components/food/ice_cream_holder.dm +++ b/code/datums/components/food/ice_cream_holder.dm @@ -54,18 +54,18 @@ src.y_offset = y_offset src.sweetener = sweetener - RegisterSignal(owner, COMSIG_ITEM_ATTACK_OBJ, .proc/on_item_attack_obj) - RegisterSignal(owner, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) + RegisterSignal(owner, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(on_item_attack_obj)) + RegisterSignal(owner, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) if(change_name) - RegisterSignal(owner, COMSIG_ATOM_UPDATE_NAME, .proc/on_update_name) + RegisterSignal(owner, COMSIG_ATOM_UPDATE_NAME, PROC_REF(on_update_name)) if(!change_desc) - RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, .proc/on_examine_more) + RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(on_examine_more)) else - RegisterSignal(owner, COMSIG_ATOM_UPDATE_DESC, .proc/on_update_desc) + RegisterSignal(owner, COMSIG_ATOM_UPDATE_DESC, PROC_REF(on_update_desc)) - RegisterSignal(owner, COMSIG_ITEM_IS_CORRECT_CUSTOM_ORDER, .proc/check_food_order) + RegisterSignal(owner, COMSIG_ITEM_IS_CORRECT_CUSTOM_ORDER, PROC_REF(check_food_order)) - RegisterSignal(owner, COMSIG_ITEM_SOLD_TO_CUSTOMER, .proc/sell_ice_cream) + RegisterSignal(owner, COMSIG_ITEM_SOLD_TO_CUSTOMER, PROC_REF(sell_ice_cream)) if(prefill_flavours) for(var/entry in prefill_flavours) @@ -146,7 +146,7 @@ if(flavour.add_flavour(src, dispenser.beaker?.reagents.total_volume ? dispenser.beaker.reagents : null)) dispenser.visible_message("[icon2html(dispenser, viewers(source))] [span_info("[user] scoops delicious [dispenser.selected_flavour] ice cream into [source].")]") dispenser.product_types[dispenser.selected_flavour]-- - INVOKE_ASYNC(dispenser, /obj/machinery/icecream_vat.proc/updateDialog) + INVOKE_ASYNC(dispenser, TYPE_PROC_REF(/obj/machinery/icecream_vat, updateDialog)) else to_chat(user, span_warning("There is not enough ice cream left!")) else @@ -163,7 +163,7 @@ // We don't want to stop ice creams from being sold because of their order. we aren't that finnicky. var/our_scoops = scoops.Copy() - sortTim(our_scoops, cmp = /proc/cmp_text_asc) + sortTim(our_scoops, cmp = GLOBAL_PROC_REF(cmp_text_asc)) //Make sure the flavors and number of scoops match. if(compare_list(our_scoops, icecream_order.wanted_flavors)) diff --git a/code/datums/components/food_storage.dm b/code/datums/components/food_storage.dm index 326c97907ea..503a16059e4 100644 --- a/code/datums/components/food_storage.dm +++ b/code/datums/components/food_storage.dm @@ -18,9 +18,9 @@ /datum/component/food_storage/Initialize(_minimum_weight_class = WEIGHT_CLASS_SMALL, _bad_chance = 0, _good_chance = 100) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/try_inserting_item) - RegisterSignal(parent, COMSIG_CLICK_CTRL, .proc/try_removing_item) - RegisterSignal(parent, COMSIG_FOOD_EATEN, .proc/consume_food_storage) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(try_inserting_item)) + RegisterSignal(parent, COMSIG_CLICK_CTRL, PROC_REF(try_removing_item)) + RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(consume_food_storage)) var/atom/food = parent initial_volume = food.reagents.total_volume @@ -70,7 +70,7 @@ user.visible_message(span_notice("[user.name] begins inserting [inserted_item.name] into \the [parent]."), \ span_notice("You start to insert the [inserted_item.name] into \the [parent].")) - INVOKE_ASYNC(src, .proc/insert_item, inserted_item, user) + INVOKE_ASYNC(src, PROC_REF(insert_item), inserted_item, user) return COMPONENT_CANCEL_ATTACK_CHAIN /** Begins the process of attempting to remove the stored item. @@ -94,7 +94,7 @@ user.visible_message(span_notice("[user.name] begins tearing at \the [parent]."), \ span_notice("You start to rip into \the [parent].")) - INVOKE_ASYNC(src, .proc/begin_remove_item, user) + INVOKE_ASYNC(src, PROC_REF(begin_remove_item), user) return COMPONENT_CANCEL_ATTACK_CHAIN /** Inserts the item into the food, after a do_after. @@ -171,7 +171,7 @@ update_stored_item() //make sure if the item was changed, the reference changes as well if(!QDELETED(stored_item) && discovered) - INVOKE_ASYNC(src, .proc/remove_item, user) + INVOKE_ASYNC(src, PROC_REF(remove_item), user) /** Updates the reference of the stored item. * diff --git a/code/datums/components/force_move.dm b/code/datums/components/force_move.dm index 23e4926f101..3c3cebbb7be 100644 --- a/code/datums/components/force_move.dm +++ b/code/datums/components/force_move.dm @@ -10,11 +10,11 @@ var/mob/mob_parent = parent var/dist = get_dist(mob_parent, target) var/datum/move_loop/loop = SSmove_manager.move_towards(mob_parent, target, delay = 1, timeout = dist) - RegisterSignal(mob_parent, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, .proc/stop_move) - RegisterSignal(mob_parent, COMSIG_ATOM_PRE_PRESSURE_PUSH, .proc/stop_pressure) + RegisterSignal(mob_parent, COMSIG_MOB_CLIENT_PRE_LIVING_MOVE, PROC_REF(stop_move)) + RegisterSignal(mob_parent, COMSIG_ATOM_PRE_PRESSURE_PUSH, PROC_REF(stop_pressure)) if(spin) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/slip_spin) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/loop_ended) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(slip_spin)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_ended)) /datum/component/force_move/proc/stop_move(datum/source) SIGNAL_HANDLER diff --git a/code/datums/components/fov_handler.dm b/code/datums/components/fov_handler.dm index f2c8ae4d37b..1316f7ff7e0 100644 --- a/code/datums/components/fov_handler.dm +++ b/code/datums/components/fov_handler.dm @@ -125,13 +125,13 @@ /datum/component/fov_handler/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/on_dir_change) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/update_mask) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/update_mask) - RegisterSignal(parent, COMSIG_MOB_CLIENT_CHANGE_VIEW, .proc/update_fov_size) - RegisterSignal(parent, COMSIG_MOB_RESET_PERSPECTIVE, .proc/update_mask) - RegisterSignal(parent, COMSIG_MOB_LOGOUT, .proc/mob_logout) - RegisterSignal(parent, COMSIG_LIVING_COMBAT_MODE_TOGGLE, .proc/update_visual_shadow_alpha) //SKYRAT EDIT ADDITION + RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change)) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(update_mask)) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(update_mask)) + RegisterSignal(parent, COMSIG_MOB_CLIENT_CHANGE_VIEW, PROC_REF(update_fov_size)) + RegisterSignal(parent, COMSIG_MOB_RESET_PERSPECTIVE, PROC_REF(update_mask)) + RegisterSignal(parent, COMSIG_MOB_LOGOUT, PROC_REF(mob_logout)) + RegisterSignal(parent, COMSIG_LIVING_COMBAT_MODE_TOGGLE, PROC_REF(update_visual_shadow_alpha)) //SKYRAT EDIT ADDITION /datum/component/fov_handler/UnregisterFromParent() . = ..() diff --git a/code/datums/components/fullauto.dm b/code/datums/components/fullauto.dm index b859a0a6dc2..fd83fa3ccd3 100644 --- a/code/datums/components/fullauto.dm +++ b/code/datums/components/fullauto.dm @@ -19,9 +19,14 @@ if(!isgun(parent)) return COMPONENT_INCOMPATIBLE var/obj/item/gun = parent - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/wake_up) - if(_autofire_shot_delay) - autofire_shot_delay = _autofire_shot_delay + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(wake_up)) + if(autofire_shot_delay) + src.autofire_shot_delay = autofire_shot_delay + if(windup_autofire) + src.windup_autofire = windup_autofire + src.windup_autofire_reduction_multiplier = windup_autofire_reduction_multiplier + src.windup_autofire_cap = windup_autofire_cap + src.windup_spindown = windup_spindown if(autofire_stat == AUTOFIRE_STAT_IDLE && ismob(gun.loc)) var/mob/user = gun.loc wake_up(src, user) @@ -60,13 +65,13 @@ if(!QDELETED(usercli)) clicker = usercli shooter = clicker.mob - RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, .proc/on_mouse_down) + RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, PROC_REF(on_mouse_down)) if(!QDELETED(shooter)) - RegisterSignal(shooter, COMSIG_MOB_LOGOUT, .proc/autofire_off) + RegisterSignal(shooter, COMSIG_MOB_LOGOUT, PROC_REF(autofire_off)) UnregisterSignal(shooter, COMSIG_MOB_LOGIN) - RegisterSignal(parent, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), .proc/autofire_off) - parent.RegisterSignal(src, COMSIG_AUTOFIRE_ONMOUSEDOWN, /obj/item/gun/.proc/autofire_bypass_check) - parent.RegisterSignal(parent, COMSIG_AUTOFIRE_SHOT, /obj/item/gun/.proc/do_autofire) + RegisterSignal(parent, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(autofire_off)) + parent.RegisterSignal(src, COMSIG_AUTOFIRE_ONMOUSEDOWN, TYPE_PROC_REF(/obj/item/gun/, autofire_bypass_check)) + parent.RegisterSignal(parent, COMSIG_AUTOFIRE_SHOT, TYPE_PROC_REF(/obj/item/gun/, do_autofire)) /datum/component/automatic_fire/proc/autofire_off(datum/source) @@ -83,7 +88,7 @@ mouse_status = AUTOFIRE_MOUSEUP //In regards to the component there's no click anymore to care about. clicker = null if(!QDELETED(shooter)) - RegisterSignal(shooter, COMSIG_MOB_LOGIN, .proc/on_client_login) + RegisterSignal(shooter, COMSIG_MOB_LOGIN, PROC_REF(on_client_login)) UnregisterSignal(shooter, COMSIG_MOB_LOGOUT) UnregisterSignal(parent, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED)) shooter = null @@ -139,7 +144,7 @@ target = _target target_loc = get_turf(target) mouse_parameters = params - INVOKE_ASYNC(src, .proc/start_autofiring) + INVOKE_ASYNC(src, PROC_REF(start_autofiring)) //Dakka-dakka @@ -152,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 @@ -169,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) @@ -234,6 +239,10 @@ return FALSE shooter.face_atom(target) var/next_delay = autofire_shot_delay + if(windup_autofire) + next_delay = clamp(next_delay - current_windup_reduction, round(autofire_shot_delay * windup_autofire_cap), autofire_shot_delay) + current_windup_reduction = (current_windup_reduction + round(autofire_shot_delay * windup_autofire_reduction_multiplier)) + timerid = addtimer(CALLBACK(src, PROC_REF(windup_reset), FALSE), windup_spindown, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) if(HAS_TRAIT(shooter, TRAIT_DOUBLE_TAP)) next_delay = round(next_delay * 0.5) COOLDOWN_START(src, next_shot_cd, next_delay) @@ -270,7 +279,7 @@ if(!can_shoot()) shoot_with_empty_chamber(shooter) return NONE - INVOKE_ASYNC(src, .proc/do_autofire_shot, source, target, shooter, params) + INVOKE_ASYNC(src, PROC_REF(do_autofire_shot), source, target, shooter, params) return COMPONENT_AUTOFIRE_SHOT_SUCCESS //All is well, we can continue shooting. @@ -280,7 +289,7 @@ if(istype(akimbo_gun) && weapon_weight < WEAPON_MEDIUM) if(akimbo_gun.weapon_weight < WEAPON_MEDIUM && akimbo_gun.can_trigger_gun(shooter)) bonus_spread = dual_wield_spread - addtimer(CALLBACK(akimbo_gun, /obj/item/gun.proc/process_fire, target, shooter, TRUE, params, null, bonus_spread), 1) + addtimer(CALLBACK(akimbo_gun, TYPE_PROC_REF(/obj/item/gun, process_fire), target, shooter, TRUE, params, null, bonus_spread), 1) process_fire(target, shooter, TRUE, params, null, bonus_spread) #undef AUTOFIRE_MOUSEUP diff --git a/code/datums/components/gags_recolorable.dm b/code/datums/components/gags_recolorable.dm index 7e36b73dbbc..262cbe77ea7 100644 --- a/code/datums/components/gags_recolorable.dm +++ b/code/datums/components/gags_recolorable.dm @@ -1,7 +1,7 @@ /datum/component/gags_recolorable /datum/component/gags_recolorable/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) /datum/component/gags_recolorable/UnregisterFromParent() UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) @@ -19,7 +19,7 @@ if(can.is_capped || can.check_empty()) return - INVOKE_ASYNC(src, .proc/open_ui, user, can) + INVOKE_ASYNC(src, PROC_REF(open_ui), user, can) return COMPONENT_NO_AFTERATTACK /datum/component/gags_recolorable/proc/open_ui(mob/user, obj/item/toy/crayon/spraycan/can) @@ -39,7 +39,7 @@ allowed_configs += "[initial(item.greyscale_config_inhand_right)]" var/datum/greyscale_modify_menu/spray_paint/menu = new( - atom_parent, user, allowed_configs, CALLBACK(src, .proc/recolor, user, can), + atom_parent, user, allowed_configs, CALLBACK(src, PROC_REF(recolor), user, can), starting_icon_state = initial(atom_parent.icon_state), starting_config = initial(atom_parent.greyscale_config), starting_colors = atom_parent.greyscale_colors, diff --git a/code/datums/components/gas_leaker.dm b/code/datums/components/gas_leaker.dm index 902873b4044..d386b73ff00 100644 --- a/code/datums/components/gas_leaker.dm +++ b/code/datums/components/gas_leaker.dm @@ -36,7 +36,7 @@ /datum/component/gas_leaker/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ATOM_TAKE_DAMAGE, .proc/start_processing) + RegisterSignal(parent, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(start_processing)) /datum/component/gas_leaker/UnregisterFromParent() . = ..() diff --git a/code/datums/components/geiger_sound.dm b/code/datums/components/geiger_sound.dm index c50ca465769..b2f8baa76eb 100644 --- a/code/datums/components/geiger_sound.dm +++ b/code/datums/components/geiger_sound.dm @@ -21,13 +21,13 @@ /datum/component/geiger_sound/RegisterWithParent() sound = new(parent) - RegisterSignal(parent, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(parent, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) ADD_TRAIT(parent, TRAIT_BYPASS_EARLY_IRRADIATED_CHECK, REF(src)) if (isitem(parent)) var/atom/atom_parent = parent - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) register_to_loc(atom_parent.loc) /datum/component/geiger_sound/UnregisterFromParent() @@ -61,7 +61,7 @@ last_parent = new_loc if (!isnull(new_loc)) - RegisterSignal(new_loc, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(new_loc, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) /datum/looping_sound/geiger mid_sounds = list( diff --git a/code/datums/components/genetic_damage.dm b/code/datums/components/genetic_damage.dm index 1092f444b65..0aecad02a96 100644 --- a/code/datums/components/genetic_damage.dm +++ b/code/datums/components/genetic_damage.dm @@ -29,7 +29,7 @@ START_PROCESSING(SSprocessing, src) /datum/component/genetic_damage/RegisterWithParent() - RegisterSignal(parent, COMSIG_LIVING_HEALTHSCAN, .proc/on_healthscan) + RegisterSignal(parent, COMSIG_LIVING_HEALTHSCAN, PROC_REF(on_healthscan)) /datum/component/genetic_damage/UnregisterFromParent() UnregisterSignal(parent, COMSIG_LIVING_HEALTHSCAN) diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm index af7d9c5fba7..72d260ccc22 100644 --- a/code/datums/components/gps.dm +++ b/code/datums/components/gps.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(GPS_list) /datum/component/gps/kheiral_cuffs/Initialize(_gpstag = "COM0") . = ..() - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/deactivate_kheiral_cuffs) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(deactivate_kheiral_cuffs)) /datum/component/gps/kheiral_cuffs/proc/deactivate_kheiral_cuffs(datum/source) SIGNAL_HANDLER @@ -46,18 +46,18 @@ GLOBAL_LIST_EMPTY(GPS_list) if(overlay_state) A.add_overlay(overlay_state) A.name = "[initial(A.name)] ([gpstag])" - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact)) if(!emp_proof) - RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_AltClick) + RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_AltClick)) ///Called on COMSIG_ITEM_ATTACK_SELF /datum/component/gps/item/proc/interact(datum/source, mob/user) SIGNAL_HANDLER if(user) - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) ///Called on COMSIG_PARENT_EXAMINE /datum/component/gps/item/proc/on_examine(datum/source, mob/user, list/examine_list) @@ -73,7 +73,7 @@ GLOBAL_LIST_EMPTY(GPS_list) var/atom/A = parent A.cut_overlay("working") A.add_overlay("emp") - addtimer(CALLBACK(src, .proc/reboot), 300, TIMER_UNIQUE|TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early + addtimer(CALLBACK(src, PROC_REF(reboot)), 300, TIMER_UNIQUE|TIMER_OVERRIDE) //if a new EMP happens, remove the old timer so it doesn't reactivate early SStgui.close_uis(src) //Close the UI control if it is open. ///Restarts the GPS after getting turned off by an EMP. diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm index bf251f9ec4d..42f0d8cd8d2 100644 --- a/code/datums/components/grillable.dm +++ b/code/datums/components/grillable.dm @@ -28,9 +28,9 @@ src.pollutant_type = pollutant_type //SKYRAT EDIT ADDITION /datum/component/grillable/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_GRILL_PLACED_ON, .proc/on_grill_start) - RegisterSignal(parent, COMSIG_ITEM_GRILL_PROCESS, .proc/on_grill) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_ITEM_GRILL_PLACED_ON, PROC_REF(on_grill_start)) + RegisterSignal(parent, COMSIG_ITEM_GRILL_PROCESS, PROC_REF(on_grill)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/grillable/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_GRILL_PLACED_ON, COMSIG_ITEM_GRILL_PROCESS, COMSIG_PARENT_EXAMINE)) @@ -55,8 +55,8 @@ if(griller) who_placed_us = REF(griller) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/add_grilled_item_overlay) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(add_grilled_item_overlay)) var/atom/atom_parent = parent atom_parent.update_appearance() diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 5765526e0b5..5da3c07781a 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -33,9 +33,9 @@ var/mob/living/shooter = parent target = targ weapon = wep - RegisterSignal(targ, list(COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_ITEM_ATTACK, COMSIG_MOVABLE_MOVED, COMSIG_MOB_FIRED_GUN), .proc/trigger_reaction) + RegisterSignal(targ, list(COMSIG_MOB_ATTACK_HAND, COMSIG_MOB_ITEM_ATTACK, COMSIG_MOVABLE_MOVED, COMSIG_MOB_FIRED_GUN), PROC_REF(trigger_reaction)) - RegisterSignal(weapon, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED), .proc/cancel) + RegisterSignal(weapon, list(COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED), PROC_REF(cancel)) shooter.visible_message(span_danger("[shooter] aims [weapon] point blank at [target]!"), \ span_danger("You aim [weapon] point blank at [target]!"), ignored_mobs = target) @@ -53,7 +53,7 @@ target.playsound_local(target.loc, 'sound/machines/chime.ogg', 50, TRUE) target.add_mood_event("gunpoint", /datum/mood_event/gunpoint) - addtimer(CALLBACK(src, .proc/update_stage, 2), GUNPOINT_DELAY_STAGE_2) + addtimer(CALLBACK(src, PROC_REF(update_stage), 2), GUNPOINT_DELAY_STAGE_2) /datum/component/gunpoint/Destroy(force, silent) var/mob/living/shooter = parent @@ -63,11 +63,11 @@ return ..() /datum/component/gunpoint/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/check_deescalate) - RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, .proc/flinch) - RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND, .proc/check_shove) - RegisterSignal(parent, COMSIG_MOB_UPDATE_SIGHT, .proc/check_deescalate) - RegisterSignal(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP), .proc/check_bump) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(check_deescalate)) + RegisterSignal(parent, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(flinch)) + RegisterSignal(parent, COMSIG_MOB_ATTACK_HAND, PROC_REF(check_shove)) + RegisterSignal(parent, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(check_deescalate)) + RegisterSignal(parent, list(COMSIG_LIVING_START_PULL, COMSIG_MOVABLE_BUMP), PROC_REF(check_bump)) /datum/component/gunpoint/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) @@ -108,7 +108,7 @@ to_chat(parent, span_danger("You steady [weapon] on [target].")) to_chat(target, span_userdanger("[parent] has steadied [weapon] on you!")) damage_mult = GUNPOINT_MULT_STAGE_2 - addtimer(CALLBACK(src, .proc/update_stage, 3), GUNPOINT_DELAY_STAGE_3) + addtimer(CALLBACK(src, PROC_REF(update_stage), 3), GUNPOINT_DELAY_STAGE_3) else if(stage == 3) to_chat(parent, span_danger("You have fully steadied [weapon] on [target].")) to_chat(target, span_userdanger("[parent] has fully steadied [weapon] on you!")) @@ -125,7 +125,7 @@ ///Bang bang, we're firing a charged shot off /datum/component/gunpoint/proc/trigger_reaction() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/async_trigger_reaction) + INVOKE_ASYNC(src, PROC_REF(async_trigger_reaction)) /datum/component/gunpoint/proc/async_trigger_reaction() var/mob/living/shooter = parent @@ -182,7 +182,7 @@ if(prob(flinch_chance)) shooter.visible_message(span_danger("[shooter] flinches!"), \ span_danger("You flinch!")) - INVOKE_ASYNC(src, .proc/trigger_reaction) + INVOKE_ASYNC(src, PROC_REF(trigger_reaction)) #undef GUNPOINT_DELAY_STAGE_2 #undef GUNPOINT_DELAY_STAGE_3 diff --git a/code/datums/components/hazard_area.dm b/code/datums/components/hazard_area.dm index 42a988737e1..45075f2f3e2 100644 --- a/code/datums/components/hazard_area.dm +++ b/code/datums/components/hazard_area.dm @@ -28,10 +28,10 @@ /datum/component/hazard_area/RegisterWithParent() var/mob/parent_mob = parent parent_mob.become_area_sensitive(type) - RegisterSignal(parent_mob, COMSIG_ENTER_AREA, .proc/handle_parent_area_change) - RegisterSignal(parent_mob, COMSIG_LADDER_TRAVEL, .proc/reject_ladder_movement) - RegisterSignal(parent_mob, COMSIG_VEHICLE_RIDDEN, .proc/reject_vehicle) - RegisterSignal(SSdcs, COMSIG_AREA_CREATED, .proc/on_area_creation) + RegisterSignal(parent_mob, COMSIG_ENTER_AREA, PROC_REF(handle_parent_area_change)) + RegisterSignal(parent_mob, COMSIG_LADDER_TRAVEL, PROC_REF(reject_ladder_movement)) + RegisterSignal(parent_mob, COMSIG_VEHICLE_RIDDEN, PROC_REF(reject_vehicle)) + RegisterSignal(SSdcs, COMSIG_AREA_CREATED, PROC_REF(on_area_creation)) /datum/component/hazard_area/UnregisterFromParent() var/mob/parent_mob = parent @@ -141,7 +141,7 @@ return last_parent_area = new_area.type - INVOKE_ASYNC(src, .proc/update_parent_status_effect) + INVOKE_ASYNC(src, PROC_REF(update_parent_status_effect)) /// The dedicated status effect for the hazard_area component - use with caution and know what it does! /datum/status_effect/hazard_area diff --git a/code/datums/components/heirloom.dm b/code/datums/components/heirloom.dm index 091a8d59b45..0c71dd6fa86 100644 --- a/code/datums/components/heirloom.dm +++ b/code/datums/components/heirloom.dm @@ -12,7 +12,7 @@ owner = new_owner family_name = new_family_name - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/heirloom/Destroy(force, silent) owner = null diff --git a/code/datums/components/hide_highest_offset.dm b/code/datums/components/hide_highest_offset.dm index 6e6dfa4d641..eb5b5660db0 100644 --- a/code/datums/components/hide_highest_offset.dm +++ b/code/datums/components/hide_highest_offset.dm @@ -5,7 +5,7 @@ /datum/component/plane_hide_highest_offset/Initialize() if(!istype(parent, /atom/movable/screen/plane_master)) return - RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, .proc/on_offset_increase) + RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, PROC_REF(on_offset_increase)) offset_increase(SSmapping.max_plane_offset) /datum/component/plane_hide_highest_offset/proc/on_offset_increase(datum/source, old_offset, new_offset) diff --git a/code/datums/components/holderloving.dm b/code/datums/components/holderloving.dm index e5e25dbb34f..c6eeb3be0cb 100644 --- a/code/datums/components/holderloving.dm +++ b/code/datums/components/holderloving.dm @@ -30,14 +30,14 @@ src.del_parent_with_holder = del_parent_with_holder /datum/component/holderloving/RegisterWithParent() - RegisterSignal(holder, COMSIG_MOVABLE_MOVED, .proc/check_my_loc) - RegisterSignal(holder, COMSIG_PARENT_QDELETING, .proc/holder_deleting) + RegisterSignal(holder, COMSIG_MOVABLE_MOVED, PROC_REF(check_my_loc)) + RegisterSignal(holder, COMSIG_PARENT_QDELETING, PROC_REF(holder_deleting)) RegisterSignal(parent, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED, COMSIG_ATOM_ENTERED, COMSIG_ATOM_EXITED, - ), .proc/check_my_loc) + ), PROC_REF(check_my_loc)) /datum/component/holderloving/UnregisterFromParent() UnregisterSignal(holder, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) diff --git a/code/datums/components/igniter.dm b/code/datums/components/igniter.dm index 1d2b34a9334..4b90742deb2 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) || isprojectilespell(parent)) // turrets, etc - RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(parent)) - RegisterSignal(parent, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(parent, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) /datum/component/igniter/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_POST_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT)) diff --git a/code/datums/components/infective.dm b/code/datums/components/infective.dm index 86d32b10cbb..2bd3302dd65 100644 --- a/code/datums/components/infective.dm +++ b/code/datums/components/infective.dm @@ -17,23 +17,23 @@ return COMPONENT_INCOMPATIBLE var/static/list/disease_connections = list( - COMSIG_ATOM_ENTERED = .proc/try_infect_crossed, + COMSIG_ATOM_ENTERED = PROC_REF(try_infect_crossed), ) AddComponent(/datum/component/connect_loc_behalf, parent, disease_connections) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean) - RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/try_infect_buckle) - RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/try_infect_collide) - RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, .proc/try_infect_impact_zone) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean)) + RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(try_infect_buckle)) + RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(try_infect_collide)) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(try_infect_impact_zone)) if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, .proc/try_infect_attack_zone) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/try_infect_attack) - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/try_infect_equipped) - RegisterSignal(parent, COMSIG_FOOD_EATEN, .proc/try_infect_eat) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_ZONE, PROC_REF(try_infect_attack_zone)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(try_infect_attack)) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(try_infect_equipped)) + RegisterSignal(parent, COMSIG_FOOD_EATEN, PROC_REF(try_infect_eat)) if(istype(parent, /obj/item/reagent_containers/cup)) - RegisterSignal(parent, COMSIG_GLASS_DRANK, .proc/try_infect_drink) + RegisterSignal(parent, COMSIG_GLASS_DRANK, PROC_REF(try_infect_drink)) else if(istype(parent, /obj/effect/decal/cleanable/blood/gibs)) - RegisterSignal(parent, COMSIG_GIBS_STREAK, .proc/try_infect_streak) + RegisterSignal(parent, COMSIG_GIBS_STREAK, PROC_REF(try_infect_streak)) /datum/component/infective/proc/try_infect_eat(datum/source, mob/living/eater, mob/living/feeder) SIGNAL_HANDLER diff --git a/code/datums/components/irradiated.dm b/code/datums/components/irradiated.dm index 38beacb05c3..44cfa091be2 100644 --- a/code/datums/components/irradiated.dm +++ b/code/datums/components/irradiated.dm @@ -49,8 +49,8 @@ human_parent.throw_alert(ALERT_IRRADIATED, /atom/movable/screen/alert/irradiated) /datum/component/irradiated/RegisterWithParent() - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_clean) - RegisterSignal(parent, COMSIG_GEIGER_COUNTER_SCAN, .proc/on_geiger_counter_scan) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) + RegisterSignal(parent, COMSIG_GEIGER_COUNTER_SCAN, PROC_REF(on_geiger_counter_scan)) /datum/component/irradiated/UnregisterFromParent() UnregisterSignal(parent, list( @@ -115,7 +115,7 @@ COOLDOWN_START(src, last_tox_damage, RADIATION_TOX_INTERVAL) /datum/component/irradiated/proc/start_burn_splotch_timer() - addtimer(CALLBACK(src, .proc/give_burn_splotches), rand(RADIATION_BURN_INTERVAL_MIN, RADIATION_BURN_INTERVAL_MAX), TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(give_burn_splotches)), rand(RADIATION_BURN_INTERVAL_MIN, RADIATION_BURN_INTERVAL_MAX), TIMER_STOPPABLE) /datum/component/irradiated/proc/give_burn_splotches() // This shouldn't be possible, but just in case. @@ -152,7 +152,7 @@ return parent_movable.add_filter("rad_glow", 2, list("type" = "outline", "color" = "#39ff1430", "size" = 2)) - addtimer(CALLBACK(src, .proc/start_glow_loop, parent_movable), rand(0.1 SECONDS, 1.9 SECONDS)) // Things should look uneven + addtimer(CALLBACK(src, PROC_REF(start_glow_loop), parent_movable), rand(0.1 SECONDS, 1.9 SECONDS)) // Things should look uneven /datum/component/irradiated/proc/start_glow_loop(atom/movable/parent_movable) var/filter = parent_movable.get_filter("rad_glow") diff --git a/code/datums/components/itembound.dm b/code/datums/components/itembound.dm index 3cd88a86fd6..ae29949961b 100644 --- a/code/datums/components/itembound.dm +++ b/code/datums/components/itembound.dm @@ -11,7 +11,7 @@ if(QDELETED(passed_container)) return containerref = WEAKREF(passed_container) - move_tracker = new(parent, CALLBACK(src, .proc/verify_containment)) + move_tracker = new(parent, CALLBACK(src, PROC_REF(verify_containment))) ADD_TRAIT(parent, TRAIT_INCAPACITATED, SMITE_TRAIT) diff --git a/code/datums/components/itempicky.dm b/code/datums/components/itempicky.dm index 49a12ef8193..74fbdff1caa 100644 --- a/code/datums/components/itempicky.dm +++ b/code/datums/components/itempicky.dm @@ -14,7 +14,7 @@ src.message = message /datum/component/itempicky/RegisterWithParent() - RegisterSignal(parent, COMSIG_LIVING_TRY_PUT_IN_HAND, .proc/particularly) + RegisterSignal(parent, COMSIG_LIVING_TRY_PUT_IN_HAND, PROC_REF(particularly)) /datum/component/itempicky/UnregisterFromParent() UnregisterSignal(parent, COMSIG_LIVING_TRY_PUT_IN_HAND) diff --git a/code/datums/components/jetpack.dm b/code/datums/components/jetpack.dm index d6085d57f7a..3451a75538a 100644 --- a/code/datums/components/jetpack.dm +++ b/code/datums/components/jetpack.dm @@ -34,9 +34,9 @@ if(!activation_signal) // Can't activate? go away return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, activation_signal, .proc/activate) + RegisterSignal(parent, activation_signal, PROC_REF(activate)) if(deactivation_signal) - RegisterSignal(parent, deactivation_signal, .proc/deactivate) + RegisterSignal(parent, deactivation_signal, PROC_REF(deactivate)) src.check_on_move = check_on_move src.get_mover = get_mover @@ -50,9 +50,9 @@ UnregisterSignal(parent, src.activation_signal) if(src.deactivation_signal) UnregisterSignal(parent, src.deactivation_signal) - RegisterSignal(parent, activation_signal, .proc/activate) + RegisterSignal(parent, activation_signal, PROC_REF(activate)) if(deactivation_signal) - RegisterSignal(parent, deactivation_signal, .proc/deactivate) + RegisterSignal(parent, deactivation_signal, PROC_REF(deactivate)) src.check_on_move = check_on_move src.get_mover = get_mover @@ -84,11 +84,11 @@ if(!thrust(moving)) return return_flag trail.start() - RegisterSignal(moving, COMSIG_MOVABLE_MOVED, .proc/move_react) - RegisterSignal(moving, COMSIG_MOVABLE_PRE_MOVE, .proc/pre_move_react) - RegisterSignal(moving, COMSIG_MOVABLE_SPACEMOVE, .proc/spacemove_react) - RegisterSignal(moving, COMSIG_MOVABLE_DRIFT_VISUAL_ATTEMPT, .proc/block_starting_visuals) - RegisterSignal(moving, COMSIG_MOVABLE_DRIFT_BLOCK_INPUT, .proc/ignore_ending_block) + RegisterSignal(moving, COMSIG_MOVABLE_MOVED, PROC_REF(move_react)) + RegisterSignal(moving, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(pre_move_react)) + RegisterSignal(moving, COMSIG_MOVABLE_SPACEMOVE, PROC_REF(spacemove_react)) + RegisterSignal(moving, COMSIG_MOVABLE_DRIFT_VISUAL_ATTEMPT, PROC_REF(block_starting_visuals)) + RegisterSignal(moving, COMSIG_MOVABLE_DRIFT_BLOCK_INPUT, PROC_REF(ignore_ending_block)) /datum/component/jetpack/proc/deactivate(datum/source) SIGNAL_HANDLER diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm index 32aa0678a53..abde9cefaa6 100644 --- a/code/datums/components/jousting.dm +++ b/code/datums/components/jousting.dm @@ -18,14 +18,14 @@ /datum/component/jousting/Initialize() if(!isitem(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/on_attack) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack)) /datum/component/jousting/proc/on_equip(datum/source, mob/user, slot) SIGNAL_HANDLER - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/mob_move, TRUE) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(mob_move), TRUE) current_holder = user /datum/component/jousting/proc/on_drop(datum/source, mob/user) @@ -76,7 +76,7 @@ current_tile_charge++ if(current_timerid) deltimer(current_timerid) - current_timerid = addtimer(CALLBACK(src, .proc/reset_charge), movement_reset_tolerance, TIMER_STOPPABLE) + current_timerid = addtimer(CALLBACK(src, PROC_REF(reset_charge)), movement_reset_tolerance, TIMER_STOPPABLE) /datum/component/jousting/proc/reset_charge() current_tile_charge = 0 diff --git a/code/datums/components/knockoff.dm b/code/datums/components/knockoff.dm index 5efe33af69b..b5563433c72 100644 --- a/code/datums/components/knockoff.dm +++ b/code/datums/components/knockoff.dm @@ -21,8 +21,8 @@ src.slots_knockoffable = slots_knockoffable /datum/component/knockoff/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equipped) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_dropped) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_dropped)) /datum/component/knockoff/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) @@ -88,8 +88,8 @@ UnregisterSignal(equipper, list(COMSIG_HUMAN_DISARM_HIT, COMSIG_LIVING_STATUS_KNOCKDOWN)) return - RegisterSignal(equipper, COMSIG_HUMAN_DISARM_HIT, .proc/on_equipped_mob_disarm, TRUE) - RegisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN, .proc/on_equipped_mob_knockdown, TRUE) + RegisterSignal(equipper, COMSIG_HUMAN_DISARM_HIT, PROC_REF(on_equipped_mob_disarm), TRUE) + RegisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN, PROC_REF(on_equipped_mob_knockdown), TRUE) /// Signal proc for [COMSIG_ITEM_DROPPED] /// Unregisters our signals which can cause a knockdown when we're unequipped (dropped) diff --git a/code/datums/components/label.dm b/code/datums/components/label.dm index 87e82de8d3f..822841af22d 100644 --- a/code/datums/components/label.dm +++ b/code/datums/components/label.dm @@ -22,8 +22,8 @@ apply_label() /datum/component/label/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackby) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/Examine) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackby)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(Examine)) /datum/component/label/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) diff --git a/code/datums/components/light_eater.dm b/code/datums/components/light_eater.dm index 0c0b1c6246f..c3712939dad 100644 --- a/code/datums/components/light_eater.dm +++ b/code/datums/components/light_eater.dm @@ -20,7 +20,7 @@ var/list/cached_eaten_lights = eaten_lights for(var/morsel in _eaten) LAZYSET(cached_eaten_lights, morsel, TRUE) - RegisterSignal(morsel, COMSIG_PARENT_QDELETING, .proc/deref_eaten_light) + RegisterSignal(morsel, COMSIG_PARENT_QDELETING, PROC_REF(deref_eaten_light)) /datum/component/light_eater/Destroy(force, silent) for(var/light in eaten_lights) @@ -32,7 +32,7 @@ /datum/component/light_eater/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_LIGHT_EATER_DEVOUR, .proc/on_devour) + RegisterSignal(parent, COMSIG_LIGHT_EATER_DEVOUR, PROC_REF(on_devour)) parent.AddElement(/datum/element/light_eater) /datum/component/light_eater/UnregisterFromParent() @@ -48,14 +48,14 @@ LAZYINITLIST(eaten_lights) var/list/cached_eaten_lights = eaten_lights for(var/morsel in _eaten) - RegisterSignal(morsel, COMSIG_PARENT_QDELETING, .proc/deref_eaten_light) + RegisterSignal(morsel, COMSIG_PARENT_QDELETING, PROC_REF(deref_eaten_light)) LAZYSET(cached_eaten_lights, morsel, TRUE) /// Handles storing references to lights eaten by the light eater. /datum/component/light_eater/proc/on_devour(datum/source, atom/morsel) SIGNAL_HANDLER LAZYSET(eaten_lights, morsel, TRUE) - RegisterSignal(morsel, COMSIG_PARENT_QDELETING, .proc/deref_eaten_light) + RegisterSignal(morsel, COMSIG_PARENT_QDELETING, PROC_REF(deref_eaten_light)) return NONE /// Handles dereferencing deleted lights. diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm index 2fafc7c9be1..2b64269a528 100644 --- a/code/datums/components/lockon_aiming.dm +++ b/code/datums/components/lockon_aiming.dm @@ -26,7 +26,7 @@ if(target_callback) can_target_callback = target_callback else - can_target_callback = CALLBACK(src, .proc/can_target) + can_target_callback = CALLBACK(src, PROC_REF(can_target)) if(range) lock_cursor_range = range if(typecache) diff --git a/code/datums/components/manual_blinking.dm b/code/datums/components/manual_blinking.dm index 07075cddf27..d6bf17bfa18 100644 --- a/code/datums/components/manual_blinking.dm +++ b/code/datums/components/manual_blinking.dm @@ -29,11 +29,11 @@ return ..() /datum/component/manual_blinking/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/check_emote) - RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, .proc/check_added_organ) - RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, .proc/check_removed_organ) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/restart) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/pause) + RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(check_emote)) + RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(check_added_organ)) + RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_removed_organ)) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(restart)) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(pause)) /datum/component/manual_blinking/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOB_EMOTE) diff --git a/code/datums/components/manual_breathing.dm b/code/datums/components/manual_breathing.dm index 4c47794b809..daad7744131 100644 --- a/code/datums/components/manual_breathing.dm +++ b/code/datums/components/manual_breathing.dm @@ -29,11 +29,11 @@ return ..() /datum/component/manual_breathing/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/check_emote) - RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, .proc/check_added_organ) - RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, .proc/check_removed_organ) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/restart) - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/pause) + RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(check_emote)) + RegisterSignal(parent, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(check_added_organ)) + RegisterSignal(parent, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_removed_organ)) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(restart)) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(pause)) /datum/component/manual_breathing/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOB_EMOTE) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index c821164f8df..2002f5701cd 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -78,9 +78,9 @@ . = ..() if(!(mat_container_flags & MATCONTAINER_NO_INSERT)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) if(mat_container_flags & MATCONTAINER_EXAMINE) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/material_container/vv_edit_var(var_name, var_value) @@ -88,12 +88,12 @@ . = ..() if(var_name == NAMEOF(src, mat_container_flags) && parent) if(!(old_flags & MATCONTAINER_EXAMINE) && mat_container_flags & MATCONTAINER_EXAMINE) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) else if(old_flags & MATCONTAINER_EXAMINE && !(mat_container_flags & MATCONTAINER_EXAMINE)) UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) if(old_flags & MATCONTAINER_NO_INSERT && !(mat_container_flags & MATCONTAINER_NO_INSERT)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) else if(!(old_flags & MATCONTAINER_NO_INSERT) && mat_container_flags & MATCONTAINER_NO_INSERT) UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) @@ -140,7 +140,7 @@ to_chat(user, span_warning("[parent] can't hold any more of [I] sheets.")) return //split the amount we don't need off - INVOKE_ASYNC(stack_to_split, /obj/item/stack.proc/split_stack, user, stack_to_split.amount - sheets_to_insert) + INVOKE_ASYNC(stack_to_split, TYPE_PROC_REF(/obj/item/stack, split_stack), user, stack_to_split.amount - sheets_to_insert) else to_chat(user, span_warning("[I] contains more materials than [parent] has space to hold.")) return diff --git a/code/datums/components/mind_linker.dm b/code/datums/components/mind_linker.dm index 7e35b73893e..be13abc3f74 100644 --- a/code/datums/components/mind_linker.dm +++ b/code/datums/components/mind_linker.dm @@ -85,7 +85,7 @@ /datum/component/mind_linker/RegisterWithParent() if(signals_which_destroy_us) - RegisterSignal(parent, signals_which_destroy_us, .proc/destroy_link) + RegisterSignal(parent, signals_which_destroy_us, PROC_REF(destroy_link)) /datum/component/mind_linker/UnregisterFromParent() if(signals_which_destroy_us) @@ -120,7 +120,7 @@ new_link.Grant(to_link) linked_mobs[to_link] = new_link - RegisterSignal(to_link, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING, COMSIG_MINDSHIELD_IMPLANTED), .proc/unlink_mob) + RegisterSignal(to_link, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING, COMSIG_MINDSHIELD_IMPLANTED), PROC_REF(unlink_mob)) return TRUE diff --git a/code/datums/components/mirv.dm b/code/datums/components/mirv.dm index 8d22972ae8e..0f41df1d288 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) || isprojectilespell(parent)) // turrets, etc - RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) /datum/component/mirv/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PROJECTILE_ON_HIT)) @@ -24,7 +24,7 @@ /datum/component/mirv/proc/projectile_hit(datum/fired_from, atom/movable/firer, atom/target, Angle) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/do_shrapnel, firer, target) + INVOKE_ASYNC(src, PROC_REF(do_shrapnel), firer, target) /datum/component/mirv/proc/do_shrapnel(mob/firer, atom/target) if(radius < 1) diff --git a/code/datums/components/mob_harvest.dm b/code/datums/components/mob_harvest.dm index 7a7997ff0df..55098484503 100644 --- a/code/datums/components/mob_harvest.dm +++ b/code/datums/components/mob_harvest.dm @@ -79,12 +79,12 @@ living_parent.update_appearance(UPDATE_ICON_STATE) /datum/component/mob_harvest/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) // Only do update_icon_state business on non-carbon mobs if(!iscarbon(parent)) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON_STATE, .proc/on_update_icon_state) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON_STATE, PROC_REF(on_update_icon_state)) var/mob/living/living_parent = parent living_parent.update_appearance(UPDATE_ICON_STATE) @@ -108,7 +108,7 @@ SIGNAL_HANDLER if(istype(used_item, harvest_tool)) - INVOKE_ASYNC(src, .proc/harvest_item, user) + INVOKE_ASYNC(src, PROC_REF(harvest_item), user) if(istype(used_item, fed_item)) remove_wait_time(user) qdel(used_item) diff --git a/code/datums/components/multiple_lives.dm b/code/datums/components/multiple_lives.dm index f0db99f0f56..dc95a126152 100644 --- a/code/datums/components/multiple_lives.dm +++ b/code/datums/components/multiple_lives.dm @@ -15,9 +15,9 @@ src.lives_left = lives_left /datum/component/multiple_lives/RegisterWithParent() - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/respawn) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_LIVING_WRITE_MEMORY, .proc/on_write_memory) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(respawn)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_LIVING_WRITE_MEMORY, PROC_REF(on_write_memory)) /datum/component/multiple_lives/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_EXAMINE, COMSIG_LIVING_WRITE_MEMORY)) diff --git a/code/datums/components/omen.dm b/code/datums/components/omen.dm index 8cf7b8ba3c3..b7df9006ee4 100644 --- a/code/datums/components/omen.dm +++ b/code/datums/components/omen.dm @@ -37,9 +37,9 @@ return ..() /datum/component/omen/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/check_accident) - RegisterSignal(parent, COMSIG_LIVING_STATUS_KNOCKDOWN, .proc/check_slip) - RegisterSignal(parent, COMSIG_CARBON_MOOD_UPDATE, .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_CARBON_MOOD_UPDATE, PROC_REF(check_bless)) /datum/component/omen/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_LIVING_STATUS_KNOCKDOWN, COMSIG_MOVABLE_MOVED, COMSIG_CARBON_MOOD_UPDATE)) @@ -66,7 +66,7 @@ to_chat(living_guy, span_warning("A malevolent force launches your body to the floor...")) var/obj/machinery/door/airlock/darth_airlock = turf_content living_guy.apply_status_effect(/datum/status_effect/incapacitating/paralyzed, 10) - INVOKE_ASYNC(darth_airlock, /obj/machinery/door/airlock.proc/close, TRUE) + INVOKE_ASYNC(darth_airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, close), TRUE) if(!permanent) qdel(src) return @@ -82,7 +82,7 @@ for(var/obj/machinery/vending/darth_vendor in the_turf) if(darth_vendor.tiltable) to_chat(living_guy, span_warning("A malevolent force tugs at the [darth_vendor]...")) - INVOKE_ASYNC(darth_vendor, /obj/machinery/vending.proc/tilt, living_guy) + INVOKE_ASYNC(darth_vendor, TYPE_PROC_REF(/obj/machinery/vending, tilt), living_guy) if(!permanent) qdel(src) return diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm index 761b02142e0..3ba6ba22c07 100644 --- a/code/datums/components/orbiter.dm +++ b/code/datums/components/orbiter.dm @@ -22,9 +22,9 @@ target.orbiters = src if(ismovable(target)) - tracker = new(target, CALLBACK(src, .proc/move_react)) + tracker = new(target, CALLBACK(src, PROC_REF(move_react))) - RegisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, .proc/orbiter_glide_size_update) + RegisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(orbiter_glide_size_update)) /datum/component/orbiter/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE) @@ -51,7 +51,7 @@ incoming_orbiter.orbiting = src // It is important to transfer the signals so we don't get locked to the new orbiter component for all time newcomp.UnregisterSignal(incoming_orbiter, COMSIG_MOVABLE_MOVED) - RegisterSignal(incoming_orbiter, COMSIG_MOVABLE_MOVED, .proc/orbiter_move_react) + RegisterSignal(incoming_orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react)) orbiter_list += newcomp.orbiter_list newcomp.orbiter_list = null @@ -71,7 +71,7 @@ orbiter.orbiting = src ADD_TRAIT(orbiter, TRAIT_NO_FLOATING_ANIM, ORBITING_TRAIT) - RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, .proc/orbiter_move_react) + RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react)) SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_BEGIN, orbiter) diff --git a/code/datums/components/overlay_lighting.dm b/code/datums/components/overlay_lighting.dm index 27f5360eef2..0048cab7aea 100644 --- a/code/datums/components/overlay_lighting.dm +++ b/code/datums/components/overlay_lighting.dm @@ -110,16 +110,16 @@ /datum/component/overlay_lighting/RegisterWithParent() . = ..() if(directional) - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/on_parent_dir_change) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_RANGE, .proc/set_range) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_POWER, .proc/set_power) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_COLOR, .proc/set_color) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_ON, .proc/on_toggle) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_FLAGS, .proc/on_light_flags_change) - RegisterSignal(parent, COMSIG_ATOM_USED_IN_CRAFT, .proc/on_parent_crafted) - RegisterSignal(parent, COMSIG_LIGHT_EATER_QUEUE, .proc/on_light_eater) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_parent_moved) - RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, .proc/on_z_move) + RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_parent_dir_change)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_RANGE, PROC_REF(set_range)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_POWER, PROC_REF(set_power)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_COLOR, PROC_REF(set_color)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_ON, PROC_REF(on_toggle)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_LIGHT_FLAGS, PROC_REF(on_light_flags_change)) + RegisterSignal(parent, COMSIG_ATOM_USED_IN_CRAFT, PROC_REF(on_parent_crafted)) + RegisterSignal(parent, COMSIG_LIGHT_EATER_QUEUE, PROC_REF(on_light_eater)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_moved)) + RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_z_move)) var/atom/movable/movable_parent = parent if(movable_parent.light_flags & LIGHT_ATTACHED) overlay_lighting_flags |= LIGHTING_ATTACHED @@ -217,15 +217,15 @@ var/atom/movable/old_parent_attached_to = . UnregisterSignal(old_parent_attached_to, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIGHT_EATER_QUEUE)) if(old_parent_attached_to == current_holder) - RegisterSignal(old_parent_attached_to, COMSIG_PARENT_QDELETING, .proc/on_holder_qdel) - RegisterSignal(old_parent_attached_to, COMSIG_MOVABLE_MOVED, .proc/on_holder_moved) - RegisterSignal(old_parent_attached_to, COMSIG_LIGHT_EATER_QUEUE, .proc/on_light_eater) + RegisterSignal(old_parent_attached_to, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel)) + RegisterSignal(old_parent_attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved)) + RegisterSignal(old_parent_attached_to, COMSIG_LIGHT_EATER_QUEUE, PROC_REF(on_light_eater)) if(parent_attached_to) if(parent_attached_to == current_holder) UnregisterSignal(current_holder, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIGHT_EATER_QUEUE)) - RegisterSignal(parent_attached_to, COMSIG_PARENT_QDELETING, .proc/on_parent_attached_to_qdel) - RegisterSignal(parent_attached_to, COMSIG_MOVABLE_MOVED, .proc/on_parent_attached_to_moved) - RegisterSignal(parent_attached_to, COMSIG_LIGHT_EATER_QUEUE, .proc/on_light_eater) + RegisterSignal(parent_attached_to, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_attached_to_qdel)) + RegisterSignal(parent_attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_attached_to_moved)) + RegisterSignal(parent_attached_to, COMSIG_LIGHT_EATER_QUEUE, PROC_REF(on_light_eater)) check_holder() @@ -245,12 +245,12 @@ clean_old_turfs() return if(new_holder != parent && new_holder != parent_attached_to) - RegisterSignal(new_holder, COMSIG_PARENT_QDELETING, .proc/on_holder_qdel) - RegisterSignal(new_holder, COMSIG_LIGHT_EATER_QUEUE, .proc/on_light_eater) + RegisterSignal(new_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel)) + RegisterSignal(new_holder, COMSIG_LIGHT_EATER_QUEUE, PROC_REF(on_light_eater)) if(overlay_lighting_flags & LIGHTING_ON) - RegisterSignal(new_holder, COMSIG_MOVABLE_MOVED, .proc/on_holder_moved) + RegisterSignal(new_holder, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved)) if(directional) - RegisterSignal(new_holder, COMSIG_ATOM_DIR_CHANGE, .proc/on_holder_dir_change) + RegisterSignal(new_holder, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_holder_dir_change)) if(directional && current_direction != new_holder.dir) current_direction = new_holder.dir if(overlay_lighting_flags & LIGHTING_ON) @@ -438,7 +438,7 @@ add_dynamic_lumi() overlay_lighting_flags |= LIGHTING_ON if(current_holder && current_holder != parent && current_holder != parent_attached_to) - RegisterSignal(current_holder, COMSIG_MOVABLE_MOVED, .proc/on_holder_moved) + RegisterSignal(current_holder, COMSIG_MOVABLE_MOVED, PROC_REF(on_holder_moved)) get_new_turfs() @@ -527,7 +527,7 @@ return UnregisterSignal(parent, COMSIG_ATOM_USED_IN_CRAFT) - RegisterSignal(new_craft, COMSIG_ATOM_USED_IN_CRAFT, .proc/on_parent_crafted) + RegisterSignal(new_craft, COMSIG_ATOM_USED_IN_CRAFT, PROC_REF(on_parent_crafted)) set_parent_attached_to(new_craft) /// Handles putting the source for overlay lights into the light eater queue since we aren't tracked by [/atom/var/light_sources] diff --git a/code/datums/components/palette.dm b/code/datums/components/palette.dm index e0dc9cd2df3..e504494688b 100644 --- a/code/datums/components/palette.dm +++ b/code/datums/components/palette.dm @@ -34,10 +34,10 @@ src.colors = colors src.selected_color = selected_color || "#ffffff" - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF_SECONDARY, .proc/on_attack_self_secondary) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_PAINTING_TOOL_SET_COLOR, .proc/on_painting_tool_set_color) - RegisterSignal(parent, COMSIG_PAINTING_TOOL_GET_ADDITIONAL_DATA, .proc/get_palette_data) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF_SECONDARY, PROC_REF(on_attack_self_secondary)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_PAINTING_TOOL_SET_COLOR, PROC_REF(on_painting_tool_set_color)) + RegisterSignal(parent, COMSIG_PAINTING_TOOL_GET_ADDITIONAL_DATA, PROC_REF(get_palette_data)) /datum/component/palette/Destroy() QDEL_NULL(color_picker_menu) @@ -56,7 +56,7 @@ SIGNAL_HANDLER if(!color_picker_menu) - INVOKE_ASYNC(src, .proc/open_radial_menu, user) + INVOKE_ASYNC(src, PROC_REF(open_radial_menu), user) else close_radial_menu() @@ -65,9 +65,9 @@ /datum/component/palette/proc/open_radial_menu(mob/user) var/list/choices = build_radial_list() - color_picker_menu = show_radial_menu_persistent(user, parent, choices, select_proc = CALLBACK(src, .proc/choice_selected, user), tooltips = TRUE, radial_slice_icon = "palette_bg") + color_picker_menu = show_radial_menu_persistent(user, parent, choices, select_proc = CALLBACK(src, PROC_REF(choice_selected), user), tooltips = TRUE, radial_slice_icon = "palette_bg") - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/close_radial_menu) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(close_radial_menu)) /datum/component/palette/proc/build_radial_list() var/radial_list = list() diff --git a/code/datums/components/payment.dm b/code/datums/components/payment.dm index 027b7edb871..15a3ea83fa3 100644 --- a/code/datums/components/payment.dm +++ b/code/datums/components/payment.dm @@ -33,9 +33,9 @@ transaction_style = _style /datum/component/payment/RegisterWithParent() - RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE, .proc/attempt_charge) - RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE_CHANGE, .proc/change_cost) - RegisterSignal(SSdcs, COMSIG_GLOB_REVOLUTION_VICTORY, .proc/clean_up) + RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE, PROC_REF(attempt_charge)) + RegisterSignal(parent, COMSIG_OBJ_ATTEMPT_CHARGE_CHANGE, PROC_REF(change_cost)) + RegisterSignal(SSdcs, COMSIG_GLOB_REVOLUTION_VICTORY, PROC_REF(clean_up)) /datum/component/payment/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_OBJ_ATTEMPT_CHARGE, COMSIG_OBJ_ATTEMPT_CHARGE_CHANGE)) @@ -121,7 +121,7 @@ holochange.name = "[holochange.credits] credit holochip" if(ishuman(user)) var/mob/living/carbon/human/paying_customer = user - if(!INVOKE_ASYNC(paying_customer, /mob.proc/put_in_hands, holochange)) + if(!INVOKE_ASYNC(paying_customer, TYPE_PROC_REF(/mob, put_in_hands), holochange)) user.pulling = holochange else user.pulling = holochange diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index adafd6aeeae..62c6c9f3ecc 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -78,19 +78,19 @@ return ..() /datum/component/pellet_cloud/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/nullspace_parent) + RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(nullspace_parent)) if(isammocasing(parent)) - RegisterSignal(parent, COMSIG_PELLET_CLOUD_INIT, .proc/create_casing_pellets) + RegisterSignal(parent, COMSIG_PELLET_CLOUD_INIT, PROC_REF(create_casing_pellets)) else if(isgrenade(parent)) - RegisterSignal(parent, COMSIG_GRENADE_ARMED, .proc/grenade_armed) - RegisterSignal(parent, COMSIG_GRENADE_DETONATE, .proc/create_blast_pellets) + RegisterSignal(parent, COMSIG_GRENADE_ARMED, PROC_REF(grenade_armed)) + RegisterSignal(parent, COMSIG_GRENADE_DETONATE, PROC_REF(create_blast_pellets)) else if(islandmine(parent)) - RegisterSignal(parent, COMSIG_MINE_TRIGGERED, .proc/create_blast_pellets) + RegisterSignal(parent, COMSIG_MINE_TRIGGERED, PROC_REF(create_blast_pellets)) else if(issupplypod(parent)) - RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, .proc/create_blast_pellets) + RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, PROC_REF(create_blast_pellets)) //SKYRAT EDIT ADDITION BEGIN else if(ishorrorling(parent)) - RegisterSignal(parent, COMSIG_HORRORFORM_EXPLODE, .proc/create_blast_pellets) + RegisterSignal(parent, COMSIG_HORRORFORM_EXPLODE, PROC_REF(create_blast_pellets)) //SKYRAT EDIT END /datum/component/pellet_cloud/UnregisterFromParent() @@ -123,8 +123,8 @@ else //Smart spread spread = round((i / num_pellets - 0.5) * distro) - RegisterSignal(shell.loaded_projectile, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit) - RegisterSignal(shell.loaded_projectile, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range) + RegisterSignal(shell.loaded_projectile, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit)) + RegisterSignal(shell.loaded_projectile, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range)) shell.loaded_projectile.damage = original_damage shell.loaded_projectile.wound_bonus = original_wb shell.loaded_projectile.bare_wound_bonus = original_bwb @@ -132,7 +132,7 @@ var/turf/current_loc = get_turf(fired_from) if (!istype(target_loc) || !istype(current_loc) || !(shell.loaded_projectile)) return - INVOKE_ASYNC(shell, /obj/item/ammo_casing.proc/throw_proj, target, target_loc, shooter, params, spread, fired_from) + INVOKE_ASYNC(shell, TYPE_PROC_REF(/obj/item/ammo_casing, throw_proj), target, target_loc, shooter, params, spread, fired_from) if(i != num_pellets) shell.newshot() @@ -153,13 +153,13 @@ var/atom/A = parent if(isgrenade(parent)) // handle_martyrs can reduce the radius and thus the number of pellets we produce if someone dives on top of a frag grenade - INVOKE_ASYNC(src, .proc/handle_martyrs, triggerer) // note that we can modify radius in this proc + INVOKE_ASYNC(src, PROC_REF(handle_martyrs), triggerer) // note that we can modify radius in this proc else if(islandmine(parent)) var/obj/effect/mine/shrapnel/triggered_mine = parent if(triggered_mine.shred_triggerer && istype(triggerer)) // free shrapnel for the idiot who stepped on it if we're a mine that shreds the triggerer pellet_delta += radius // so they don't count against the later total for(var/i in 1 to radius) - INVOKE_ASYNC(src, .proc/pew, triggerer, TRUE) + INVOKE_ASYNC(src, PROC_REF(pew), triggerer, TRUE) if(radius < 1) return @@ -169,7 +169,7 @@ for(var/T in all_the_turfs_were_gonna_lacerate) var/turf/shootat_turf = T - INVOKE_ASYNC(src, .proc/pew, shootat_turf) + INVOKE_ASYNC(src, PROC_REF(pew), shootat_turf) /** * handle_martyrs() is used for grenades that shoot shrapnel to check if anyone threw themselves/were thrown on top of the grenade, thus absorbing a good chunk of the shrapnel @@ -219,7 +219,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) @@ -258,7 +258,7 @@ LAZYADDASSOC(targets_hit[target], "hits", 1) LAZYSET(targets_hit[target], "damage", damage) if(targets_hit[target]["hits"] == 1) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE) UnregisterSignal(P, list(COMSIG_PARENT_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT)) if(terminated == num_pellets) finalize() @@ -284,8 +284,8 @@ P.impacted = list(parent = TRUE) // don't hit the target we hit already with the flak P.suppressed = SUPPRESSED_VERY // set the projectiles to make no message so we can do our own aggregate message P.preparePixelProjectile(target, parent) - RegisterSignal(P, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit) - RegisterSignal(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), .proc/pellet_range) + RegisterSignal(P, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit)) + RegisterSignal(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range)) pellets += P P.fire() if(landmine_victim) @@ -353,10 +353,10 @@ if(ismob(nade.loc)) shooter = nade.loc LAZYINITLIST(bodies) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/grenade_dropped) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/grenade_moved) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(grenade_dropped)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(grenade_moved)) var/static/list/loc_connections = list( - COMSIG_ATOM_EXITED =.proc/grenade_uncrossed, + COMSIG_ATOM_EXITED = PROC_REF(grenade_uncrossed), ) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) @@ -373,7 +373,7 @@ LAZYCLEARLIST(bodies) for(var/mob/living/L in get_turf(parent)) - RegisterSignal(L, COMSIG_PARENT_QDELETING, .proc/on_target_qdel, override=TRUE) + RegisterSignal(L, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE) bodies += L /// Someone who was originally "under" the grenade has moved off the tile and is now eligible for being a martyr and "covering" it diff --git a/code/datums/components/phylactery.dm b/code/datums/components/phylactery.dm index e0b0c0897e8..03bab2c2980 100644 --- a/code/datums/components/phylactery.dm +++ b/code/datums/components/phylactery.dm @@ -43,15 +43,15 @@ src.stun_per_resurrection = stun_per_resurrection src.phylactery_color = phylactery_color - RegisterSignal(lich_mind, COMSIG_PARENT_QDELETING, .proc/on_lich_mind_lost) - RegisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH, .proc/check_if_lich_died) + RegisterSignal(lich_mind, COMSIG_PARENT_QDELETING, PROC_REF(on_lich_mind_lost)) + RegisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH, PROC_REF(check_if_lich_died)) var/obj/obj_parent = parent obj_parent.name = "ensouled [obj_parent.name]" obj_parent.add_atom_colour(phylactery_color, ADMIN_COLOUR_PRIORITY) obj_parent.AddComponent(/datum/component/stationloving, FALSE, TRUE) - RegisterSignal(obj_parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(obj_parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) SSpoints_of_interest.make_point_of_interest(obj_parent) @@ -128,11 +128,11 @@ // If we aren't gibbed, we need to check if the lich is // revived at some point between returning if(!gibbed) - RegisterSignal(died, COMSIG_LIVING_REVIVE, .proc/stop_timer) + RegisterSignal(died, COMSIG_LIVING_REVIVE, PROC_REF(stop_timer)) // Start revival var/time_to_revive = base_respawn_time + (num_resurrections * time_per_resurrection) - revive_timer = addtimer(CALLBACK(src, .proc/revive_lich, died), time_to_revive, TIMER_UNIQUE|TIMER_STOPPABLE) + revive_timer = addtimer(CALLBACK(src, PROC_REF(revive_lich), died), time_to_revive, TIMER_UNIQUE|TIMER_STOPPABLE) to_chat(died, span_green("You feel your soul being dragged back to this world... \ you will revive at your phylactery in [time_to_revive / 10 / 60] minute\s.")) diff --git a/code/datums/components/plumbing/IV_drip.dm b/code/datums/components/plumbing/IV_drip.dm index 2f35b3edd02..cc5be40a62c 100644 --- a/code/datums/components/plumbing/IV_drip.dm +++ b/code/datums/components/plumbing/IV_drip.dm @@ -13,8 +13,8 @@ /datum/component/plumbing/iv_drip/RegisterWithParent() . = ..() - RegisterSignal(parent, list(COMSIG_IV_ATTACH), .proc/update_attached) - RegisterSignal(parent, list(COMSIG_IV_DETACH), .proc/clear_attached) + RegisterSignal(parent, list(COMSIG_IV_ATTACH), PROC_REF(update_attached)) + RegisterSignal(parent, list(COMSIG_IV_DETACH), PROC_REF(clear_attached)) /datum/component/plumbing/iv_drip/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_IV_ATTACH)) diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm index 4a280ebf7d6..7039e584e10 100644 --- a/code/datums/components/plumbing/_plumbing.dm +++ b/code/datums/components/plumbing/_plumbing.dm @@ -50,15 +50,15 @@ if(start) //We're registering here because I need to check whether we start active or not, and this is just easier //Should be called after we finished. Done this way because other networks need to finish setting up aswell - RegisterSignal(parent, list(COMSIG_COMPONENT_ADDED), .proc/enable) + RegisterSignal(parent, list(COMSIG_COMPONENT_ADDED), PROC_REF(enable)) /datum/component/plumbing/RegisterWithParent() - RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), .proc/disable) - RegisterSignal(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), .proc/toggle_active) - RegisterSignal(parent, list(COMSIG_OBJ_HIDE), .proc/hide) - RegisterSignal(parent, list(COMSIG_ATOM_UPDATE_OVERLAYS), .proc/create_overlays) //called by lateinit on startup - RegisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE), .proc/on_parent_dir_change) //called when placed on a shuttle and it moves, and other edge cases - RegisterSignal(parent, list(COMSIG_MOVABLE_CHANGE_DUCT_LAYER), .proc/change_ducting_layer) + RegisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), PROC_REF(disable)) + RegisterSignal(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), PROC_REF(toggle_active)) + RegisterSignal(parent, list(COMSIG_OBJ_HIDE), PROC_REF(hide)) + RegisterSignal(parent, list(COMSIG_ATOM_UPDATE_OVERLAYS), PROC_REF(create_overlays)) //called by lateinit on startup + RegisterSignal(parent, list(COMSIG_ATOM_DIR_CHANGE), PROC_REF(on_parent_dir_change)) //called when placed on a shuttle and it moves, and other edge cases + RegisterSignal(parent, list(COMSIG_MOVABLE_CHANGE_DUCT_LAYER), PROC_REF(change_ducting_layer)) /datum/component/plumbing/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING, COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH, COMSIG_OBJ_HIDE, \ @@ -337,7 +337,7 @@ if(recipient_reagents_holder) UnregisterSignal(recipient_reagents_holder, COMSIG_PARENT_QDELETING) //stop tracking whoever we were tracking if(receiver) - RegisterSignal(receiver, COMSIG_PARENT_QDELETING, .proc/handle_reagent_del) //on deletion call a wrapper proc that clears us, and maybe reagents too + RegisterSignal(receiver, COMSIG_PARENT_QDELETING, PROC_REF(handle_reagent_del)) //on deletion call a wrapper proc that clears us, and maybe reagents too recipient_reagents_holder = receiver @@ -358,7 +358,7 @@ return // Defer to later frame because pixel_* is actually updated after all callbacks - addtimer(CALLBACK(parent_obj, /atom/.proc/update_appearance), 1) + addtimer(CALLBACK(parent_obj, TYPE_PROC_REF(/atom/, update_appearance)), 1) ///has one pipe input that only takes, example is manual output pipe /datum/component/plumbing/simple_demand diff --git a/code/datums/components/pricetag.dm b/code/datums/components/pricetag.dm index b034ad87c5e..dfa1471ec91 100644 --- a/code/datums/components/pricetag.dm +++ b/code/datums/components/pricetag.dm @@ -23,9 +23,9 @@ src.delete_on_unwrap = delete_on_unwrap /datum/component/pricetag/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EXPORTED, .proc/on_parent_sold) + RegisterSignal(parent, COMSIG_ITEM_EXPORTED, PROC_REF(on_parent_sold)) // Register this regardless of delete_on_unwrap because it could change by inherited components. - RegisterSignal(parent, COMSIG_ITEM_UNWRAPPED, .proc/on_parent_unwrap) + RegisterSignal(parent, COMSIG_ITEM_UNWRAPPED, PROC_REF(on_parent_unwrap)) /datum/component/pricetag/UnregisterFromParent() UnregisterSignal(parent, list( diff --git a/code/datums/components/punchcooldown.dm b/code/datums/components/punchcooldown.dm index d8688454f71..7c2ae1047fe 100644 --- a/code/datums/components/punchcooldown.dm +++ b/code/datums/components/punchcooldown.dm @@ -2,7 +2,7 @@ /datum/component/wearertargeting/punchcooldown signals = list(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_LIVING_SLAP_MOB) mobtype = /mob/living/carbon - proctype = .proc/reducecooldown + proctype = PROC_REF(reducecooldown) valid_slots = list(ITEM_SLOT_GLOVES) ///The warcry this generates var/warcry = "AT" @@ -11,7 +11,7 @@ . = ..() if(. == COMPONENT_INCOMPATIBLE) return - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/changewarcry) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(changewarcry)) ///Called on COMSIG_HUMAN_MELEE_UNARMED_ATTACK. Yells the warcry and and reduces punch cooldown. /datum/component/wearertargeting/punchcooldown/proc/reducecooldown(mob/living/carbon/M, atom/target) @@ -23,7 +23,7 @@ ///Called on COMSIG_ITEM_ATTACK_SELF. Allows you to change the warcry. /datum/component/wearertargeting/punchcooldown/proc/changewarcry(datum/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/do_changewarcry, user) + INVOKE_ASYNC(src, PROC_REF(do_changewarcry), user) /datum/component/wearertargeting/punchcooldown/proc/do_changewarcry(mob/user) var/input = tgui_input_text(user, "What do you want your battlecry to be?", "Battle Cry", max_length = 6) diff --git a/code/datums/components/puzzgrid.dm b/code/datums/components/puzzgrid.dm index 65ac1a00881..0f54fce9929 100644 --- a/code/datums/components/puzzgrid.dm +++ b/code/datums/components/puzzgrid.dm @@ -52,11 +52,11 @@ all_answers = puzzgrid.answers.Copy() if (!isnull(timer)) - addtimer(CALLBACK(src, .proc/out_of_time), timer) + addtimer(CALLBACK(src, PROC_REF(out_of_time)), timer) time_to_finish = world.time + timer /datum/component/puzzgrid/RegisterWithParent() - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) /datum/component/puzzgrid/UnregisterFromParent() UnregisterSignal(parent, COMSIG_ATOM_ATTACK_HAND) @@ -64,7 +64,7 @@ /datum/component/puzzgrid/proc/on_attack_hand(atom/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) /datum/component/puzzgrid/ui_interact(mob/user, datum/tgui/ui) . = ..() diff --git a/code/datums/components/radiation_countdown.dm b/code/datums/components/radiation_countdown.dm index dfb77d360af..b39a3e0cbf2 100644 --- a/code/datums/components/radiation_countdown.dm +++ b/code/datums/components/radiation_countdown.dm @@ -25,7 +25,7 @@ start_deletion_timer() /datum/component/radiation_countdown/proc/start_deletion_timer() - addtimer(CALLBACK(src, .proc/remove_self), TIME_UNTIL_DELETION, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(remove_self)), TIME_UNTIL_DELETION, TIMER_UNIQUE | TIMER_OVERRIDE) /datum/component/radiation_countdown/proc/remove_self() if (!HAS_TRAIT(parent, TRAIT_IRRADIATED)) @@ -34,7 +34,7 @@ qdel(src) /datum/component/radiation_countdown/RegisterWithParent() - RegisterSignal(parent, COMSIG_IN_THRESHOLD_OF_IRRADIATION, .proc/on_pre_potential_irradiation_within_range) + RegisterSignal(parent, COMSIG_IN_THRESHOLD_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation_within_range)) /datum/component/radiation_countdown/UnregisterFromParent() UnregisterSignal(parent, COMSIG_IN_THRESHOLD_OF_IRRADIATION) diff --git a/code/datums/components/reagent_refiller.dm b/code/datums/components/reagent_refiller.dm index 6d8bc8c04f8..017ec3c3c37 100644 --- a/code/datums/components/reagent_refiller.dm +++ b/code/datums/components/reagent_refiller.dm @@ -29,8 +29,8 @@ return ..() /datum/component/reagent_refiller/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/refill) - RegisterSignal(parent, COMSIG_ATOM_EXITED, .proc/delete_self) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(refill)) + RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(delete_self)) /datum/component/reagent_refiller/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_ATOM_EXITED)) @@ -53,7 +53,7 @@ if (!is_path_in_list(refill, whitelisted_reagents)) return - addtimer(CALLBACK(src, .proc/add_reagents, container, container.loc, refill, amount), time_to_refill) + addtimer(CALLBACK(src, PROC_REF(add_reagents), container, container.loc, refill, amount), time_to_refill) /// Refills the reagent container, and uses cell power if applicable /datum/component/reagent_refiller/proc/add_reagents(obj/item/reagent_containers/target, oldloc, reagent_to_refill, amount) diff --git a/code/datums/components/religious_tool.dm b/code/datums/components/religious_tool.dm index 6b1fdf1126b..f9dcd1164c0 100644 --- a/code/datums/components/religious_tool.dm +++ b/code/datums/components/religious_tool.dm @@ -29,8 +29,8 @@ catalyst_type = override_catalyst_type /datum/component/religious_tool/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY,.proc/AttemptActions) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(AttemptActions)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/religious_tool/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) @@ -55,7 +55,7 @@ SIGNAL_HANDLER if(istype(the_item, catalyst_type)) - INVOKE_ASYNC(src, /datum.proc/ui_interact, user) //asynchronous to avoid sleeping in a signal + INVOKE_ASYNC(src, TYPE_PROC_REF(/datum, ui_interact), user) //asynchronous to avoid sleeping in a signal /**********Sacrificing**********/ else if(operation_flags & RELIGION_TOOL_SACRIFICE) diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm index 77ac058c88d..3ac94f88257 100644 --- a/code/datums/components/remote_materials.dm +++ b/code/datums/components/remote_materials.dm @@ -26,13 +26,13 @@ handles linking back and forth. src.allow_standalone = allow_standalone src.mat_container_flags = mat_container_flags - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), .proc/OnMultitool) - RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, .proc/check_z_level) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(OnMultitool)) + RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(check_z_level)) var/turf/T = get_turf(parent) if (force_connect || (mapload && is_station_level(T.z))) - addtimer(CALLBACK(src, .proc/LateInitialize)) + addtimer(CALLBACK(src, PROC_REF(LateInitialize))) else if (allow_standalone) _MakeLocal() diff --git a/code/datums/components/riding/riding.dm b/code/datums/components/riding/riding.dm index 340ffe14302..b92c5edc2d8 100644 --- a/code/datums/components/riding/riding.dm +++ b/code/datums/components/riding/riding.dm @@ -58,12 +58,12 @@ /datum/component/riding/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/vehicle_turned) - RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, .proc/vehicle_mob_unbuckle) - RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, .proc/vehicle_mob_buckle) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/vehicle_moved) - RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/vehicle_bump) - RegisterSignal(parent, COMSIG_BUCKLED_CAN_Z_MOVE, .proc/riding_can_z_move) + RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(vehicle_turned)) + RegisterSignal(parent, COMSIG_MOVABLE_UNBUCKLE, PROC_REF(vehicle_mob_unbuckle)) + RegisterSignal(parent, COMSIG_MOVABLE_BUCKLE, PROC_REF(vehicle_mob_buckle)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(vehicle_moved)) + RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(vehicle_bump)) + RegisterSignal(parent, COMSIG_BUCKLED_CAN_Z_MOVE, PROC_REF(riding_can_z_move)) /** * This proc handles all of the proc calls to things like set_vehicle_dir_layer() that a type of riding datum needs to call on creation @@ -230,10 +230,10 @@ if(!istype(possible_bumped_door)) return for(var/occupant in movable_parent.buckled_mobs) - INVOKE_ASYNC(possible_bumped_door, /obj/machinery/door/.proc/bumpopen, occupant) + INVOKE_ASYNC(possible_bumped_door, TYPE_PROC_REF(/obj/machinery/door/, bumpopen), occupant) /datum/component/riding/proc/Unbuckle(atom/movable/M) - addtimer(CALLBACK(parent, /atom/movable/.proc/unbuckle_mob, M), 0, TIMER_UNIQUE) + addtimer(CALLBACK(parent, TYPE_PROC_REF(/atom/movable/, unbuckle_mob), M), 0, TIMER_UNIQUE) /datum/component/riding/proc/Process_Spacemove(direction, continuous_move) var/atom/movable/AM = parent diff --git a/code/datums/components/riding/riding_mob.dm b/code/datums/components/riding/riding_mob.dm index 185ac42d634..5ccc82541b9 100644 --- a/code/datums/components/riding/riding_mob.dm +++ b/code/datums/components/riding/riding_mob.dm @@ -41,9 +41,9 @@ /datum/component/riding/creature/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/check_emote) + RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(check_emote)) if(can_be_driven) - RegisterSignal(parent, COMSIG_RIDDEN_DRIVER_MOVE, .proc/driver_move) // this isn't needed on riding humans or cyborgs since the rider can't control them + RegisterSignal(parent, COMSIG_RIDDEN_DRIVER_MOVE, PROC_REF(driver_move)) // this isn't needed on riding humans or cyborgs since the rider can't control them /// Creatures need to be logged when being mounted /datum/component/riding/creature/proc/log_riding(mob/living/living_parent, mob/living/rider) @@ -85,7 +85,7 @@ ADD_TRAIT(ridden, TRAIT_AI_PAUSED, REF(src)) if(rider.pulling == ridden) rider.stop_pulling() - RegisterSignal(rider, COMSIG_LIVING_TRY_PULL, .proc/on_rider_try_pull) + RegisterSignal(rider, COMSIG_LIVING_TRY_PULL, PROC_REF(on_rider_try_pull)) return ..() /datum/component/riding/creature/proc/on_rider_try_pull(mob/living/rider_pulling, atom/movable/target, force) @@ -209,8 +209,8 @@ /datum/component/riding/creature/human/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/on_host_unarmed_melee) - RegisterSignal(parent, COMSIG_LIVING_SET_BODY_POSITION, .proc/check_carrier_fall_over) + RegisterSignal(parent, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(on_host_unarmed_melee)) + RegisterSignal(parent, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(check_carrier_fall_over)) /datum/component/riding/creature/human/log_riding(mob/living/living_parent, mob/living/rider) if(!istype(living_parent) || !istype(rider)) diff --git a/code/datums/components/riding/riding_vehicle.dm b/code/datums/components/riding/riding_vehicle.dm index 848f3ba33ef..207ef70bae1 100644 --- a/code/datums/components/riding/riding_vehicle.dm +++ b/code/datums/components/riding/riding_vehicle.dm @@ -7,7 +7,7 @@ /datum/component/riding/vehicle/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_RIDDEN_DRIVER_MOVE, .proc/driver_move) + RegisterSignal(parent, COMSIG_RIDDEN_DRIVER_MOVE, PROC_REF(driver_move)) /datum/component/riding/vehicle/riding_can_z_move(atom/movable/movable_parent, direction, turf/start, turf/destination, z_move_flags, mob/living/rider) if(!(z_move_flags & ZMOVE_CAN_FLY_CHECKS)) diff --git a/code/datums/components/rot.dm b/code/datums/components/rot.dm index 5a1cabcff29..4e99d27cee4 100644 --- a/code/datums/components/rot.dm +++ b/code/datums/components/rot.dm @@ -18,7 +18,7 @@ var/blockers = NONE var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) @@ -36,25 +36,25 @@ scaling_delay = scaling strength = severity - RegisterSignal(parent, list(COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_ANIMAL, COMSIG_ATOM_ATTACK_HAND), .proc/rot_react_touch) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/rot_hit_react) + RegisterSignal(parent, list(COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_ANIMAL, COMSIG_ATOM_ATTACK_HAND), PROC_REF(rot_react_touch)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(rot_hit_react)) if(ismovable(parent)) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) - RegisterSignal(parent, COMSIG_MOVABLE_BUMP, .proc/rot_react) + RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(rot_react)) if(isliving(parent)) - RegisterSignal(parent, COMSIG_LIVING_REVIVE, .proc/react_to_revive) //mobs stop this when they come to life - RegisterSignal(parent, COMSIG_LIVING_GET_PULLED, .proc/rot_react_touch) + RegisterSignal(parent, COMSIG_LIVING_REVIVE, PROC_REF(react_to_revive)) //mobs stop this when they come to life + RegisterSignal(parent, COMSIG_LIVING_GET_PULLED, PROC_REF(rot_react_touch)) if(iscarbon(parent)) var/mob/living/carbon/carbon_parent = parent RegisterSignal(carbon_parent.reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT, - COMSIG_REAGENTS_DEL_REAGENT), .proc/check_reagent) - RegisterSignal(parent, list(SIGNAL_ADDTRAIT(TRAIT_HUSK), SIGNAL_REMOVETRAIT(TRAIT_HUSK)), .proc/check_husk_trait) + COMSIG_REAGENTS_DEL_REAGENT), PROC_REF(check_reagent)) + RegisterSignal(parent, list(SIGNAL_ADDTRAIT(TRAIT_HUSK), SIGNAL_REMOVETRAIT(TRAIT_HUSK)), PROC_REF(check_husk_trait)) check_reagent(carbon_parent.reagents, null) check_husk_trait(null) if(ishuman(parent)) var/mob/living/carbon/human/human_parent = parent - RegisterSignal(parent, COMSIG_HUMAN_CORETEMP_CHANGE, .proc/check_for_temperature) + RegisterSignal(parent, COMSIG_HUMAN_CORETEMP_CHANGE, PROC_REF(check_for_temperature)) check_for_temperature(null, 0, human_parent.coretemperature) start_up(NONE) //If nothing's blocking it, start diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm index 389f074657f..f906917709d 100644 --- a/code/datums/components/rotation.dm +++ b/code/datums/components/rotation.dm @@ -37,13 +37,13 @@ source.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 src.rotation_flags = rotation_flags - src.AfterRotation = AfterRotation || CALLBACK(src, .proc/DefaultAfterRotation) + src.AfterRotation = AfterRotation || CALLBACK(src, PROC_REF(DefaultAfterRotation)) /datum/component/simple_rotation/proc/AddSignals() - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/RotateLeft) - RegisterSignal(parent, COMSIG_CLICK_ALT_SECONDARY, .proc/RotateRight) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/ExamineMessage) - RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(RotateLeft)) + RegisterSignal(parent, COMSIG_CLICK_ALT_SECONDARY, PROC_REF(RotateRight)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(ExamineMessage)) + RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/component/simple_rotation/proc/AddVerbs() var/obj/rotated_obj = parent diff --git a/code/datums/components/scope.dm b/code/datums/components/scope.dm index e6d928ce97a..8bb2d8e7e85 100644 --- a/code/datums/components/scope.dm +++ b/code/datums/components/scope.dm @@ -15,10 +15,10 @@ return ..() /datum/component/scope/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_move) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK_SECONDARY, .proc/on_secondary_afterattack) - RegisterSignal(parent, COMSIG_GUN_TRY_FIRE, .proc/on_gun_fire) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK_SECONDARY, PROC_REF(on_secondary_afterattack)) + RegisterSignal(parent, COMSIG_GUN_TRY_FIRE, PROC_REF(on_gun_fire)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/scope/UnregisterFromParent() UnregisterSignal(parent, list( @@ -58,7 +58,7 @@ if(!tracker?.given_turf || target == get_target(tracker.given_turf)) return NONE - INVOKE_ASYNC(source, /obj/item/gun.proc/fire_gun, get_target(tracker.given_turf), user) + INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item/gun, fire_gun), get_target(tracker.given_turf), user) return COMPONENT_CANCEL_GUN_FIRE /datum/component/scope/proc/on_examine(datum/source, mob/user, list/examine_list) @@ -114,10 +114,10 @@ tracker.range_modifier = range_modifier tracker.marksman = user tracker.view_list = getviewsize(user.client.view) - tracker.RegisterSignal(user, COMSIG_MOVABLE_MOVED, /atom/movable/screen/fullscreen/scope.proc/on_move) - tracker.RegisterSignal(user, COMSIG_VIEWDATA_UPDATE, /atom/movable/screen/fullscreen/scope.proc/on_viewdata_update) + tracker.RegisterSignal(user, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/fullscreen/scope, on_move)) + tracker.RegisterSignal(user, COMSIG_VIEWDATA_UPDATE, TYPE_PROC_REF(/atom/movable/screen/fullscreen/scope, on_viewdata_update)) tracker.calculate_params() - RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, .proc/stop_zooming) + RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, PROC_REF(stop_zooming)) START_PROCESSING(SSprojectiles, src) /** diff --git a/code/datums/components/seclight_attachable.dm b/code/datums/components/seclight_attachable.dm index d92466164f7..adc1b8ce934 100644 --- a/code/datums/components/seclight_attachable.dm +++ b/code/datums/components/seclight_attachable.dm @@ -89,15 +89,15 @@ add_light(starting_light) /datum/component/seclite_attachable/RegisterWithParent() - RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, .proc/on_parent_deconstructed) - RegisterSignal(parent, COMSIG_ATOM_EXITED, .proc/on_light_exit) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), .proc/on_screwdriver) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON_STATE, .proc/on_update_icon_state) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) - RegisterSignal(parent, COMSIG_ITEM_UI_ACTION_CLICK, .proc/on_action_click) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/on_parent_deleted) + RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_parent_deconstructed)) + RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(on_light_exit)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), PROC_REF(on_screwdriver)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON_STATE, PROC_REF(on_update_icon_state)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) + RegisterSignal(parent, COMSIG_ITEM_UI_ACTION_CLICK, PROC_REF(on_action_click)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_deleted)) /datum/component/seclite_attachable/UnregisterFromParent() UnregisterSignal(parent, list( @@ -236,7 +236,7 @@ if(!light || !is_light_removable) return - INVOKE_ASYNC(src, .proc/unscrew_light, source, user, tool) + INVOKE_ASYNC(src, PROC_REF(unscrew_light), source, user, tool) return COMPONENT_BLOCK_TOOL_ATTACK /// Invoked asyncronously from [proc/on_screwdriver]. Handles removing the light from our parent. diff --git a/code/datums/components/seethrough.dm b/code/datums/components/seethrough.dm index 5c43ede1182..450b3a6c421 100644 --- a/code/datums/components/seethrough.dm +++ b/code/datums/components/seethrough.dm @@ -29,7 +29,7 @@ src.animation_time = animation_time src.perimeter_reset_timer = perimeter_reset_timer - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/dismantle_perimeter) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(dismantle_perimeter)) setup_perimeter(parent) @@ -43,8 +43,8 @@ if(isnull(target)) continue - RegisterSignal(target, COMSIG_ATOM_ENTERED, .proc/on_entered) - RegisterSignal(target, COMSIG_ATOM_EXITED, .proc/on_exited) + RegisterSignal(target, COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) + RegisterSignal(target, COMSIG_ATOM_EXITED, PROC_REF(on_exited)) watched_turfs.Add(target) @@ -58,7 +58,7 @@ var/mob/mob = entered if(!mob.client) - RegisterSignal(mob, COMSIG_MOB_LOGIN, .proc/trick_mob) + RegisterSignal(mob, COMSIG_MOB_LOGIN, PROC_REF(trick_mob)) return if(mob in tricked_mobs) @@ -114,7 +114,7 @@ animate(user_overlay, alpha = target_alpha, time = animation_time) tricked_mobs[fool] = user_overlay - RegisterSignal(fool, COMSIG_MOB_LOGOUT, .proc/on_client_disconnect) + RegisterSignal(fool, COMSIG_MOB_LOGOUT, PROC_REF(on_client_disconnect)) ///Unrout ourselves after we somehow moved, and start a timer so we can re-restablish our behind area after standing still for a bit @@ -151,7 +151,7 @@ tricked_mobs.Remove(fool) UnregisterSignal(fool, COMSIG_MOB_LOGOUT) - RegisterSignal(fool, COMSIG_MOB_LOGIN, .proc/trick_mob) + RegisterSignal(fool, COMSIG_MOB_LOGIN, PROC_REF(trick_mob)) var/datum/hud/our_hud = fool.hud_used var/atom/movable/screen/plane_master/seethrough = our_hud.get_plane_master(SEETHROUGH_PLANE) seethrough.hide_plane(fool) diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm index c4b794f6788..f5689af556e 100644 --- a/code/datums/components/shell.dm +++ b/code/datums/components/shell.dm @@ -40,18 +40,18 @@ attach_circuit(starting_circuit) /datum/component/shell/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, .proc/on_attack_ghost) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, PROC_REF(on_attack_ghost)) if(!(shell_flags & SHELL_FLAG_CIRCUIT_UNMODIFIABLE)) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), .proc/on_multitool_act) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attack_by) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(on_multitool_act)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attack_by)) if(!(shell_flags & SHELL_FLAG_CIRCUIT_UNREMOVABLE)) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), .proc/on_screwdriver_act) - RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, .proc/on_object_deconstruct) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), PROC_REF(on_screwdriver_act)) + RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_object_deconstruct)) if(shell_flags & SHELL_FLAG_REQUIRE_ANCHOR) - RegisterSignal(parent, COMSIG_MOVABLE_SET_ANCHORED, .proc/on_set_anchored) - RegisterSignal(parent, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, .proc/on_atom_usb_cable_try_attach) - RegisterSignal(parent, COMSIG_MOVABLE_CIRCUIT_LOADED, .proc/on_load) + RegisterSignal(parent, COMSIG_MOVABLE_SET_ANCHORED, PROC_REF(on_set_anchored)) + RegisterSignal(parent, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, PROC_REF(on_atom_usb_cable_try_attach)) + RegisterSignal(parent, COMSIG_MOVABLE_CIRCUIT_LOADED, PROC_REF(on_load)) /datum/component/shell/proc/set_unremovable_circuit_components(list/components) if(unremovable_circuit_components) @@ -64,7 +64,7 @@ circuit_component = new circuit_component() circuit_component.removable = FALSE circuit_component.set_circuit_size(0) - RegisterSignal(circuit_component, COMSIG_CIRCUIT_COMPONENT_SAVE, .proc/save_component) + RegisterSignal(circuit_component, COMSIG_CIRCUIT_COMPONENT_SAVE, PROC_REF(save_component)) unremovable_circuit_components += circuit_component /datum/component/shell/proc/save_component(datum/source, list/objects) @@ -121,7 +121,7 @@ return if(attached_circuit) - INVOKE_ASYNC(attached_circuit, /datum.proc/ui_interact, ghost) + INVOKE_ASYNC(attached_circuit, TYPE_PROC_REF(/datum, ui_interact), ghost) /datum/component/shell/proc/on_examine(atom/movable/source, mob/user, list/examine_text) SIGNAL_HANDLER @@ -170,7 +170,7 @@ if(istype(item, /obj/item/inducer)) var/obj/item/inducer/inducer = item - INVOKE_ASYNC(inducer, /obj/item.proc/attack_atom, attached_circuit, attacker, list()) + INVOKE_ASYNC(inducer, TYPE_PROC_REF(/obj/item, attack_atom), attached_circuit, attacker, list()) return COMPONENT_NO_AFTERATTACK if(attached_circuit) @@ -306,14 +306,14 @@ locked = FALSE attached_circuit = circuitboard if(!(shell_flags & SHELL_FLAG_CIRCUIT_UNREMOVABLE) && !circuitboard.admin_only) - RegisterSignal(circuitboard, COMSIG_MOVABLE_MOVED, .proc/on_circuit_moved) + RegisterSignal(circuitboard, COMSIG_MOVABLE_MOVED, PROC_REF(on_circuit_moved)) if(shell_flags & SHELL_FLAG_REQUIRE_ANCHOR) - RegisterSignal(circuitboard, COMSIG_CIRCUIT_PRE_POWER_USAGE, .proc/override_power_usage) - RegisterSignal(circuitboard, COMSIG_PARENT_QDELETING, .proc/on_circuit_delete) + RegisterSignal(circuitboard, COMSIG_CIRCUIT_PRE_POWER_USAGE, PROC_REF(override_power_usage)) + RegisterSignal(circuitboard, COMSIG_PARENT_QDELETING, PROC_REF(on_circuit_delete)) for(var/obj/item/circuit_component/to_add as anything in unremovable_circuit_components) to_add.forceMove(attached_circuit) attached_circuit.add_component(to_add) - RegisterSignal(circuitboard, COMSIG_CIRCUIT_ADD_COMPONENT_MANUALLY, .proc/on_circuit_add_component_manually) + RegisterSignal(circuitboard, COMSIG_CIRCUIT_ADD_COMPONENT_MANUALLY, PROC_REF(on_circuit_add_component_manually)) if(attached_circuit.display_name != "") parent_atom.name = "[initial(parent_atom.name)] ([attached_circuit.display_name])" attached_circuit.set_locked(FALSE) diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm index 8ac76047a8b..86364155223 100644 --- a/code/datums/components/shielded.dm +++ b/code/datums/components/shielded.dm @@ -45,7 +45,7 @@ src.shield_icon_file = shield_icon_file src.shield_icon = shield_icon src.shield_inhand = shield_inhand - src.on_hit_effects = run_hit_callback || CALLBACK(src, .proc/default_run_hit_callback) + src.on_hit_effects = run_hit_callback || CALLBACK(src, PROC_REF(default_run_hit_callback)) if(isnull(starting_charges)) current_charges = max_charges else @@ -63,10 +63,10 @@ return ..() /datum/component/shielded/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equipped) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/lost_wearer) - RegisterSignal(parent, COMSIG_ITEM_HIT_REACT, .proc/on_hit_react) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/check_recharge_rune) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(lost_wearer)) + RegisterSignal(parent, COMSIG_ITEM_HIT_REACT, PROC_REF(on_hit_react)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(check_recharge_rune)) var/atom/shield = parent if(ismob(shield.loc)) var/mob/holder = shield.loc @@ -123,8 +123,8 @@ /datum/component/shielded/proc/set_wearer(mob/user) wearer = user - RegisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) - RegisterSignal(wearer, COMSIG_PARENT_QDELETING, .proc/lost_wearer) + RegisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) + RegisterSignal(wearer, COMSIG_PARENT_QDELETING, PROC_REF(lost_wearer)) if(current_charges) wearer.update_appearance(UPDATE_ICON) @@ -154,7 +154,7 @@ adjust_charge(-charge_loss) - INVOKE_ASYNC(src, .proc/actually_run_hit_callback, owner, attack_text, current_charges) + INVOKE_ASYNC(src, PROC_REF(actually_run_hit_callback), owner, attack_text, current_charges) if(!recharge_start_delay) // if recharge_start_delay is 0, we don't recharge return diff --git a/code/datums/components/shy.dm b/code/datums/components/shy.dm index d2e513abae0..8f71b61df46 100644 --- a/code/datums/components/shy.dm +++ b/code/datums/components/shy.dm @@ -44,11 +44,11 @@ src.machine_whitelist = machine_whitelist /datum/component/shy/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/on_clickon) - RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, .proc/on_try_pull) - RegisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_HUMAN_EARLY_UNARMED_ATTACK), .proc/on_unarmed_attack) - RegisterSignal(parent, COMSIG_TRY_STRIP, .proc/on_try_strip) - RegisterSignal(parent, COMSIG_TRY_ALT_ACTION, .proc/on_try_alt_action) + RegisterSignal(parent, COMSIG_MOB_CLICKON, PROC_REF(on_clickon)) + RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, PROC_REF(on_try_pull)) + RegisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_HUMAN_EARLY_UNARMED_ATTACK), PROC_REF(on_unarmed_attack)) + RegisterSignal(parent, COMSIG_TRY_STRIP, PROC_REF(on_try_strip)) + RegisterSignal(parent, COMSIG_TRY_ALT_ACTION, PROC_REF(on_try_alt_action)) /datum/component/shy/UnregisterFromParent() UnregisterSignal(parent, list( diff --git a/code/datums/components/shy_in_room.dm b/code/datums/components/shy_in_room.dm index acad303a1fc..cf431933963 100644 --- a/code/datums/components/shy_in_room.dm +++ b/code/datums/components/shy_in_room.dm @@ -15,11 +15,11 @@ src.message = message /datum/component/shy_in_room/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/on_clickon) - RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, .proc/on_try_pull) - RegisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_HUMAN_EARLY_UNARMED_ATTACK), .proc/on_unarmed_attack) - RegisterSignal(parent, COMSIG_TRY_STRIP, .proc/on_try_strip) - RegisterSignal(parent, COMSIG_TRY_ALT_ACTION, .proc/on_try_alt_action) + RegisterSignal(parent, COMSIG_MOB_CLICKON, PROC_REF(on_clickon)) + RegisterSignal(parent, COMSIG_LIVING_TRY_PULL, PROC_REF(on_try_pull)) + RegisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_HUMAN_EARLY_UNARMED_ATTACK), PROC_REF(on_unarmed_attack)) + RegisterSignal(parent, COMSIG_TRY_STRIP, PROC_REF(on_try_strip)) + RegisterSignal(parent, COMSIG_TRY_ALT_ACTION, PROC_REF(on_try_alt_action)) /datum/component/shy_in_room/UnregisterFromParent() diff --git a/code/datums/components/simple_access.dm b/code/datums/components/simple_access.dm index 04da72fac2e..b157b4a1874 100644 --- a/code/datums/components/simple_access.dm +++ b/code/datums/components/simple_access.dm @@ -9,14 +9,14 @@ if(!ismob(parent)) return COMPONENT_INCOMPATIBLE access = new_access - RegisterSignal(parent, COMSIG_MOB_TRIED_ACCESS, .proc/on_tried_access) + RegisterSignal(parent, COMSIG_MOB_TRIED_ACCESS, PROC_REF(on_tried_access)) if(!donor_atom) return if(isorgan(donor_atom)) - RegisterSignal(donor_atom, COMSIG_ORGAN_REMOVED, .proc/on_donor_removed) + RegisterSignal(donor_atom, COMSIG_ORGAN_REMOVED, PROC_REF(on_donor_removed)) else if(istype(donor_atom, /obj/item/implant)) - RegisterSignal(donor_atom, COMSIG_IMPLANT_REMOVED, .proc/on_donor_removed) - RegisterSignal(donor_atom, COMSIG_PARENT_QDELETING, .proc/on_donor_removed) + RegisterSignal(donor_atom, COMSIG_IMPLANT_REMOVED, PROC_REF(on_donor_removed)) + RegisterSignal(donor_atom, COMSIG_PARENT_QDELETING, PROC_REF(on_donor_removed)) /datum/component/simple_access/proc/on_tried_access(datum/source, atom/locked_thing) SIGNAL_HANDLER diff --git a/code/datums/components/singularity.dm b/code/datums/components/singularity.dm index d0076b9863b..282b823d5d6 100644 --- a/code/datums/components/singularity.dm +++ b/code/datums/components/singularity.dm @@ -49,7 +49,7 @@ /datum/component/singularity/Initialize( bsa_targetable = TRUE, consume_range = 0, - consume_callback = CALLBACK(src, .proc/default_singularity_act), + consume_callback = CALLBACK(src, PROC_REF(default_singularity_act)), disregard_failed_movements = FALSE, grav_pull = 4, notify_admins = TRUE, @@ -75,25 +75,25 @@ parent.AddElement(/datum/element/forced_gravity, FALSE) parent.AddElement(/datum/element/bsa_blocker) - RegisterSignal(parent, COMSIG_ATOM_BSA_BEAM, .proc/bluespace_reaction) + RegisterSignal(parent, COMSIG_ATOM_BSA_BEAM, PROC_REF(bluespace_reaction)) - RegisterSignal(parent, COMSIG_ATOM_BLOB_ACT, .proc/block_blob) + RegisterSignal(parent, COMSIG_ATOM_BLOB_ACT, PROC_REF(block_blob)) RegisterSignal(parent, list( COMSIG_ATOM_ATTACK_ANIMAL, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW, - ), .proc/consume_attack) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/consume_attackby) + ), PROC_REF(consume_attack)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(consume_attackby)) - RegisterSignal(parent, COMSIG_MOVABLE_PRE_MOVE, .proc/moved) - RegisterSignal(parent, COMSIG_ATOM_BUMPED, .proc/consume) + RegisterSignal(parent, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(moved)) + RegisterSignal(parent, COMSIG_ATOM_BUMPED, PROC_REF(consume)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) - RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, .proc/consume_bullets) + RegisterSignal(parent, COMSIG_ATOM_BULLET_ACT, PROC_REF(consume_bullets)) if (notify_admins) admin_investigate_setup() diff --git a/code/datums/components/sitcomlaughter.dm b/code/datums/components/sitcomlaughter.dm index 7a31c812749..8dfef21b749 100644 --- a/code/datums/components/sitcomlaughter.dm +++ b/code/datums/components/sitcomlaughter.dm @@ -1,7 +1,7 @@ /datum/component/wearertargeting/sitcomlaughter valid_slots = list(ITEM_SLOT_HANDS, ITEM_SLOT_BELT, ITEM_SLOT_ID, ITEM_SLOT_LPOCKET, ITEM_SLOT_RPOCKET, ITEM_SLOT_SUITSTORE, ITEM_SLOT_DEX_STORAGE) signals = list(COMSIG_MOB_CREAMED, COMSIG_ON_CARBON_SLIP, COMSIG_ON_VENDOR_CRUSH, COMSIG_MOB_CLUMSY_SHOOT_FOOT) - proctype = .proc/EngageInComedy + proctype = PROC_REF(EngageInComedy) mobtype = /mob/living ///Sounds used for when user has a sitcom action occur var/list/comedysounds = list('sound/items/SitcomLaugh1.ogg', 'sound/items/SitcomLaugh2.ogg', 'sound/items/SitcomLaugh3.ogg') @@ -28,6 +28,6 @@ SIGNAL_HANDLER if(!COOLDOWN_FINISHED(src, laugh_cooldown)) return - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, parent, pick(comedysounds), 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE), laugh_delay) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), parent, pick(comedysounds), 100, FALSE, SHORT_RANGE_SOUND_EXTRARANGE), laugh_delay) post_comedy_callback?.Invoke(source) COOLDOWN_START(src, laugh_cooldown, cooldown_time) diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index c201ee9c673..ce9c80c5d34 100644 --- a/code/datums/components/slippery.dm +++ b/code/datums/components/slippery.dm @@ -17,12 +17,12 @@ var/list/slot_whitelist = list(ITEM_SLOT_OCLOTHING, ITEM_SLOT_ICLOTHING, ITEM_SLOT_GLOVES, ITEM_SLOT_FEET, ITEM_SLOT_HEAD, ITEM_SLOT_MASK, ITEM_SLOT_BELT, ITEM_SLOT_NECK) ///what we give to connect_loc by default, makes slippable mobs moving over us slip var/static/list/default_connections = list( - COMSIG_ATOM_ENTERED = .proc/Slip, + COMSIG_ATOM_ENTERED = PROC_REF(Slip), ) ///what we give to connect_loc if we're an item and get equipped by a mob. makes slippable mobs moving over our holder slip var/static/list/holder_connections = list( - COMSIG_ATOM_ENTERED = .proc/Slip_on_wearer, + COMSIG_ATOM_ENTERED = PROC_REF(Slip_on_wearer), ) /// The connect_loc_behalf component for the holder_connections list. @@ -40,10 +40,10 @@ add_connect_loc_behalf_to_parent() if(ismovable(parent)) if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) else - RegisterSignal(parent, COMSIG_ATOM_ENTERED, .proc/Slip) + RegisterSignal(parent, COMSIG_ATOM_ENTERED, PROC_REF(Slip)) /datum/component/slippery/proc/add_connect_loc_behalf_to_parent() if(ismovable(parent)) @@ -95,7 +95,7 @@ holder = equipper qdel(GetComponent(/datum/component/connect_loc_behalf)) AddComponent(/datum/component/connect_loc_behalf, holder, holder_connections) - RegisterSignal(holder, COMSIG_PARENT_QDELETING, .proc/holder_deleted) + RegisterSignal(holder, COMSIG_PARENT_QDELETING, PROC_REF(holder_deleted)) /* * Detects if the holder mob is deleted. diff --git a/code/datums/components/smooth_tunes.dm b/code/datums/components/smooth_tunes.dm index b897e29f1a8..8c5a2f024c2 100644 --- a/code/datums/components/smooth_tunes.dm +++ b/code/datums/components/smooth_tunes.dm @@ -34,7 +34,7 @@ return ..() /datum/component/smooth_tunes/RegisterWithParent() - RegisterSignal(parent, COMSIG_ATOM_STARTING_INSTRUMENT,.proc/start_singing) + RegisterSignal(parent, COMSIG_ATOM_STARTING_INSTRUMENT, PROC_REF(start_singing)) /datum/component/smooth_tunes/UnregisterFromParent() UnregisterSignal(parent, COMSIG_ATOM_STARTING_INSTRUMENT) @@ -59,10 +59,10 @@ ///prevent more songs from being blessed concurrently, mob signal UnregisterSignal(parent, COMSIG_ATOM_STARTING_INSTRUMENT) ///and hook into the instrument this time, preventing other weird exploity stuff. - RegisterSignal(starting_song.parent, COMSIG_INSTRUMENT_TEMPO_CHANGE, .proc/tempo_change) - RegisterSignal(starting_song.parent, COMSIG_INSTRUMENT_END, .proc/stop_singing) + RegisterSignal(starting_song.parent, COMSIG_INSTRUMENT_TEMPO_CHANGE, PROC_REF(tempo_change)) + RegisterSignal(starting_song.parent, COMSIG_INSTRUMENT_END, PROC_REF(stop_singing)) if(!allow_repeats) - RegisterSignal(starting_song.parent, COMSIG_INSTRUMENT_REPEAT, .proc/stop_singing) + RegisterSignal(starting_song.parent, COMSIG_INSTRUMENT_REPEAT, PROC_REF(stop_singing)) linked_song = starting_song diff --git a/code/datums/components/soul_stealer.dm b/code/datums/components/soul_stealer.dm index 634f6cd4ccf..5e45de97419 100644 --- a/code/datums/components/soul_stealer.dm +++ b/code/datums/components/soul_stealer.dm @@ -13,8 +13,8 @@ return COMPONENT_INCOMPATIBLE /datum/component/soul_stealer/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/on_afterattack) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack)) /datum/component/soul_stealer/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PARENT_EXAMINE, COMSIG_ITEM_AFTERATTACK)) @@ -43,7 +43,7 @@ return if(ishuman(target)) - INVOKE_ASYNC(src, .proc/try_capture, target, user) + INVOKE_ASYNC(src, PROC_REF(try_capture), target, user) var/list/souls = recursive_list_resolve(weak_souls) diff --git a/code/datums/components/soulstoned.dm b/code/datums/components/soulstoned.dm index f173aa28b93..d15bdec0386 100644 --- a/code/datums/components/soulstoned.dm +++ b/code/datums/components/soulstoned.dm @@ -15,7 +15,7 @@ ADD_TRAIT(S, TRAIT_HANDS_BLOCKED, SOULSTONE_TRAIT) S.status_flags |= GODMODE - RegisterSignal(S, COMSIG_MOVABLE_MOVED, .proc/free_prisoner) + RegisterSignal(S, COMSIG_MOVABLE_MOVED, PROC_REF(free_prisoner)) /datum/component/soulstoned/proc/free_prisoner() SIGNAL_HANDLER diff --git a/code/datums/components/sound_player.dm b/code/datums/components/sound_player.dm index 08d25b548b5..ecbe804a9ea 100644 --- a/code/datums/components/sound_player.dm +++ b/code/datums/components/sound_player.dm @@ -21,7 +21,7 @@ src.sounds = sounds src.uses = uses - RegisterSignal(parent, signal_list, .proc/play_sound) + RegisterSignal(parent, signal_list, PROC_REF(play_sound)) /** * Attempt to play the sound on parent diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index 537f1ba6eab..1719b1a5a0e 100644 --- a/code/datums/components/spawner.dm +++ b/code/datums/components/spawner.dm @@ -21,7 +21,7 @@ if(_max_mobs) max_mobs=_max_mobs - RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), .proc/stop_spawning) + RegisterSignal(parent, list(COMSIG_PARENT_QDELETING), PROC_REF(stop_spawning)) START_PROCESSING(SSprocessing, src) /datum/component/spawner/process() diff --git a/code/datums/components/spill.dm b/code/datums/components/spill.dm index e04b24c31ef..27550cc933a 100644 --- a/code/datums/components/spill.dm +++ b/code/datums/components/spill.dm @@ -30,8 +30,8 @@ return COMPONENT_INCOMPATIBLE /datum/component/spill/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/equip_react) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/drop_react) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(equip_react)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(drop_react)) var/obj/item/master = parent preexisting_slot_flags = master.slot_flags master.slot_flags |= ITEM_SLOT_POCKETS @@ -46,7 +46,7 @@ SIGNAL_HANDLER if(slot & (ITEM_SLOT_LPOCKET|ITEM_SLOT_RPOCKET)) - RegisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN, .proc/knockdown_react, TRUE) + RegisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN, PROC_REF(knockdown_react), TRUE) else UnregisterSignal(equipper, COMSIG_LIVING_STATUS_KNOCKDOWN) diff --git a/code/datums/components/spin2win.dm b/code/datums/components/spin2win.dm index c7ce2d1e964..543ba15cc41 100644 --- a/code/datums/components/spin2win.dm +++ b/code/datums/components/spin2win.dm @@ -42,8 +42,8 @@ return ..() /datum/component/spin2win/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) /datum/component/spin2win/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PARENT_EXAMINE, COMSIG_ITEM_ATTACK_SECONDARY)) @@ -83,9 +83,9 @@ var/message = replacetext(start_spin_message, "%USER", spinning_user) spinning_user.visible_message(message) playsound(spinning_user, 'sound/weapons/fwoosh.ogg', 75, FALSE) - stop_spinning_timer_id = addtimer(CALLBACK(src, .proc/stop_spinning, spinning_user), 5 SECONDS, TIMER_STOPPABLE|TIMER_DELETE_ME) - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_spin_equipped) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_spin_dropped) + stop_spinning_timer_id = addtimer(CALLBACK(src, PROC_REF(stop_spinning), spinning_user), 5 SECONDS, TIMER_STOPPABLE|TIMER_DELETE_ME) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_spin_equipped)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_spin_dropped)) START_PROCESSING(SSprocessing, src) /datum/component/spin2win/proc/stop_spinning(mob/living/user) diff --git a/code/datums/components/spinny.dm b/code/datums/components/spinny.dm index 8135956d81b..29d5c777c49 100644 --- a/code/datums/components/spinny.dm +++ b/code/datums/components/spinny.dm @@ -1,7 +1,7 @@ /** * spinny.dm * - * It's a component that spins things a whole bunch, like [proc/dance_rotate] but without the sleeps + * It's a component that spins things a whole bunch, like [proc/dance_rotate] but without the sleeps) */ /datum/component/spinny dupe_mode = COMPONENT_DUPE_UNIQUE @@ -9,7 +9,7 @@ var/steps_left /// Turns clockwise by default, or counterclockwise if the reverse argument is TRUE var/turn_degrees = 90 - + /datum/component/spinny/Initialize(steps = 12, reverse = FALSE) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE @@ -30,4 +30,4 @@ return // 25% chance to make 2 turns instead of 1 since the old dance_rotate wasn't strictly clockwise/counterclockwise - spinny_boy.setDir(turn(spinny_boy.dir, turn_degrees * (prob(25) ? 2 : 1))) + spinny_boy.setDir(turn(spinny_boy.dir, turn_degrees * (prob(25) ? 2 : 1))) diff --git a/code/datums/components/spirit_holding.dm b/code/datums/components/spirit_holding.dm index d226c6df9f8..67ac0fac1bb 100644 --- a/code/datums/components/spirit_holding.dm +++ b/code/datums/components/spirit_holding.dm @@ -19,9 +19,9 @@ QDEL_NULL(bound_spirit) /datum/component/spirit_holding/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/on_destroy) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(on_destroy)) /datum/component/spirit_holding/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_PARENT_EXAMINE, COMSIG_ITEM_ATTACK_SELF, COMSIG_PARENT_QDELETING)) @@ -37,7 +37,7 @@ ///signal fired on self attacking parent /datum/component/spirit_holding/proc/on_attack_self(datum/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/attempt_spirit_awaken, user) + INVOKE_ASYNC(src, PROC_REF(attempt_spirit_awaken), user) /** * attempt_spirit_awaken: called from on_attack_self, polls ghosts to possess the item in the form @@ -80,8 +80,8 @@ bound_spirit.fully_replace_character_name(null, "The spirit of [input]") //Add new signals for parent and stop attempting to awaken - RegisterSignal(parent, COMSIG_ATOM_RELAYMOVE, .proc/block_buckle_message) - RegisterSignal(parent, COMSIG_BIBLE_SMACKED, .proc/on_bible_smacked) + RegisterSignal(parent, COMSIG_ATOM_RELAYMOVE, PROC_REF(block_buckle_message)) + RegisterSignal(parent, COMSIG_BIBLE_SMACKED, PROC_REF(on_bible_smacked)) attempting_awakening = FALSE ///signal fired from a mob moving inside the parent @@ -91,7 +91,7 @@ /datum/component/spirit_holding/proc/on_bible_smacked(datum/source, mob/living/user, direction) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/attempt_exorcism, user) + INVOKE_ASYNC(src, PROC_REF(attempt_exorcism), user) /** * attempt_exorcism: called from on_bible_smacked, takes time and if successful @@ -108,7 +108,7 @@ return playsound(parent, 'sound/effects/pray_chaplain.ogg',60,TRUE) UnregisterSignal(exorcised_movable, list(COMSIG_ATOM_RELAYMOVE, COMSIG_BIBLE_SMACKED)) - RegisterSignal(exorcised_movable, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) + RegisterSignal(exorcised_movable, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) to_chat(bound_spirit, span_userdanger("You were exorcised!")) QDEL_NULL(bound_spirit) exorcised_movable.name = initial(exorcised_movable.name) diff --git a/code/datums/components/splattercasting.dm b/code/datums/components/splattercasting.dm index ade34e99fc1..d2cc5bd96e0 100644 --- a/code/datums/components/splattercasting.dm +++ b/code/datums/components/splattercasting.dm @@ -17,10 +17,10 @@ /datum/component/splattercasting/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_SPECIES_LOSS, .proc/on_species_change) - RegisterSignal(parent, COMSIG_MOB_SPELL_PROJECTILE, .proc/on_spell_projectile) - RegisterSignal(parent, COMSIG_MOB_BEFORE_SPELL_CAST, .proc/on_before_spell_cast) - RegisterSignal(parent, COMSIG_MOB_AFTER_SPELL_CAST, .proc/on_after_spell_cast) + RegisterSignal(parent, COMSIG_SPECIES_LOSS, PROC_REF(on_species_change)) + RegisterSignal(parent, COMSIG_MOB_SPELL_PROJECTILE, PROC_REF(on_spell_projectile)) + RegisterSignal(parent, COMSIG_MOB_BEFORE_SPELL_CAST, PROC_REF(on_before_spell_cast)) + RegisterSignal(parent, COMSIG_MOB_AFTER_SPELL_CAST, PROC_REF(on_after_spell_cast)) /datum/component/splattercasting/UnregisterFromParent() . = ..() diff --git a/code/datums/components/squashable.dm b/code/datums/components/squashable.dm index ce0e91533e2..a8304320bdb 100644 --- a/code/datums/components/squashable.dm +++ b/code/datums/components/squashable.dm @@ -10,7 +10,7 @@ var/datum/callback/on_squash_callback ///signal list given to connect_loc var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index c8427ee980d..14714e33c76 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -23,32 +23,32 @@ ///what we set connect_loc to if parent is an item var/static/list/item_connections = list( - COMSIG_ATOM_ENTERED = .proc/play_squeak_crossed, + COMSIG_ATOM_ENTERED = PROC_REF(play_squeak_crossed), ) /datum/component/squeak/Initialize(custom_sounds, volume_override, chance_override, step_delay_override, use_delay_override, extrarange, falloff_exponent, fallof_distance) if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), .proc/play_squeak) + RegisterSignal(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), PROC_REF(play_squeak)) if(ismovable(parent)) - RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT, COMSIG_PROJECTILE_BEFORE_FIRE), .proc/play_squeak) + RegisterSignal(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT, COMSIG_PROJECTILE_BEFORE_FIRE), PROC_REF(play_squeak)) AddComponent(/datum/component/connect_loc_behalf, parent, item_connections) - RegisterSignal(parent, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react) + RegisterSignal(parent, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposing_react)) if(isitem(parent)) - RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), .proc/play_squeak) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/use_squeak) - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_HIT_REACT), PROC_REF(play_squeak)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(use_squeak)) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) if(istype(parent, /obj/item/clothing/shoes)) - RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, .proc/step_squeak) + RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, PROC_REF(step_squeak)) else if(isstructure(parent)) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/use_squeak) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(use_squeak)) if(istype(parent, /obj/item/organ/internal/liver)) // Liver squeaking is depending on them functioning like a clown's liver - RegisterSignal(parent, SIGNAL_REMOVETRAIT(TRAIT_COMEDY_METABOLISM), .proc/on_comedy_metabolism_removal) + RegisterSignal(parent, SIGNAL_REMOVETRAIT(TRAIT_COMEDY_METABOLISM), PROC_REF(on_comedy_metabolism_removal)) override_squeak_sounds = custom_sounds if(chance_override) @@ -111,8 +111,8 @@ /datum/component/squeak/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER holder = equipper - RegisterSignal(holder, COMSIG_MOVABLE_DISPOSING, .proc/disposing_react, override=TRUE) - RegisterSignal(holder, COMSIG_PARENT_QDELETING, .proc/holder_deleted, override=TRUE) + RegisterSignal(holder, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposing_react), override=TRUE) + RegisterSignal(holder, COMSIG_PARENT_QDELETING, PROC_REF(holder_deleted), override=TRUE) //override for the preqdeleted is necessary because putting parent in hands sends the signal that this proc is registered towards, //so putting an object in hands and then equipping the item on a clothing slot (without dropping it first) //will always runtime without override = TRUE @@ -134,7 +134,7 @@ SIGNAL_HANDLER //We don't need to worry about unregistering this signal as it will happen for us automaticaly when the holder is qdeleted - RegisterSignal(disposal_holder, COMSIG_ATOM_DIR_CHANGE, .proc/holder_dir_change) + RegisterSignal(disposal_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 a07c35ad8c4..b0425dcd1f6 100644 --- a/code/datums/components/stationloving.dm +++ b/code/datums/components/stationloving.dm @@ -18,15 +18,15 @@ relocate() /datum/component/stationloving/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/on_parent_pre_qdeleted) - RegisterSignal(parent, COMSIG_ITEM_IMBUE_SOUL, .proc/check_soul_imbue) - RegisterSignal(parent, COMSIG_ITEM_MARK_RETRIEVAL, .proc/check_mark_retrieval) + RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(on_parent_pre_qdeleted)) + RegisterSignal(parent, COMSIG_ITEM_IMBUE_SOUL, PROC_REF(check_soul_imbue)) + RegisterSignal(parent, COMSIG_ITEM_MARK_RETRIEVAL, PROC_REF(check_mark_retrieval)) // Relocate when we become unreachable - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_parent_moved) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_parent_moved)) // Relocate when our loc, or any of our loc's locs, becomes unreachable var/static/list/loc_connections = list( - COMSIG_MOVABLE_MOVED = .proc/on_parent_moved, - SIGNAL_ADDTRAIT(TRAIT_SECLUDED_LOCATION) = .proc/on_loc_secluded, + COMSIG_MOVABLE_MOVED = PROC_REF(on_parent_moved), + SIGNAL_ADDTRAIT(TRAIT_SECLUDED_LOCATION) = PROC_REF(on_loc_secluded), ) AddComponent(/datum/component/connect_containers, parent, loc_connections) diff --git a/code/datums/components/stationstuck.dm b/code/datums/components/stationstuck.dm index 73ef35abad1..6c838a6d71f 100644 --- a/code/datums/components/stationstuck.dm +++ b/code/datums/components/stationstuck.dm @@ -21,7 +21,7 @@ It has a punishment variable that is what happens to the parent when they leave if(!isliving(parent)) return COMPONENT_INCOMPATIBLE var/mob/living/L = parent - RegisterSignal(L, list(COMSIG_MOVABLE_Z_CHANGED), .proc/punish) + RegisterSignal(L, list(COMSIG_MOVABLE_Z_CHANGED), PROC_REF(punish)) punishment = _punishment message = _message stuck_zlevel = L.z diff --git a/code/datums/components/strong_pull.dm b/code/datums/components/strong_pull.dm index a76553a1ab6..f0cb206a650 100644 --- a/code/datums/components/strong_pull.dm +++ b/code/datums/components/strong_pull.dm @@ -17,7 +17,7 @@ Basically, the items they pull cannot be pulled (except by the puller) /datum/component/strong_pull/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_LIVING_START_PULL, .proc/on_pull) + RegisterSignal(parent, COMSIG_LIVING_START_PULL, PROC_REF(on_pull)) /** * Called when the parent grabs something, adds signals to the object to reject interactions @@ -25,8 +25,8 @@ Basically, the items they pull cannot be pulled (except by the puller) /datum/component/strong_pull/proc/on_pull(datum/source, atom/movable/pulled, state, force) SIGNAL_HANDLER strongpulling = pulled - RegisterSignal(strongpulling, COMSIG_ATOM_CAN_BE_PULLED, .proc/reject_further_pulls) - RegisterSignal(strongpulling, COMSIG_ATOM_NO_LONGER_PULLED, .proc/on_no_longer_pulled) + RegisterSignal(strongpulling, COMSIG_ATOM_CAN_BE_PULLED, PROC_REF(reject_further_pulls)) + RegisterSignal(strongpulling, COMSIG_ATOM_NO_LONGER_PULLED, PROC_REF(on_no_longer_pulled)) if(istype(strongpulling, /obj/structure/closet) && !istype(strongpulling, /obj/structure/closet/body_bag)) var/obj/structure/closet/grabbed_closet = strongpulling grabbed_closet.strong_grab = TRUE diff --git a/code/datums/components/subtype_picker.dm b/code/datums/components/subtype_picker.dm index 71576ac7edf..5ab4785e7a7 100644 --- a/code/datums/components/subtype_picker.dm +++ b/code/datums/components/subtype_picker.dm @@ -24,7 +24,7 @@ /datum/component/subtype_picker/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) /datum/component/subtype_picker/UnregisterFromParent() . = ..() @@ -33,7 +33,7 @@ ///signal called by the stat of the target changing /datum/component/subtype_picker/proc/on_attack_self(datum/target, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/pick_subtype, target, user) + INVOKE_ASYNC(src, PROC_REF(pick_subtype), target, user) /** * pick_subtype: turns the list of types to their description into all the data radial menus need @@ -60,7 +60,7 @@ */ /datum/component/subtype_picker/proc/pick_subtype(datum/target, mob/picker) - var/name_of_type = show_radial_menu(picker, target, built_radial_list, custom_check = CALLBACK(src, .proc/check_menu, target, picker), radius = 42, require_near = TRUE) + var/name_of_type = show_radial_menu(picker, target, built_radial_list, custom_check = CALLBACK(src, PROC_REF(check_menu), target, picker), radius = 42, require_near = TRUE) if(!name_of_type || !check_menu(target, picker)) return diff --git a/code/datums/components/summoning.dm b/code/datums/components/summoning.dm index b15fa075635..11dd3d68882 100644 --- a/code/datums/components/summoning.dm +++ b/code/datums/components/summoning.dm @@ -24,11 +24,11 @@ /datum/component/summoning/RegisterWithParent() if(ismachinery(parent) || isstructure(parent) || isgun(parent) || isprojectilespell(parent)) // turrets, etc - RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(parent)) - RegisterSignal(parent, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(parent, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) /datum/component/summoning/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_POST_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT)) @@ -68,7 +68,7 @@ spawned_mobs += L if(faction != null) L.faction = faction - RegisterSignal(L, COMSIG_LIVING_DEATH, .proc/on_spawned_death) // so we can remove them from the list, etc (for mobs with corpses) + RegisterSignal(L, COMSIG_LIVING_DEATH, PROC_REF(on_spawned_death)) // so we can remove them from the list, etc (for mobs with corpses) playsound(spawn_location,spawn_sound, 50, TRUE) spawn_location.visible_message(span_danger("[L] [spawn_text].")) diff --git a/code/datums/components/supermatter_crystal.dm b/code/datums/components/supermatter_crystal.dm index 83aa393c9b4..8ec74ec4b80 100644 --- a/code/datums/components/supermatter_crystal.dm +++ b/code/datums/components/supermatter_crystal.dm @@ -7,16 +7,16 @@ /datum/component/supermatter_crystal/Initialize(datum/callback/tool_act_callback, datum/callback/consume_callback) - RegisterSignal(parent, COMSIG_ATOM_BLOB_ACT, .proc/blob_hit) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, .proc/paw_hit) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, .proc/animal_hit) - RegisterSignal(parent, COMSIG_ATOM_HULK_ATTACK, .proc/hulk_hit) - RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, .proc/unarmed_hit) - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/hand_hit) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby_hit) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WRENCH), .proc/tool_hit) - RegisterSignal(parent, COMSIG_ATOM_BUMPED, .proc/bumped_hit) - RegisterSignal(parent, COMSIG_ATOM_INTERCEPT_Z_FALL, .proc/intercept_z_fall) + RegisterSignal(parent, COMSIG_ATOM_BLOB_ACT, PROC_REF(blob_hit)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_PAW, PROC_REF(paw_hit)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_ANIMAL, PROC_REF(animal_hit)) + RegisterSignal(parent, COMSIG_ATOM_HULK_ATTACK, PROC_REF(hulk_hit)) + RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(unarmed_hit)) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(hand_hit)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_hit)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WRENCH), PROC_REF(tool_hit)) + RegisterSignal(parent, COMSIG_ATOM_BUMPED, PROC_REF(bumped_hit)) + RegisterSignal(parent, COMSIG_ATOM_INTERCEPT_Z_FALL, PROC_REF(intercept_z_fall)) src.tool_act_callback = tool_act_callback src.consume_callback = consume_callback diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm index afbb7bcd22b..829d1128b63 100644 --- a/code/datums/components/surgery_initiator.dm +++ b/code/datums/components/surgery_initiator.dm @@ -18,7 +18,7 @@ return ..() /datum/component/surgery_initiator/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_ATTACK, .proc/initiate_surgery_moment) + RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(initiate_surgery_moment)) /datum/component/surgery_initiator/UnregisterFromParent() UnregisterSignal(parent, COMSIG_ITEM_ATTACK) @@ -38,7 +38,7 @@ SIGNAL_HANDLER if(!isliving(target)) return - INVOKE_ASYNC(src, .proc/do_initiate_surgery_moment, target, user) + INVOKE_ASYNC(src, PROC_REF(do_initiate_surgery_moment), target, user) return COMPONENT_CANCEL_ATTACK_CHAIN /datum/component/surgery_initiator/proc/do_initiate_surgery_moment(mob/living/target, mob/user) @@ -69,8 +69,8 @@ last_user_ref = WEAKREF(user) surgery_target_ref = WEAKREF(target) - RegisterSignal(user, COMSIG_MOB_SELECTED_ZONE_SET, .proc/on_set_selected_zone) - RegisterSignal(target, COMSIG_MOB_SURGERY_STARTED, .proc/on_mob_surgery_started) + RegisterSignal(user, COMSIG_MOB_SELECTED_ZONE_SET, PROC_REF(on_set_selected_zone)) + RegisterSignal(target, COMSIG_MOB_SURGERY_STARTED, PROC_REF(on_mob_surgery_started)) ui_interact(user) diff --git a/code/datums/components/swabbing.dm b/code/datums/components/swabbing.dm index 3b1ace6c23b..29dd07b44ff 100644 --- a/code/datums/components/swabbing.dm +++ b/code/datums/components/swabbing.dm @@ -21,10 +21,10 @@ This component is used in vat growing to swab for microbiological samples which if(!isitem(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, .proc/try_to_swab) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/handle_overlays) - RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, .proc/handle_icon) + RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(try_to_swab)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(handle_overlays)) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, PROC_REF(handle_icon)) src.can_swab_objs = can_swab_objs src.can_swab_turfs = can_swab_turfs @@ -97,7 +97,7 @@ This component is used in vat growing to swab for microbiological samples which return to_chat(user, span_notice("You start swabbing [target] for samples!")) - INVOKE_ASYNC(src, .proc/async_try_to_swab, target, user) + INVOKE_ASYNC(src, PROC_REF(async_try_to_swab), target, user) /datum/component/swabbing/proc/async_try_to_swab(atom/target, mob/user) if(!do_after(user, 3 SECONDS, target)) // Start swabbing boi diff --git a/code/datums/components/swarming.dm b/code/datums/components/swarming.dm index 56493cd9e6a..76ba8a3548a 100644 --- a/code/datums/components/swarming.dm +++ b/code/datums/components/swarming.dm @@ -4,8 +4,8 @@ var/is_swarming = FALSE var/list/swarm_members = list() var/static/list/swarming_loc_connections = list( - COMSIG_ATOM_EXITED =.proc/leave_swarm, - COMSIG_ATOM_ENTERED = .proc/join_swarm + COMSIG_ATOM_EXITED = PROC_REF(leave_swarm), + COMSIG_ATOM_ENTERED = PROC_REF(join_swarm) ) diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index c358b6aa12b..d78efbf2983 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -45,7 +45,7 @@ var/mob/P = parent to_chat(P, span_notice("You are now able to launch tackles! You can do so by activating throw intent, and clicking on your target with an empty hand.")) - addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE) /datum/component/tackler/Destroy() var/mob/P = parent @@ -53,9 +53,9 @@ return ..() /datum/component/tackler/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_CLICKON, .proc/checkTackle) - RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, .proc/sack) - RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, .proc/registerTackle) + RegisterSignal(parent, COMSIG_MOB_CLICKON, PROC_REF(checkTackle)) + RegisterSignal(parent, COMSIG_MOVABLE_IMPACT, PROC_REF(sack)) + RegisterSignal(parent, COMSIG_MOVABLE_POST_THROW, PROC_REF(registerTackle)) /datum/component/tackler/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_MOB_CLICKON, COMSIG_MOVABLE_IMPACT, COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_POST_THROW)) @@ -104,7 +104,7 @@ tackling = TRUE - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/checkObstacle) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(checkObstacle)) playsound(user, 'sound/weapons/thudswoosh.ogg', 40, TRUE, -1) var/leap_word = isfeline(user) ? "pounce" : "leap" //If cat, "pounce" instead of "leap". // SKYRAT EDIT - FELINE TRAITS. Was: isfelinid(user) @@ -119,7 +119,7 @@ user.Knockdown(base_knockdown, ignore_canstun = TRUE) user.adjustStaminaLoss(stamina_cost) user.throw_at(A, range, speed, user, FALSE) - addtimer(CALLBACK(src, .proc/resetTackle), base_knockdown, TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(resetTackle)), base_knockdown, TIMER_STOPPABLE) return(COMSIG_MOB_CANCEL_CLICKON) /** @@ -151,7 +151,7 @@ user.toggle_throw_mode() if(!iscarbon(hit)) if(hit.density) - INVOKE_ASYNC(src, .proc/splat, user, hit) + INVOKE_ASYNC(src, PROC_REF(splat), user, hit) return var/mob/living/carbon/target = hit @@ -212,7 +212,7 @@ target.Paralyze(5) target.Knockdown(30) if(ishuman(target) && ishuman(user)) - INVOKE_ASYNC(S.dna.species, /datum/species.proc/grab, S, T) + INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T) S.setGrabState(GRAB_PASSIVE) if(5 to INFINITY) // absolutely BODIED @@ -226,7 +226,7 @@ target.Paralyze(5) target.Knockdown(30) if(ishuman(target) && ishuman(user)) - INVOKE_ASYNC(S.dna.species, /datum/species.proc/grab, S, T) + INVOKE_ASYNC(S.dna.species, TYPE_PROC_REF(/datum/species, grab), S, T) S.setGrabState(GRAB_AGGRESSIVE) diff --git a/code/datums/components/tactical.dm b/code/datums/components/tactical.dm index f823d726a41..ec78f3dfeb9 100644 --- a/code/datums/components/tactical.dm +++ b/code/datums/components/tactical.dm @@ -9,8 +9,8 @@ src.allowed_slot = allowed_slot /datum/component/tactical/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/modify) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/unmodify) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(modify)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(unmodify)) /datum/component/tactical/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) @@ -45,7 +45,7 @@ I.override = TRUE source.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "sneaking_mission", I) I.layer = ABOVE_MOB_LAYER - RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, .proc/on_z_move) + RegisterSignal(parent, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_z_move)) /datum/component/tactical/proc/unmodify(obj/item/source, mob/user) SIGNAL_HANDLER diff --git a/code/datums/components/tameable.dm b/code/datums/components/tameable.dm index 4b39d713fee..5c85c61f2d7 100644 --- a/code/datums/components/tameable.dm +++ b/code/datums/components/tameable.dm @@ -25,9 +25,9 @@ src.after_tame = after_tame - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/try_tame) - RegisterSignal(parent, COMSIG_SIMPLEMOB_SENTIENCEPOTION, .proc/on_tame) //Instantly succeeds - RegisterSignal(parent, COMSIG_SIMPLEMOB_TRANSFERPOTION, .proc/on_tame) //Instantly succeeds + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(try_tame)) + RegisterSignal(parent, COMSIG_SIMPLEMOB_SENTIENCEPOTION, PROC_REF(on_tame)) //Instantly succeeds + RegisterSignal(parent, COMSIG_SIMPLEMOB_TRANSFERPOTION, PROC_REF(on_tame)) //Instantly succeeds /datum/component/tameable/proc/try_tame(datum/source, obj/item/food, mob/living/attacker, params) SIGNAL_HANDLER diff --git a/code/datums/components/tattoo.dm b/code/datums/components/tattoo.dm index b467b898a78..152b5971471 100644 --- a/code/datums/components/tattoo.dm +++ b/code/datums/components/tattoo.dm @@ -33,7 +33,7 @@ parent.RemoveElement(/datum/element/art/commoner) /datum/component/tattoo/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/tattoo/UnregisterFromParent() UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) @@ -43,7 +43,7 @@ examine_list += span_boldnotice(tattoo_description) /datum/component/tattoo/proc/setup_tatted_owner(mob/living/carbon/new_owner) - RegisterSignal(new_owner, COMSIG_PARENT_EXAMINE, .proc/on_bodypart_owner_examine) + RegisterSignal(new_owner, COMSIG_PARENT_EXAMINE, PROC_REF(on_bodypart_owner_examine)) /datum/component/tattoo/proc/clear_tatted_owner(mob/living/carbon/old_owner) UnregisterSignal(old_owner, COMSIG_PARENT_EXAMINE) diff --git a/code/datums/components/technointrovert.dm b/code/datums/components/technointrovert.dm index d49681814c5..c6f51f80416 100644 --- a/code/datums/components/technointrovert.dm +++ b/code/datums/components/technointrovert.dm @@ -14,8 +14,8 @@ src.message = message /datum/component/technointrovert/RegisterWithParent() - RegisterSignal(parent, COMSIG_TRY_USE_MACHINE, .proc/on_try_use_machine) - RegisterSignal(parent, COMSIG_TRY_WIRES_INTERACT, .proc/on_try_wires_interact) + RegisterSignal(parent, COMSIG_TRY_USE_MACHINE, PROC_REF(on_try_use_machine)) + RegisterSignal(parent, COMSIG_TRY_WIRES_INTERACT, PROC_REF(on_try_wires_interact)) /datum/component/technointrovert/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_TRY_USE_MACHINE, COMSIG_TRY_WIRES_INTERACT)) diff --git a/code/datums/components/technoshy.dm b/code/datums/components/technoshy.dm index 8a45c7d62c8..e8d4441a287 100644 --- a/code/datums/components/technoshy.dm +++ b/code/datums/components/technoshy.dm @@ -20,8 +20,8 @@ src.whitelist = whitelist /datum/component/technoshy/RegisterWithParent() - RegisterSignal(parent, COMSIG_TRY_USE_MACHINE, .proc/on_try_use_machine) - RegisterSignal(parent, COMSIG_TRY_WIRES_INTERACT, .proc/on_try_wires_interact) + RegisterSignal(parent, COMSIG_TRY_USE_MACHINE, PROC_REF(on_try_use_machine)) + RegisterSignal(parent, COMSIG_TRY_WIRES_INTERACT, PROC_REF(on_try_wires_interact)) /datum/component/technoshy/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_TRY_USE_MACHINE, COMSIG_TRY_WIRES_INTERACT)) diff --git a/code/datums/components/tether.dm b/code/datums/components/tether.dm index c17293708e5..347af914752 100644 --- a/code/datums/components/tether.dm +++ b/code/datums/components/tether.dm @@ -14,7 +14,7 @@ src.tether_name = initial(tmp.name) else src.tether_name = tether_name - RegisterSignal(parent, list(COMSIG_MOVABLE_PRE_MOVE), .proc/checkTether) + RegisterSignal(parent, list(COMSIG_MOVABLE_PRE_MOVE), PROC_REF(checkTether)) /datum/component/tether/proc/checkTether(mob/mover, newloc) SIGNAL_HANDLER diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm index 536f6d36e51..874c5739c09 100644 --- a/code/datums/components/thermite.dm +++ b/code/datums/components/thermite.dm @@ -46,9 +46,9 @@ overlay = mutable_appearance('icons/effects/effects.dmi', "thermite") master.add_overlay(overlay) - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/attackby_react) - RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, .proc/flame_react) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_react)) + RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, PROC_REF(flame_react)) /datum/component/thermite/UnregisterFromParent() UnregisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT) @@ -70,7 +70,7 @@ amount += _amount if (burn_timer) // prevent people from skipping a longer timer deltimer(burn_timer) - burn_timer = addtimer(CALLBACK(src, .proc/burn_parent, usr), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE) + burn_timer = addtimer(CALLBACK(src, PROC_REF(burn_parent), usr), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE) /** * Used to begin the thermite burning process @@ -83,9 +83,9 @@ master.cut_overlay(overlay) playsound(master, 'sound/items/welder.ogg', 100, TRUE) fakefire = new(master) - burn_timer = addtimer(CALLBACK(src, .proc/burn_parent, user), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE) + burn_timer = addtimer(CALLBACK(src, PROC_REF(burn_parent), user), min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE) UnregisterFromParent() - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/delete_fire) //in case parent gets deleted, get ready to delete the fire + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(delete_fire)) //in case parent gets deleted, get ready to delete the fire /** * Used to actually melt parent diff --git a/code/datums/components/tippable.dm b/code/datums/components/tippable.dm index 45289f9756c..a200de340be 100644 --- a/code/datums/components/tippable.dm +++ b/code/datums/components/tippable.dm @@ -54,9 +54,9 @@ src.roleplay_callback = roleplay_callback /datum/component/tippable/RegisterWithParent() - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND_SECONDARY, .proc/interact_with_tippable) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND_SECONDARY, PROC_REF(interact_with_tippable)) if (roleplay_friendly) - RegisterSignal(parent, COMSIG_MOB_EMOTE, .proc/accept_roleplay) + RegisterSignal(parent, COMSIG_MOB_EMOTE, PROC_REF(accept_roleplay)) /datum/component/tippable/UnregisterFromParent() @@ -89,9 +89,9 @@ return if(is_tipped) - INVOKE_ASYNC(src, .proc/try_untip, source, user) + INVOKE_ASYNC(src, PROC_REF(try_untip), source, user) else - INVOKE_ASYNC(src, .proc/try_tip, source, user) + INVOKE_ASYNC(src, PROC_REF(try_tip), source, user) return COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN @@ -155,7 +155,7 @@ else if(self_right_time <= 0) right_self(tipped_mob) else - self_untip_timer = addtimer(CALLBACK(src, .proc/right_self, tipped_mob), self_right_time, TIMER_UNIQUE | TIMER_STOPPABLE) + self_untip_timer = addtimer(CALLBACK(src, PROC_REF(right_self), tipped_mob), self_right_time, TIMER_UNIQUE | TIMER_STOPPABLE) /** * Try to untip a mob that has been tipped. @@ -254,6 +254,6 @@ return var/time_left = timeleft(self_untip_timer) deltimer(self_untip_timer) - self_untip_timer = addtimer(CALLBACK(src, .proc/right_self, user), time_left * 0.75, TIMER_UNIQUE | TIMER_STOPPABLE) + self_untip_timer = addtimer(CALLBACK(src, PROC_REF(right_self), user), time_left * 0.75, TIMER_UNIQUE | TIMER_STOPPABLE) roleplayed = TRUE roleplay_callback?.Invoke(user) diff --git a/code/datums/components/toggle_suit.dm b/code/datums/components/toggle_suit.dm index 903bfbf4009..9a5ec84edbf 100644 --- a/code/datums/components/toggle_suit.dm +++ b/code/datums/components/toggle_suit.dm @@ -20,8 +20,8 @@ src.base_icon_state = atom_parent.base_icon_state || atom_parent.icon_state /datum/component/toggle_icon/RegisterWithParent() - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/on_alt_click) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_alt_click)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/toggle_icon/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_PARENT_EXAMINE)) diff --git a/code/datums/components/transforming.dm b/code/datums/components/transforming.dm index 218127b30e4..c16c20f99a7 100644 --- a/code/datums/components/transforming.dm +++ b/code/datums/components/transforming.dm @@ -80,9 +80,9 @@ /datum/component/transforming/RegisterWithParent() var/obj/item/item_parent = parent - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/on_attack_self) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) if(item_parent.sharpness || sharpness_on) - RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, .proc/on_sharpen) + RegisterSignal(parent, COMSIG_ITEM_SHARPEN_ACT, PROC_REF(on_sharpen)) /datum/component/transforming/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_ITEM_SHARPEN_ACT)) diff --git a/code/datums/components/trapdoor.dm b/code/datums/components/trapdoor.dm index 2a40aadc946..8d373b494e4 100644 --- a/code/datums/components/trapdoor.dm +++ b/code/datums/components/trapdoor.dm @@ -53,19 +53,18 @@ /datum/component/trapdoor/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_TURF_CHANGE, .proc/turf_changed_pre) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_TURF_CHANGE, PROC_REF(turf_changed_pre)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) if(!src.assembly) - RegisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK, .proc/on_link_requested) + RegisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK, PROC_REF(on_link_requested)) else - RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, .proc/toggle_trapdoor) - + RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, PROC_REF(toggle_trapdoor)) // SKYRAT EDIT START - Trapdoors shouldn't be targeted by SSDecay. if(isturf(parent)) var/turf/turf_parent = parent turf_parent.turf_flags &= ~CAN_DECAY_BREAK_1 // SKYRAT EDIT END - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), .proc/try_unlink) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(try_unlink)) /datum/component/trapdoor/UnregisterFromParent() . = ..() @@ -84,7 +83,7 @@ source.balloon_alert(user, "can't unlink trapdoor when its open") return source.balloon_alert(user, "unlinking trapdoor") - INVOKE_ASYNC(src, .proc/async_try_unlink, source, user, tool) + INVOKE_ASYNC(src, PROC_REF(async_try_unlink), source, user, tool) return /datum/component/trapdoor/proc/async_try_unlink(turf/source, mob/user, obj/item/tool) @@ -97,7 +96,7 @@ assembly.stored_decals = list() UnregisterSignal(assembly, COMSIG_ASSEMBLY_PULSED) UnregisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL)) - RegisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK, .proc/on_link_requested) + RegisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK, PROC_REF(on_link_requested)) assembly = null source.balloon_alert(user, "trapdoor unlinked") @@ -129,8 +128,8 @@ src.assembly = assembly assembly.linked = TRUE UnregisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK) - RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, .proc/toggle_trapdoor) - RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), .proc/try_unlink) + RegisterSignal(assembly, COMSIG_ASSEMBLY_PULSED, PROC_REF(toggle_trapdoor)) + RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(try_unlink)) ///signal called by our assembly being pulsed /datum/component/trapdoor/proc/toggle_trapdoor(datum/source) @@ -146,7 +145,7 @@ var/turf/open/dying_trapdoor = parent if((flags & CHANGETURF_TRAPDOOR_INDUCED) == 0) //not a process of the trapdoor if(!IS_OPEN(parent) && !ispath(path, /turf/closed) && !ispath(path, /turf/open/openspace)) // allow people to place tiles on plating / change tiles without breaking the trapdoor - post_change_callbacks += CALLBACK(src, /datum/component/trapdoor.proc/carry_over_trapdoor, path, conspicuous, assembly) + post_change_callbacks += CALLBACK(src, TYPE_PROC_REF(/datum/component/trapdoor, carry_over_trapdoor), path, conspicuous, assembly) return // otherwise, break trapdoor dying_trapdoor.visible_message(span_warning("The trapdoor mechanism in [dying_trapdoor] is broken!")) @@ -155,7 +154,7 @@ assembly.stored_decals.Cut() assembly = null return - post_change_callbacks += CALLBACK(src, /datum/component/trapdoor.proc/carry_over_trapdoor, trapdoor_turf_path, conspicuous, assembly) + post_change_callbacks += CALLBACK(src, TYPE_PROC_REF(/datum/component/trapdoor, carry_over_trapdoor), trapdoor_turf_path, conspicuous, assembly) /** * ## carry_over_trapdoor @@ -186,7 +185,7 @@ var/turf/open/trapdoor_turf = parent ///we want to save this turf's decals as they were right before deletion, so this is the point where we begin listening if(assembly) - RegisterSignal(parent, COMSIG_TURF_DECAL_DETACHED, .proc/decal_detached) + RegisterSignal(parent, COMSIG_TURF_DECAL_DETACHED, PROC_REF(decal_detached)) playsound(trapdoor_turf, 'sound/machines/trapdoor/trapdoor_open.ogg', 50) trapdoor_turf.visible_message(span_warning("[trapdoor_turf] swings open!")) trapdoor_turf.ChangeTurf(/turf/open/openspace, flags = CHANGETURF_INHERIT_AIR | CHANGETURF_TRAPDOOR_INDUCED) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index 54a6a18e06d..4413ec35f46 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -85,13 +85,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() @@ -173,7 +173,7 @@ return // blocked wield from item wielded = TRUE ADD_TRAIT(parent,TRAIT_WIELDED,src) - RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands) + RegisterSignal(user, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands)) wield_callback?.Invoke(parent, user) // update item stats and name @@ -201,8 +201,8 @@ offhand_item.name = "[parent_item.name] - offhand" offhand_item.desc = "Your second grip on [parent_item]." offhand_item.wielded = TRUE - RegisterSignal(offhand_item, COMSIG_ITEM_DROPPED, .proc/on_drop) - RegisterSignal(offhand_item, COMSIG_PARENT_QDELETING, .proc/on_destroy) + RegisterSignal(offhand_item, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) + RegisterSignal(offhand_item, COMSIG_PARENT_QDELETING, PROC_REF(on_destroy)) user.put_in_inactive_hand(offhand_item) /** diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm index e8ffd33792c..08e0cc986c4 100644 --- a/code/datums/components/udder.dm +++ b/code/datums/components/udder.dm @@ -17,8 +17,8 @@ src.on_milk_callback = on_milk_callback /datum/component/udder/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) /datum/component/udder/UnregisterFromParent() QDEL_NULL(udder) @@ -135,7 +135,7 @@ return if(udder_mob.gender == FEMALE) START_PROCESSING(SSobj, src) - RegisterSignal(udder_mob, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, .proc/on_mob_attacking) + RegisterSignal(udder_mob, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(on_mob_attacking)) /obj/item/udder/gutlunch/process(delta_time) var/mob/living/simple_animal/hostile/asteroid/gutlunch/gutlunch = udder_mob diff --git a/code/datums/components/unbreakable.dm b/code/datums/components/unbreakable.dm index 0d27f7bc39c..44661ac02d7 100644 --- a/code/datums/components/unbreakable.dm +++ b/code/datums/components/unbreakable.dm @@ -11,7 +11,7 @@ return ..() /datum/component/unbreakable/RegisterWithParent() - RegisterSignal(parent, COMSIG_MOB_STATCHANGE, .proc/surge) + RegisterSignal(parent, COMSIG_MOB_STATCHANGE, PROC_REF(surge)) /datum/component/unbreakable/UnregisterFromParent() UnregisterSignal(parent, COMSIG_MOB_STATCHANGE) diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index e166405795d..2659150cd4e 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -51,20 +51,20 @@ if(!isitem(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/OnAttackBy) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/interact) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy)) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact)) if(istype(parent, /obj/item/implant)) - RegisterSignal(parent, COMSIG_IMPLANT_ACTIVATED, .proc/implant_activation) - RegisterSignal(parent, COMSIG_IMPLANT_IMPLANTING, .proc/implanting) - RegisterSignal(parent, COMSIG_IMPLANT_OTHER, .proc/old_implant) - RegisterSignal(parent, COMSIG_IMPLANT_EXISTING_UPLINK, .proc/new_implant) + RegisterSignal(parent, COMSIG_IMPLANT_ACTIVATED, PROC_REF(implant_activation)) + RegisterSignal(parent, COMSIG_IMPLANT_IMPLANTING, PROC_REF(implanting)) + RegisterSignal(parent, COMSIG_IMPLANT_OTHER, PROC_REF(old_implant)) + RegisterSignal(parent, COMSIG_IMPLANT_EXISTING_UPLINK, PROC_REF(new_implant)) else if(istype(parent, /obj/item/modular_computer/tablet)) - RegisterSignal(parent, COMSIG_TABLET_CHANGE_ID, .proc/new_ringtone) - RegisterSignal(parent, COMSIG_TABLET_CHECK_DETONATE, .proc/check_detonate) + RegisterSignal(parent, COMSIG_TABLET_CHANGE_ID, PROC_REF(new_ringtone)) + RegisterSignal(parent, COMSIG_TABLET_CHECK_DETONATE, PROC_REF(check_detonate)) else if(istype(parent, /obj/item/radio)) - RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, .proc/new_frequency) + RegisterSignal(parent, COMSIG_RADIO_NEW_FREQUENCY, PROC_REF(new_frequency)) else if(istype(parent, /obj/item/pen)) - RegisterSignal(parent, COMSIG_PEN_ROTATED, .proc/pen_rotation) + RegisterSignal(parent, COMSIG_PEN_ROTATED, PROC_REF(pen_rotation)) if(owner) src.owner = owner @@ -84,7 +84,7 @@ uplink_handler.purchase_log = purchase_log else uplink_handler = uplink_handler_override - RegisterSignal(uplink_handler, COMSIG_UPLINK_HANDLER_ON_UPDATE, .proc/handle_uplink_handler_update) + RegisterSignal(uplink_handler, COMSIG_UPLINK_HANDLER_ON_UPDATE, PROC_REF(handle_uplink_handler_update)) if(!lockable) active = TRUE locked = FALSE @@ -135,7 +135,7 @@ return active = TRUE if(user) - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) // an unlocked uplink blocks also opening the PDA or headset menu return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/code/datums/components/usb_port.dm b/code/datums/components/usb_port.dm index 387cf60b739..8c805422e87 100644 --- a/code/datums/components/usb_port.dm +++ b/code/datums/components/usb_port.dm @@ -39,17 +39,17 @@ component = new circuit_component(null) if(!should_register) component.register_usb_parent(parent) - RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_SAVE, .proc/save_component) + RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_SAVE, PROC_REF(save_component)) circuit_components += component if(should_register) RegisterWithParent() /datum/component/usb_port/RegisterWithParent() - RegisterSignal(parent, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, .proc/on_atom_usb_cable_try_attach) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(parent, COMSIG_MOVABLE_CIRCUIT_LOADED, .proc/on_load) + RegisterSignal(parent, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, PROC_REF(on_atom_usb_cable_try_attach)) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_MOVABLE_CIRCUIT_LOADED, PROC_REF(on_load)) for(var/obj/item/circuit_component/component as anything in circuit_components) component.register_usb_parent(parent) @@ -120,7 +120,7 @@ /datum/component/usb_port/proc/attach_circuit_components(obj/item/integrated_circuit/circuitboard) for(var/obj/item/circuit_component/component as anything in circuit_components) circuitboard.add_component(component) - RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_REMOVED, .proc/on_circuit_component_removed) + RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_REMOVED, PROC_REF(on_circuit_component_removed)) /datum/component/usb_port/proc/on_examine(datum/source, mob/user, list/examine_text) SIGNAL_HANDLER @@ -174,9 +174,9 @@ if(!new_physical_object) new_physical_object = attached_circuit - RegisterSignal(attached_circuit, COMSIG_CIRCUIT_SHELL_REMOVED, .proc/on_circuit_shell_removed) - RegisterSignal(attached_circuit, COMSIG_PARENT_QDELETING, .proc/on_circuit_deleting) - RegisterSignal(attached_circuit, COMSIG_CIRCUIT_SET_SHELL, .proc/on_set_shell) + RegisterSignal(attached_circuit, COMSIG_CIRCUIT_SHELL_REMOVED, PROC_REF(on_circuit_shell_removed)) + RegisterSignal(attached_circuit, COMSIG_PARENT_QDELETING, PROC_REF(on_circuit_deleting)) + RegisterSignal(attached_circuit, COMSIG_CIRCUIT_SET_SHELL, PROC_REF(on_set_shell)) set_physical_object(new_physical_object) return COMSIG_USB_CABLE_ATTACHED @@ -190,8 +190,8 @@ var/atom/atom_parent = parent usb_cable_beam = atom_parent.Beam(new_physical_object, "usb_cable_beam", 'icons/obj/wiremod.dmi') - RegisterSignal(new_physical_object, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(new_physical_object, COMSIG_PARENT_EXAMINE, .proc/on_examine_shell) + RegisterSignal(new_physical_object, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(new_physical_object, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine_shell)) physical_object = new_physical_object // Adds support for loading circuits without shells but with usb cables, or loading circuits with shells because the shells might not load first. diff --git a/code/datums/components/vacuum.dm b/code/datums/components/vacuum.dm index ff403899775..4c242fa954d 100644 --- a/code/datums/components/vacuum.dm +++ b/code/datums/components/vacuum.dm @@ -15,9 +15,9 @@ return COMPONENT_INCOMPATIBLE if (connected_bag) attach_bag(null, connected_bag) - RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/suck) - RegisterSignal(parent, COMSIG_VACUUM_BAG_ATTACH, .proc/attach_bag) - RegisterSignal(parent, COMSIG_VACUUM_BAG_DETACH, .proc/detach_bag) + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, PROC_REF(suck)) + RegisterSignal(parent, COMSIG_VACUUM_BAG_ATTACH, PROC_REF(attach_bag)) + RegisterSignal(parent, COMSIG_VACUUM_BAG_DETACH, PROC_REF(detach_bag)) /** * Called when parent moves, deligates vacuuming functionality @@ -39,7 +39,7 @@ return // suck the things - INVOKE_ASYNC(src, .proc/suck_items, tile) + INVOKE_ASYNC(src, PROC_REF(suck_items), tile) /** * Sucks up items as possible from a provided turf into the connected trash bag @@ -71,7 +71,7 @@ SIGNAL_HANDLER vacuum_bag = new_bag - RegisterSignal(new_bag, COMSIG_PARENT_QDELETING, .proc/detach_bag) + RegisterSignal(new_bag, COMSIG_PARENT_QDELETING, PROC_REF(detach_bag)) /** * Handler for when a trash bag is detached diff --git a/code/datums/components/wearertargeting.dm b/code/datums/components/wearertargeting.dm index cbfec78d11f..a7405ee9560 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 = GLOBAL_PROC_REF(pass) var/mobtype = /mob/living /datum/component/wearertargeting/Initialize() if(!isitem(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) /datum/component/wearertargeting/proc/on_equip(datum/source, mob/equipper, slot) SIGNAL_HANDLER diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm index ac379962672..9c795fb8a18 100644 --- a/code/datums/components/wet_floor.dm +++ b/code/datums/components/wet_floor.dm @@ -29,12 +29,12 @@ permanent = _permanent if(!permanent) START_PROCESSING(SSwet_floors, src) - addtimer(CALLBACK(src, .proc/gc, TRUE), 1) //GC after initialization. + addtimer(CALLBACK(src, PROC_REF(gc), TRUE), 1) //GC after initialization. last_process = world.time /datum/component/wet_floor/RegisterWithParent() - RegisterSignal(parent, COMSIG_TURF_IS_WET, .proc/is_wet) - RegisterSignal(parent, COMSIG_TURF_MAKE_DRY, .proc/dry) + RegisterSignal(parent, COMSIG_TURF_IS_WET, PROC_REF(is_wet)) + RegisterSignal(parent, COMSIG_TURF_MAKE_DRY, PROC_REF(dry)) /datum/component/wet_floor/UnregisterFromParent() UnregisterSignal(parent, list(COMSIG_TURF_IS_WET, COMSIG_TURF_MAKE_DRY)) @@ -96,7 +96,7 @@ qdel(parent.GetComponent(/datum/component/slippery)) return - parent.LoadComponent(/datum/component/slippery, intensity, lube_flags, CALLBACK(src, .proc/AfterSlip)) + parent.LoadComponent(/datum/component/slippery, intensity, lube_flags, CALLBACK(src, PROC_REF(AfterSlip))) /datum/component/wet_floor/proc/dry(datum/source, strength = TURF_WET_WATER, immediate = FALSE, duration_decrease = INFINITY) SIGNAL_HANDLER diff --git a/code/datums/dash_weapon.dm b/code/datums/dash_weapon.dm index a156efc17e8..1dfa0b6bff0 100644 --- a/code/datums/dash_weapon.dm +++ b/code/datums/dash_weapon.dm @@ -64,7 +64,7 @@ spot_one.Beam(spot_two, beam_effect, time = beam_length) playsound(target_turf, dash_sound, 25, TRUE) current_charges-- - addtimer(CALLBACK(src, .proc/charge), charge_rate) + addtimer(CALLBACK(src, PROC_REF(charge)), charge_rate) owner?.update_action_buttons_icon() return TRUE diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 265ed0e5620..19fb8f77dda 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -93,7 +93,7 @@ advance_diseases += P var/replace_num = advance_diseases.len + 1 - DISEASE_LIMIT //amount of diseases that need to be removed to fit this one if(replace_num > 0) - sortTim(advance_diseases, /proc/cmp_advdisease_resistance_asc) + sortTim(advance_diseases, GLOBAL_PROC_REF(cmp_advdisease_resistance_asc)) for(var/i in 1 to replace_num) var/datum/disease/advance/competition = advance_diseases[i] if(totalTransmittable() > competition.totalResistance()) @@ -438,7 +438,7 @@ symptoms += SSdisease.list_symptoms.Copy() do if(user) - var/symptom = tgui_input_list(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom", sort_list(symptoms, /proc/cmp_typepaths_asc)) + var/symptom = tgui_input_list(user, "Choose a symptom to add ([i] remaining)", "Choose a Symptom", sort_list(symptoms, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(symptom)) return else if(istext(symptom)) diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index c37b42928d3..2224849bb75 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -64,6 +64,6 @@ if(power >= 2 && prob(30)) to_chat(M, span_userdanger("[pick("You have a coughing fit!", "You can't stop coughing!")]")) M.Immobilize(20) - addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 6) - addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 12) - addtimer(CALLBACK(M, /mob/.proc/emote, "cough"), 18) + addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/, emote), "cough"), 6) + addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/, emote), "cough"), 12) + addtimer(CALLBACK(M, TYPE_PROC_REF(/mob/, emote), "cough"), 18) diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 4690eb2f2a4..f8f800be584 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -380,12 +380,12 @@ if(M.getBruteLoss() + M.getFireLoss() >= 103 && !active_coma) //SKYRAT EDIT: ORIGINAL: 70 - Adjusts this to remain 37.5% of total health(plus crit health). Because 70 is alot less health here then it is on tg. to_chat(M, span_warning("You feel yourself slip into a regenerative coma...")) active_coma = TRUE - addtimer(CALLBACK(src, .proc/coma, M), 60) + addtimer(CALLBACK(src, PROC_REF(coma), M), 60) /datum/symptom/heal/coma/proc/coma(mob/living/M) M.fakedeath("regenerative_coma", !deathgasp) - addtimer(CALLBACK(src, .proc/uncoma, M), 300) + addtimer(CALLBACK(src, PROC_REF(uncoma), M), 300) /datum/symptom/heal/coma/proc/uncoma(mob/living/M) diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index 344bb9df603..220385b34e6 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -33,11 +33,11 @@ if(3, 4) if(!(H.hairstyle == "Bald") && !(H.hairstyle == "Balding Hair")) to_chat(H, span_warning("Your hair starts to fall out in clumps...")) - addtimer(CALLBACK(src, .proc/Shed, H, FALSE), 50) + addtimer(CALLBACK(src, PROC_REF(Shed), H, FALSE), 50) if(5) if(!(H.facial_hairstyle == "Shaved") || !(H.hairstyle == "Bald")) to_chat(H, span_warning("Your hair starts to fall out in clumps...")) - addtimer(CALLBACK(src, .proc/Shed, H, TRUE), 50) + addtimer(CALLBACK(src, PROC_REF(Shed), H, TRUE), 50) /datum/symptom/shedding/proc/Shed(mob/living/carbon/human/H, fullbald) if(fullbald) diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 8cb50a70739..1cd353a9249 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -33,7 +33,7 @@ /datum/disease/pierrot_throat/after_add() - RegisterSignal(affected_mob, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(affected_mob, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/disease/pierrot_throat/proc/handle_speech(datum/source, list/speech_args) diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 1ab15eeee7f..bf91abfe635 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -918,10 +918,10 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) spawn_gibs() set_species(/datum/species/skeleton) if(prob(90)) - addtimer(CALLBACK(src, .proc/death), 30) + addtimer(CALLBACK(src, PROC_REF(death)), 30) if(5) to_chat(src, span_phobia("LOOK UP!")) - addtimer(CALLBACK(src, .proc/something_horrible_mindmelt), 30) + addtimer(CALLBACK(src, PROC_REF(something_horrible_mindmelt)), 30) /mob/living/carbon/human/proc/something_horrible_mindmelt() if(!is_blind()) @@ -931,4 +931,4 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) eyes.Remove(src) qdel(eyes) visible_message(span_notice("[src] looks up and their eyes melt away!"), span_userdanger("I understand now.")) - addtimer(CALLBACK(src, .proc/adjustOrganLoss, ORGAN_SLOT_BRAIN, 200), 20) + addtimer(CALLBACK(src, PROC_REF(adjustOrganLoss), ORGAN_SLOT_BRAIN, 200), 20) diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm index fa7218ed7e7..28df9188881 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_ON_HOST_DESTROY) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/OnTargetDelete, override = TRUE) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(OnTargetDelete), override = TRUE) /datum/element/proc/OnTargetDelete(datum/source, force) SIGNAL_HANDLER diff --git a/code/datums/elements/art.dm b/code/datums/elements/art.dm index 0c90b3bb401..46b97448001 100644 --- a/code/datums/elements/art.dm +++ b/code/datums/elements/art.dm @@ -8,7 +8,7 @@ if(!isatom(target) || isarea(target)) return ELEMENT_INCOMPATIBLE impressiveness = impress - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/element/art/Detach(datum/target) UnregisterSignal(target, COMSIG_PARENT_EXAMINE) @@ -40,7 +40,7 @@ if(!isliving(user)) return if(!DOING_INTERACTION_WITH_TARGET(user, source)) - INVOKE_ASYNC(src, .proc/appraise, source, user) //Do not sleep the proc. + INVOKE_ASYNC(src, PROC_REF(appraise), source, user) //Do not sleep the proc. /datum/element/art/proc/appraise(atom/source, mob/user) to_chat(user, span_notice("You start appraising [source]...")) diff --git a/code/datums/elements/atmos_requirements.dm b/code/datums/elements/atmos_requirements.dm index ad4448e6379..7feed788ff9 100644 --- a/code/datums/elements/atmos_requirements.dm +++ b/code/datums/elements/atmos_requirements.dm @@ -19,7 +19,7 @@ stack_trace("[type] added to [target] without any requirements specified.") src.atmos_requirements = atmos_requirements src.unsuitable_atmos_damage = unsuitable_atmos_damage - RegisterSignal(target, COMSIG_LIVING_HANDLE_BREATHING, .proc/on_non_stasis_life) + RegisterSignal(target, COMSIG_LIVING_HANDLE_BREATHING, PROC_REF(on_non_stasis_life)) /datum/element/atmos_requirements/Detach(datum/target) . = ..() diff --git a/code/datums/elements/atmos_sensitive.dm b/code/datums/elements/atmos_sensitive.dm index 74740d46e75..5940762cd33 100644 --- a/code/datums/elements/atmos_sensitive.dm +++ b/code/datums/elements/atmos_sensitive.dm @@ -11,7 +11,7 @@ return ELEMENT_INCOMPATIBLE var/atom/to_track = target to_track.AddElement(/datum/element/connect_loc, pass_on) - RegisterSignal(to_track, COMSIG_MOVABLE_MOVED, .proc/react_to_move) + RegisterSignal(to_track, COMSIG_MOVABLE_MOVED, PROC_REF(react_to_move)) if(!mapload && isopenturf(to_track.loc)) var/turf/open/new_open = to_track.loc diff --git a/code/datums/elements/attack_equip.dm b/code/datums/elements/attack_equip.dm index 01571743106..b5bea09406d 100644 --- a/code/datums/elements/attack_equip.dm +++ b/code/datums/elements/attack_equip.dm @@ -9,7 +9,7 @@ . = ..() if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/on_item_attack) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(on_item_attack)) /datum/element/attack_equip/Detach(datum/source, ...) . = ..() @@ -28,7 +28,7 @@ return if(attire.mob_can_equip(target, attire.slot_flags, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) - INVOKE_ASYNC(src, .proc/equip, attire, sharp_dresser, user) + INVOKE_ASYNC(src, PROC_REF(equip), attire, sharp_dresser, user) return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/code/datums/elements/backblast.dm b/code/datums/elements/backblast.dm index df8be6cdc7b..4daece9f5c9 100644 --- a/code/datums/elements/backblast.dm +++ b/code/datums/elements/backblast.dm @@ -25,9 +25,9 @@ src.range = range if(plumes == 1) - RegisterSignal(target, COMSIG_GUN_FIRED, .proc/gun_fired_simple) + RegisterSignal(target, COMSIG_GUN_FIRED, PROC_REF(gun_fired_simple)) else - RegisterSignal(target, COMSIG_GUN_FIRED, .proc/gun_fired) + RegisterSignal(target, COMSIG_GUN_FIRED, PROC_REF(gun_fired)) /datum/element/backblast/Detach(datum/source) if(source) @@ -48,7 +48,7 @@ for(var/i in 1 to plumes) var/this_angle = SIMPLIFY_DEGREES(starting_angle + ((i - 1) * iter_offset)) var/turf/target_turf = get_turf_in_angle(this_angle, get_turf(user), 10) - INVOKE_ASYNC(src, .proc/pew, target_turf, weapon, user) + INVOKE_ASYNC(src, PROC_REF(pew), target_turf, weapon, user) /// If we're only firing one plume directly behind us, we don't need to bother with the loop or angles or anything /datum/element/backblast/proc/gun_fired_simple(obj/item/gun/weapon, mob/living/user, atom/target, params, zone_override) @@ -59,7 +59,7 @@ var/backwards_angle = get_angle(target, user) var/turf/target_turf = get_turf_in_angle(backwards_angle, get_turf(user), 10) - INVOKE_ASYNC(src, .proc/pew, target_turf, weapon, user) + INVOKE_ASYNC(src, PROC_REF(pew), target_turf, weapon, user) /// For firing an actual backblast pellet /datum/element/backblast/proc/pew(turf/target_turf, obj/item/gun/weapon, mob/living/user) diff --git a/code/datums/elements/bane.dm b/code/datums/elements/bane.dm index 07963142b27..377ba8a7242 100644 --- a/code/datums/elements/bane.dm +++ b/code/datums/elements/bane.dm @@ -17,9 +17,9 @@ return ELEMENT_INCOMPATIBLE if(ispath(target_type, /mob/living)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/mob_check) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(mob_check)) else if(ispath(target_type, /datum/species)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/species_check) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(species_check)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/basic_body_temp_sensitive.dm b/code/datums/elements/basic_body_temp_sensitive.dm index 08dbb301f4f..9781a2adb18 100644 --- a/code/datums/elements/basic_body_temp_sensitive.dm +++ b/code/datums/elements/basic_body_temp_sensitive.dm @@ -27,7 +27,7 @@ src.cold_damage = cold_damage if(heat_damage) src.heat_damage = heat_damage - RegisterSignal(target, COMSIG_LIVING_LIFE, .proc/on_life) + RegisterSignal(target, COMSIG_LIVING_LIFE, PROC_REF(on_life)) /datum/element/basic_body_temp_sensitive/Detach(datum/source) if(source) diff --git a/code/datums/elements/basic_eating.dm b/code/datums/elements/basic_eating.dm index c5af40aa299..2ddb2bf702b 100644 --- a/code/datums/elements/basic_eating.dm +++ b/code/datums/elements/basic_eating.dm @@ -21,9 +21,9 @@ src.food_types = food_types //this lets players eat - RegisterSignal(target, COMSIG_LIVING_UNARMED_ATTACK, .proc/on_unarm_attack) + RegisterSignal(target, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(on_unarm_attack)) //this lets ai eat. yes, i'm serious - RegisterSignal(target, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, .proc/on_pre_attackingtarget) + RegisterSignal(target, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(on_pre_attackingtarget)) /datum/element/basic_eating/Detach(datum/target) UnregisterSignal(target, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_HOSTILE_PRE_ATTACKINGTARGET)) diff --git a/code/datums/elements/beauty.dm b/code/datums/elements/beauty.dm index fb7dc31f491..8946a5020ba 100644 --- a/code/datums/elements/beauty.dm +++ b/code/datums/elements/beauty.dm @@ -23,8 +23,8 @@ if(!beauty_counter[target] && ismovable(target)) var/atom/movable/mov_target = target mov_target.become_area_sensitive(BEAUTY_ELEMENT_TRAIT) - RegisterSignal(mov_target, COMSIG_ENTER_AREA, .proc/enter_area) - RegisterSignal(mov_target, COMSIG_EXIT_AREA, .proc/exit_area) + RegisterSignal(mov_target, COMSIG_ENTER_AREA, PROC_REF(enter_area)) + RegisterSignal(mov_target, COMSIG_EXIT_AREA, PROC_REF(exit_area)) beauty_counter[target]++ diff --git a/code/datums/elements/bed_tucking.dm b/code/datums/elements/bed_tucking.dm index 73fcf94ef03..569825725d3 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 5bdf4fa9091..96606a55309 100644 --- a/code/datums/elements/bsa_blocker.dm +++ b/code/datums/elements/bsa_blocker.dm @@ -3,7 +3,7 @@ /datum/element/bsa_blocker/Attach(datum/target) if(!isatom(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ATOM_BSA_BEAM, .proc/block_bsa) + RegisterSignal(target, COMSIG_ATOM_BSA_BEAM, PROC_REF(block_bsa)) return ..() /datum/element/bsa_blocker/proc/block_bsa() diff --git a/code/datums/elements/bump_click.dm b/code/datums/elements/bump_click.dm index 882e4b9b48e..0011cd46901 100644 --- a/code/datums/elements/bump_click.dm +++ b/code/datums/elements/bump_click.dm @@ -30,7 +30,7 @@ src.allow_unarmed = allow_unarmed src.allow_combat = allow_combat - RegisterSignal(target, COMSIG_ATOM_BUMPED, .proc/use_tool, override = TRUE) + RegisterSignal(target, COMSIG_ATOM_BUMPED, PROC_REF(use_tool), override = TRUE) /datum/element/bump_click/Detach(datum/target) UnregisterSignal(target, COMSIG_ATOM_BUMPED) @@ -56,10 +56,10 @@ var/obj/item/held_item = bumping.get_active_held_item() if(!held_item) //Not holding anything in active hand, so no tool to check if(allow_unarmed) - INVOKE_ASYNC(bumping, /mob.proc/ClickOn, source) //Click with empty active hand + INVOKE_ASYNC(bumping, TYPE_PROC_REF(/mob, ClickOn), source) //Click with empty active hand return if(allow_any) - INVOKE_ASYNC(bumping, /mob.proc/ClickOn, source) //Click with whatever we're holding + INVOKE_ASYNC(bumping, TYPE_PROC_REF(/mob, ClickOn), source) //Click with whatever we're holding return if(check_tool(held_item)) - INVOKE_ASYNC(bumping, /mob.proc/ClickOn, source) //Click with approved item + INVOKE_ASYNC(bumping, TYPE_PROC_REF(/mob, ClickOn), source) //Click with approved item diff --git a/code/datums/elements/can_barricade.dm b/code/datums/elements/can_barricade.dm index 039e715dc33..480a06df175 100644 --- a/code/datums/elements/can_barricade.dm +++ b/code/datums/elements/can_barricade.dm @@ -10,11 +10,11 @@ if(!isatom(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_ATTACKBY, .proc/on_start_barricade) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(target, COMSIG_PARENT_ATTACKBY, PROC_REF(on_start_barricade)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item) + RegisterSignal(target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/element/can_barricade/Detach(atom/target) UnregisterSignal(target, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM)) @@ -40,7 +40,7 @@ source.balloon_alert(user, "constructing barricade...") playsound(source, 'sound/items/hammering_wood.ogg', 50, vary = TRUE) - INVOKE_ASYNC(src, .proc/barricade, source, plank, user, params) //signal handlers can't have do_afters inside of them + INVOKE_ASYNC(src, PROC_REF(barricade), source, plank, user, params) //signal handlers can't have do_afters inside of them return COMPONENT_CANCEL_ATTACK_CHAIN /// when our element gets attacked by wooden planks it creates a barricade diff --git a/code/datums/elements/chemical_transfer.dm b/code/datums/elements/chemical_transfer.dm index b0166f081a8..cf6f5e82f74 100644 --- a/code/datums/elements/chemical_transfer.dm +++ b/code/datums/elements/chemical_transfer.dm @@ -28,8 +28,8 @@ src.transfer_prob = transfer_prob src.attacker_message = attacker_message src.victim_message = victim_message - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/on_attack) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(on_attack)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/element/chemical_transfer/Detach(datum/target) . = ..() diff --git a/code/datums/elements/chewable.dm b/code/datums/elements/chewable.dm index e8094b599e6..8735e526cd1 100644 --- a/code/datums/elements/chewable.dm +++ b/code/datums/elements/chewable.dm @@ -26,8 +26,8 @@ src.slots_to_check = slots_to_check || target_item.slot_flags - RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/on_dropped) - RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equipped) + RegisterSignal(target, COMSIG_ITEM_DROPPED, PROC_REF(on_dropped)) + RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) /datum/element/chewable/Detach(datum/source, force) . = ..() diff --git a/code/datums/elements/cleaning.dm b/code/datums/elements/cleaning.dm index b37ae8b7ce7..3f39d00eb6e 100644 --- a/code/datums/elements/cleaning.dm +++ b/code/datums/elements/cleaning.dm @@ -2,7 +2,7 @@ . = ..() if(!ismovable(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Clean) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(Clean)) /datum/element/cleaning/Detach(datum/target) . = ..() diff --git a/code/datums/elements/climbable.dm b/code/datums/elements/climbable.dm index 07ccbc21c59..b82a5d288ab 100644 --- a/code/datums/elements/climbable.dm +++ b/code/datums/elements/climbable.dm @@ -18,10 +18,10 @@ if(climb_stun) src.climb_stun = climb_stun - RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, .proc/attack_hand) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_MOUSEDROPPED_ONTO, .proc/mousedrop_receive) - RegisterSignal(target, COMSIG_ATOM_BUMPED, .proc/try_speedrun) + RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(attack_hand)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(mousedrop_receive)) + RegisterSignal(target, COMSIG_ATOM_BUMPED, PROC_REF(try_speedrun)) ADD_TRAIT(target, TRAIT_CLIMBABLE, ELEMENT_TRAIT(type)) /datum/element/climbable/Detach(datum/target) @@ -116,7 +116,7 @@ if (!animal.dextrous) return if(living_target.mobility_flags & MOBILITY_MOVE) - INVOKE_ASYNC(src, .proc/climb_structure, climbed_thing, living_target, params) + INVOKE_ASYNC(src, PROC_REF(climb_structure), climbed_thing, living_target, params) return ///Tries to climb onto the target if the forced movement of the mob allows it diff --git a/code/datums/elements/connect_loc.dm b/code/datums/elements/connect_loc.dm index fee9072f751..12fa35ea3fa 100644 --- a/code/datums/elements/connect_loc.dm +++ b/code/datums/elements/connect_loc.dm @@ -14,7 +14,7 @@ src.connections = connections - RegisterSignal(listener, COMSIG_MOVABLE_MOVED, .proc/on_moved, override = TRUE) + RegisterSignal(listener, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved), override = TRUE) update_signals(listener) /datum/element/connect_loc/Detach(atom/movable/listener) diff --git a/code/datums/elements/content_barfer.dm b/code/datums/elements/content_barfer.dm index b53e21f3e2f..7b802ba2eac 100644 --- a/code/datums/elements/content_barfer.dm +++ b/code/datums/elements/content_barfer.dm @@ -12,7 +12,7 @@ if(!isliving(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, list(COMSIG_LIVING_DEATH, COMSIG_LIVING_ON_WABBAJACKED), .proc/barf_contents) + RegisterSignal(target, list(COMSIG_LIVING_DEATH, COMSIG_LIVING_ON_WABBAJACKED), PROC_REF(barf_contents)) /datum/element/content_barfer/Detach(datum/target) UnregisterSignal(target, list(COMSIG_LIVING_DEATH, COMSIG_LIVING_ON_WABBAJACKED)) diff --git a/code/datums/elements/crackable.dm b/code/datums/elements/crackable.dm index cdb5eb1484d..8a517a0f375 100644 --- a/code/datums/elements/crackable.dm +++ b/code/datums/elements/crackable.dm @@ -18,7 +18,7 @@ var/icon/new_crack_icon = icon(crack_icon, state) new_crack_icon.Turn(i * 10) crack_icons += new_crack_icon - RegisterSignal(target, COMSIG_ATOM_INTEGRITY_CHANGED, .proc/IntegrityChanged) + RegisterSignal(target, COMSIG_ATOM_INTEGRITY_CHANGED, PROC_REF(IntegrityChanged)) /datum/element/crackable/proc/IntegrityChanged(obj/source, old_value, new_value) SIGNAL_HANDLER diff --git a/code/datums/elements/crusher_loot.dm b/code/datums/elements/crusher_loot.dm index 1ffcf346e56..ee214ba768f 100644 --- a/code/datums/elements/crusher_loot.dm +++ b/code/datums/elements/crusher_loot.dm @@ -21,7 +21,7 @@ if(!isliving(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_death)) src.trophy_type = trophy_type src.drop_mod = drop_mod diff --git a/code/datums/elements/cult_eyes.dm b/code/datums/elements/cult_eyes.dm index 51d2adee8cc..a9a5d846510 100644 --- a/code/datums/elements/cult_eyes.dm +++ b/code/datums/elements/cult_eyes.dm @@ -11,8 +11,8 @@ return ELEMENT_INCOMPATIBLE // Register signals for mob transformation to prevent premature halo removal - RegisterSignal(target, list(COMSIG_CHANGELING_TRANSFORM, COMSIG_MONKEY_HUMANIZE, COMSIG_HUMAN_MONKEYIZE), .proc/set_eyes) - addtimer(CALLBACK(src, .proc/set_eyes, target), initial_delay) + RegisterSignal(target, list(COMSIG_CHANGELING_TRANSFORM, COMSIG_MONKEY_HUMANIZE, COMSIG_HUMAN_MONKEYIZE), PROC_REF(set_eyes)) + addtimer(CALLBACK(src, PROC_REF(set_eyes), target), initial_delay) /** * Cult eye setter proc diff --git a/code/datums/elements/cult_halo.dm b/code/datums/elements/cult_halo.dm index 0855596f0d5..e5b77fb1ae4 100644 --- a/code/datums/elements/cult_halo.dm +++ b/code/datums/elements/cult_halo.dm @@ -11,8 +11,8 @@ return ELEMENT_INCOMPATIBLE // Register signals for mob transformation to prevent premature halo removal - RegisterSignal(target, list(COMSIG_CHANGELING_TRANSFORM, COMSIG_MONKEY_HUMANIZE, COMSIG_HUMAN_MONKEYIZE), .proc/set_halo) - addtimer(CALLBACK(src, .proc/set_halo, target), initial_delay) + RegisterSignal(target, list(COMSIG_CHANGELING_TRANSFORM, COMSIG_MONKEY_HUMANIZE, COMSIG_HUMAN_MONKEYIZE), PROC_REF(set_halo)) + addtimer(CALLBACK(src, PROC_REF(set_halo), target), initial_delay) /** * Halo setter proc diff --git a/code/datums/elements/curse_announcement.dm b/code/datums/elements/curse_announcement.dm index ad4a57215e0..0c048178af5 100644 --- a/code/datums/elements/curse_announcement.dm +++ b/code/datums/elements/curse_announcement.dm @@ -27,9 +27,9 @@ src.new_name = new_name src.fantasy_component = WEAKREF(fantasy_component) if(cursed_item.slot_equipment_priority) //if it can equip somewhere, only go active when it is actually done - RegisterSignal(cursed_item, COMSIG_ITEM_EQUIPPED, .proc/on_equipped) + RegisterSignal(cursed_item, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equipped)) else - RegisterSignal(cursed_item, COMSIG_ITEM_PICKUP, .proc/on_pickup) + RegisterSignal(cursed_item, COMSIG_ITEM_PICKUP, PROC_REF(on_pickup)) /datum/element/curse_announcement/Detach(datum/target) . = ..() diff --git a/code/datums/elements/death_drops.dm b/code/datums/elements/death_drops.dm index a4d29f1434b..3c5de1889a0 100644 --- a/code/datums/elements/death_drops.dm +++ b/code/datums/elements/death_drops.dm @@ -16,7 +16,7 @@ if(!loot) stack_trace("[type] added to [target] with NO LOOT.") src.loot = loot - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /datum/element/death_drops/Detach(datum/target) . = ..() diff --git a/code/datums/elements/decals/_decal.dm b/code/datums/elements/decals/_decal.dm index a55d5b1c676..ab20a6eee83 100644 --- a/code/datums/elements/decals/_decal.dm +++ b/code/datums/elements/decals/_decal.dm @@ -80,23 +80,23 @@ base_icon_state = _icon_state smoothing = _smoothing - RegisterSignal(target,COMSIG_ATOM_UPDATE_OVERLAYS,.proc/apply_overlay, TRUE) + RegisterSignal(target,COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_overlay), TRUE) if(target.flags_1 & INITIALIZED_1) target.update_appearance(UPDATE_OVERLAYS) //could use some queuing here now maybe. else - RegisterSignal(target,COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE,.proc/late_update_icon, TRUE) + RegisterSignal(target,COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE, PROC_REF(late_update_icon), TRUE) if(isitem(target)) - INVOKE_ASYNC(target, /obj/item/.proc/update_slot_icon, TRUE) + INVOKE_ASYNC(target, TYPE_PROC_REF(/obj/item/, update_slot_icon), TRUE) if(_dir) SSdcs.RegisterSignal(target,COMSIG_ATOM_DIR_CHANGE, /datum/controller/subsystem/processing/dcs/proc/rotate_decals, TRUE) if(!isnull(_smoothing)) - RegisterSignal(target, COMSIG_ATOM_SMOOTHED_ICON, .proc/smooth_react, TRUE) + RegisterSignal(target, COMSIG_ATOM_SMOOTHED_ICON, PROC_REF(smooth_react), TRUE) if(_cleanable) - RegisterSignal(target, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_react, TRUE) + RegisterSignal(target, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react), TRUE) if(_description) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/examine,TRUE) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examine),TRUE) - RegisterSignal(target, COMSIG_TURF_ON_SHUTTLE_MOVE, .proc/shuttle_move_react,TRUE) + RegisterSignal(target, COMSIG_TURF_ON_SHUTTLE_MOVE, PROC_REF(shuttle_move_react),TRUE) /** * ## generate_appearance @@ -121,7 +121,7 @@ SSdcs.UnregisterSignal(source, COMSIG_ATOM_DIR_CHANGE) source.update_appearance(UPDATE_OVERLAYS) if(isitem(source)) - INVOKE_ASYNC(source, /obj/item/.proc/update_slot_icon) + INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item/, update_slot_icon)) SEND_SIGNAL(source, COMSIG_TURF_DECAL_DETACHED, description, cleanable, directional, pic) return ..() diff --git a/code/datums/elements/decals/blood.dm b/code/datums/elements/decals/blood.dm index b6f96cd2f4c..2af4158b0cd 100644 --- a/code/datums/elements/decals/blood.dm +++ b/code/datums/elements/decals/blood.dm @@ -5,7 +5,7 @@ return ELEMENT_INCOMPATIBLE . = ..() - RegisterSignal(target, COMSIG_ATOM_GET_EXAMINE_NAME, .proc/get_examine_name, TRUE) + RegisterSignal(target, COMSIG_ATOM_GET_EXAMINE_NAME, PROC_REF(get_examine_name), TRUE) /datum/element/decal/blood/Detach(atom/source) UnregisterSignal(source, COMSIG_ATOM_GET_EXAMINE_NAME) diff --git a/code/datums/elements/delete_on_drop.dm b/code/datums/elements/delete_on_drop.dm index aeb77b253cc..afb39f97fb9 100644 --- a/code/datums/elements/delete_on_drop.dm +++ b/code/datums/elements/delete_on_drop.dm @@ -8,7 +8,7 @@ . = ..() if(!isitem(target)) return COMPONENT_INCOMPATIBLE - RegisterSignal(target, list(COMSIG_ITEM_DROPPED, COMSIG_CASING_EJECTED), .proc/del_on_drop) + RegisterSignal(target, list(COMSIG_ITEM_DROPPED, COMSIG_CASING_EJECTED), PROC_REF(del_on_drop)) /datum/element/delete_on_drop/Detach(datum/source) . = ..() diff --git a/code/datums/elements/deliver_first.dm b/code/datums/elements/deliver_first.dm index 6680fb7d7a5..dc7b3a52460 100644 --- a/code/datums/elements/deliver_first.dm +++ b/code/datums/elements/deliver_first.dm @@ -24,10 +24,10 @@ return ELEMENT_INCOMPATIBLE src.goal_area_type = goal_area_type src.payment = payment - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(target, COMSIG_ATOM_EMAG_ACT, .proc/on_emag) - RegisterSignal(target, COMSIG_CLOSET_POST_OPEN, .proc/on_post_open) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(target, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag)) + RegisterSignal(target, COMSIG_CLOSET_POST_OPEN, PROC_REF(on_post_open)) ADD_TRAIT(target, TRAIT_BANNED_FROM_CARGO_SHUTTLE, REF(src)) //registers pre_open when appropriate area_check(target) @@ -56,7 +56,7 @@ UnregisterSignal(target, COMSIG_CLOSET_PRE_OPEN) return TRUE else - RegisterSignal(target, COMSIG_CLOSET_PRE_OPEN, .proc/on_pre_open, override = TRUE) //very purposefully overriding + RegisterSignal(target, COMSIG_CLOSET_PRE_OPEN, PROC_REF(on_pre_open), override = TRUE) //very purposefully overriding return FALSE /datum/element/deliver_first/proc/on_moved(obj/structure/closet/target, atom/oldloc, direction) diff --git a/code/datums/elements/diggable.dm b/code/datums/elements/diggable.dm index ff19b702eac..c8e7734e329 100644 --- a/code/datums/elements/diggable.dm +++ b/code/datums/elements/diggable.dm @@ -27,7 +27,7 @@ src.action_text = action_text src.action_text_third_person = action_text_third_person - RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(TOOL_SHOVEL), .proc/on_shovel) + RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(TOOL_SHOVEL), PROC_REF(on_shovel)) /datum/element/diggable/Detach(datum/source, ...) . = ..() diff --git a/code/datums/elements/digitalcamo.dm b/code/datums/elements/digitalcamo.dm index 82b63edc9d8..f85d856231b 100644 --- a/code/datums/elements/digitalcamo.dm +++ b/code/datums/elements/digitalcamo.dm @@ -10,8 +10,8 @@ . = ..() if(!isliving(target) || (target in attached_mobs)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_LIVING_CAN_TRACK, .proc/can_track) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_LIVING_CAN_TRACK, PROC_REF(can_track)) var/image/img = image(loc = target) img.override = TRUE attached_mobs[target] = img diff --git a/code/datums/elements/drag_pickup.dm b/code/datums/elements/drag_pickup.dm index 30c15c7f0a5..ffce267a895 100644 --- a/code/datums/elements/drag_pickup.dm +++ b/code/datums/elements/drag_pickup.dm @@ -8,7 +8,7 @@ /datum/element/drag_pickup/Attach(datum/target) if(!ismovable(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, .proc/pick_up) + RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, PROC_REF(pick_up)) return ..() /datum/element/drag_pickup/Detach(datum/source) @@ -22,7 +22,7 @@ return if(over == picker) - INVOKE_ASYNC(picker, /mob/.proc/put_in_hands, source) + INVOKE_ASYNC(picker, TYPE_PROC_REF(/mob/, put_in_hands), source) else if(istype(over, /atom/movable/screen/inventory/hand)) var/atom/movable/screen/inventory/hand/Selected_hand = over picker.putItemFromInventoryInHandIfPossible(source, Selected_hand.held_index) diff --git a/code/datums/elements/dryable.dm b/code/datums/elements/dryable.dm index 54198848e9c..046d30c1941 100644 --- a/code/datums/elements/dryable.dm +++ b/code/datums/elements/dryable.dm @@ -11,7 +11,7 @@ return ELEMENT_INCOMPATIBLE src.dry_result = dry_result - RegisterSignal(target, COMSIG_ITEM_DRIED, .proc/finish_drying) + RegisterSignal(target, COMSIG_ITEM_DRIED, PROC_REF(finish_drying)) ADD_TRAIT(target, TRAIT_DRYABLE, ELEMENT_TRAIT(type)) diff --git a/code/datums/elements/earhealing.dm b/code/datums/elements/earhealing.dm index be0ce09a0bd..838b2d93377 100644 --- a/code/datums/elements/earhealing.dm +++ b/code/datums/elements/earhealing.dm @@ -7,7 +7,7 @@ if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), .proc/on_equip) + RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED), PROC_REF(on_equip)) /datum/element/earhealing/Detach(datum/target) . = ..() diff --git a/code/datums/elements/easily_fragmented.dm b/code/datums/elements/easily_fragmented.dm index b1c4c9a843e..f5e8e244d8a 100644 --- a/code/datums/elements/easily_fragmented.dm +++ b/code/datums/elements/easily_fragmented.dm @@ -16,7 +16,7 @@ src.break_chance = break_chance - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/on_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack)) /datum/element/easily_fragmented/Detach(datum/target) . = ..() diff --git a/code/datums/elements/embed.dm b/code/datums/elements/embed.dm index f667d04938d..68466d67e26 100644 --- a/code/datums/elements/embed.dm +++ b/code/datums/elements/embed.dm @@ -34,12 +34,12 @@ if(!isitem(target) && !isprojectile(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ELEMENT_ATTACH, .proc/severancePackage) + RegisterSignal(target, COMSIG_ELEMENT_ATTACH, PROC_REF(severancePackage)) if(isitem(target)) - RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, .proc/checkEmbed) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/examined) - RegisterSignal(target, COMSIG_EMBED_TRY_FORCE, .proc/tryForceEmbed) - RegisterSignal(target, COMSIG_ITEM_DISABLE_EMBED, .proc/detachFromWeapon) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(checkEmbed)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examined)) + RegisterSignal(target, COMSIG_EMBED_TRY_FORCE, PROC_REF(tryForceEmbed)) + RegisterSignal(target, COMSIG_ITEM_DISABLE_EMBED, PROC_REF(detachFromWeapon)) if(!initialized) src.embed_chance = embed_chance src.fall_chance = fall_chance @@ -55,7 +55,7 @@ initialized = TRUE else payload_type = projectile_payload - RegisterSignal(target, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/checkEmbedProjectile) + RegisterSignal(target, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(checkEmbedProjectile)) /datum/element/embed/Detach(obj/target) diff --git a/code/datums/elements/empprotection.dm b/code/datums/elements/empprotection.dm index 3eb67c8d030..ed0f3f6c76d 100644 --- a/code/datums/elements/empprotection.dm +++ b/code/datums/elements/empprotection.dm @@ -8,7 +8,7 @@ if(. == ELEMENT_INCOMPATIBLE || !isatom(target)) return ELEMENT_INCOMPATIBLE flags = _flags - RegisterSignal(target, COMSIG_ATOM_EMP_ACT, .proc/getEmpFlags) + RegisterSignal(target, COMSIG_ATOM_EMP_ACT, PROC_REF(getEmpFlags)) /datum/element/empprotection/Detach(atom/target) UnregisterSignal(target, COMSIG_ATOM_EMP_ACT) diff --git a/code/datums/elements/eyestab.dm b/code/datums/elements/eyestab.dm index 02898035a37..79785a0ea9e 100644 --- a/code/datums/elements/eyestab.dm +++ b/code/datums/elements/eyestab.dm @@ -18,7 +18,7 @@ if (!isnull(damage)) src.damage = damage - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/on_item_attack) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(on_item_attack)) /datum/element/eyestab/Detach(datum/source, ...) . = ..() diff --git a/code/datums/elements/firestacker.dm b/code/datums/elements/firestacker.dm index da65474dcb7..634ec18f549 100644 --- a/code/datums/elements/firestacker.dm +++ b/code/datums/elements/firestacker.dm @@ -15,10 +15,10 @@ src.amount = amount - RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/impact, override = TRUE) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(impact), override = TRUE) if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/item_attack, override = TRUE) - RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, .proc/item_attack_self, override = TRUE) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(item_attack), override = TRUE) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(item_attack_self), override = TRUE) /datum/element/firestacker/Detach(datum/source) . = ..() diff --git a/code/datums/elements/food/dunkable.dm b/code/datums/elements/food/dunkable.dm index 4a515eaa215..7de8c9f8096 100644 --- a/code/datums/elements/food/dunkable.dm +++ b/code/datums/elements/food/dunkable.dm @@ -10,7 +10,7 @@ if(!isitem(target)) return ELEMENT_INCOMPATIBLE dunk_amount = amount_per_dunk - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/get_dunked) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(get_dunked)) /datum/element/dunkable/Detach(datum/target) . = ..() diff --git a/code/datums/elements/food/food_trash.dm b/code/datums/elements/food/food_trash.dm index feeb211bb4a..03ae588e60f 100644 --- a/code/datums/elements/food/food_trash.dm +++ b/code/datums/elements/food/food_trash.dm @@ -15,18 +15,18 @@ return ELEMENT_INCOMPATIBLE src.trash = trash src.flags = flags - RegisterSignal(target, COMSIG_FOOD_CONSUMED, .proc/generate_trash) + RegisterSignal(target, COMSIG_FOOD_CONSUMED, PROC_REF(generate_trash)) if(!generate_trash_procpath && generate_trash_proc) generate_trash_procpath = generate_trash_proc if(flags & FOOD_TRASH_OPENABLE) - RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, .proc/open_trash) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(open_trash)) if(flags & FOOD_TRASH_POPABLE) - RegisterSignal(target, COMSIG_FOOD_CROSSED, .proc/food_crossed) - RegisterSignal(target, COMSIG_ITEM_ON_GRIND, .proc/generate_trash) - RegisterSignal(target, COMSIG_ITEM_ON_JUICE, .proc/generate_trash) - RegisterSignal(target, COMSIG_ITEM_USED_AS_INGREDIENT, .proc/generate_trash) - RegisterSignal(target, COMSIG_ITEM_ON_COMPOSTED, .proc/generate_trash) - RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, .proc/generate_trash) + RegisterSignal(target, COMSIG_FOOD_CROSSED, PROC_REF(food_crossed)) + RegisterSignal(target, COMSIG_ITEM_ON_GRIND, PROC_REF(generate_trash)) + RegisterSignal(target, COMSIG_ITEM_ON_JUICE, PROC_REF(generate_trash)) + RegisterSignal(target, COMSIG_ITEM_USED_AS_INGREDIENT, PROC_REF(generate_trash)) + RegisterSignal(target, COMSIG_ITEM_ON_COMPOSTED, PROC_REF(generate_trash)) + RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, PROC_REF(generate_trash)) /datum/element/food_trash/Detach(datum/target) . = ..() @@ -36,7 +36,7 @@ SIGNAL_HANDLER ///cringy signal_handler shouldnt be needed if you dont want to return but oh well - INVOKE_ASYNC(src, .proc/async_generate_trash, source) + INVOKE_ASYNC(src, PROC_REF(async_generate_trash), source) /datum/element/food_trash/proc/async_generate_trash(datum/source) var/atom/edible_object = source @@ -60,7 +60,7 @@ playsound(source, 'sound/effects/chipbagpop.ogg', 100) popper.visible_message(span_danger("[popper] steps on \the [source], popping the bag!"), span_danger("You step on \the [source], popping the bag!"), span_danger("You hear a sharp crack!"), COMBAT_MESSAGE_RANGE) - INVOKE_ASYNC(src, .proc/async_generate_trash, source) + INVOKE_ASYNC(src, PROC_REF(async_generate_trash), source) qdel(source) @@ -69,6 +69,6 @@ to_chat(user, span_notice("You open the [source], revealing \a [initial(trash.name)].")) - INVOKE_ASYNC(src, .proc/async_generate_trash, source) + INVOKE_ASYNC(src, PROC_REF(async_generate_trash), source) qdel(source) diff --git a/code/datums/elements/food/microwavable.dm b/code/datums/elements/food/microwavable.dm index aa5ba1e5439..ad707501b43 100644 --- a/code/datums/elements/food/microwavable.dm +++ b/code/datums/elements/food/microwavable.dm @@ -14,10 +14,10 @@ result_typepath = microwave_type || default_typepath - RegisterSignal(target, COMSIG_ITEM_MICROWAVE_ACT, .proc/on_microwaved) + RegisterSignal(target, COMSIG_ITEM_MICROWAVE_ACT, PROC_REF(on_microwaved)) if(!ispath(result_typepath, default_typepath)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/element/microwavable/Detach(datum/source) UnregisterSignal(source, list(COMSIG_ITEM_MICROWAVE_ACT, COMSIG_PARENT_EXAMINE)) diff --git a/code/datums/elements/food/processable.dm b/code/datums/elements/food/processable.dm index 7ac0539b36c..3da0dacd3bd 100644 --- a/code/datums/elements/food/processable.dm +++ b/code/datums/elements/food/processable.dm @@ -24,8 +24,8 @@ src.result_atom_type = result_atom_type src.table_required = table_required - RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(tool_behaviour), .proc/try_process) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/OnExamine) + RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(tool_behaviour), PROC_REF(try_process)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(OnExamine)) /datum/element/processable/Detach(datum/target) . = ..() diff --git a/code/datums/elements/food/venue_price.dm b/code/datums/elements/food/venue_price.dm index aca44f1233c..37a6bed8169 100644 --- a/code/datums/elements/food/venue_price.dm +++ b/code/datums/elements/food/venue_price.dm @@ -10,7 +10,7 @@ stack_trace("A venue_price element was attached to something without specifying an actual price.") return ELEMENT_INCOMPATIBLE src.venue_price = venue_price - RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, .proc/item_sold) + RegisterSignal(target, COMSIG_ITEM_SOLD_TO_CUSTOMER, PROC_REF(item_sold)) /datum/element/venue_price/Detach(datum/target) . = ..() diff --git a/code/datums/elements/footstep.dm b/code/datums/elements/footstep.dm index 2717bc10b87..77f118fd531 100644 --- a/code/datums/elements/footstep.dm +++ b/code/datums/elements/footstep.dm @@ -29,7 +29,7 @@ if(FOOTSTEP_MOB_HUMAN) if(!ishuman(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/play_humanstep) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_humanstep)) steps_for_living[target] = 0 return if(FOOTSTEP_MOB_CLAW) @@ -44,13 +44,13 @@ footstep_sounds = 'sound/effects/footstep/slime1.ogg' if(FOOTSTEP_OBJ_MACHINE) footstep_sounds = 'sound/effects/bang.ogg' - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/play_simplestep_machine) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep_machine)) return if(FOOTSTEP_OBJ_ROBOT) footstep_sounds = 'sound/effects/tank_treads.ogg' - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/play_simplestep_machine) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep_machine)) return - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/play_simplestep) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(play_simplestep)) steps_for_living[target] = 0 /datum/element/footstep/Detach(atom/movable/source) diff --git a/code/datums/elements/forced_gravity.dm b/code/datums/elements/forced_gravity.dm index fe57262460a..39bf0b769da 100644 --- a/code/datums/elements/forced_gravity.dm +++ b/code/datums/elements/forced_gravity.dm @@ -14,9 +14,9 @@ src.gravity = gravity src.ignore_turf_gravity = ignore_turf_gravity - RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, .proc/gravity_check) + RegisterSignal(target, COMSIG_ATOM_HAS_GRAVITY, PROC_REF(gravity_check)) if(isturf(target)) - RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, .proc/turf_gravity_check) + RegisterSignal(target, COMSIG_TURF_HAS_GRAVITY, PROC_REF(turf_gravity_check)) /datum/element/forced_gravity/Detach(datum/source) . = ..() diff --git a/code/datums/elements/frozen.dm b/code/datums/elements/frozen.dm index 8c885963bcf..8c5a35845e3 100644 --- a/code/datums/elements/frozen.dm +++ b/code/datums/elements/frozen.dm @@ -20,9 +20,10 @@ GLOBAL_LIST_INIT(freon_color_matrix, list("#2E5E69", "#60A2A8", "#A1AFB1", rgb(0 target_obj.add_atom_colour(GLOB.freon_color_matrix, TEMPORARY_COLOUR_PRIORITY) target_obj.alpha -= 25 - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(target, COMSIG_MOVABLE_POST_THROW, .proc/shatter_on_throw) - RegisterSignal(target, COMSIG_OBJ_UNFREEZE, .proc/on_unfreeze) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(target, COMSIG_MOVABLE_THROW_LANDED, PROC_REF(shatter_on_throw)) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(shatter_on_throw)) + RegisterSignal(target, COMSIG_OBJ_UNFREEZE, PROC_REF(on_unfreeze)) /datum/element/frozen/Detach(datum/source, ...) var/obj/obj_source = source diff --git a/code/datums/elements/honkspam.dm b/code/datums/elements/honkspam.dm index 2c5e0932c87..9b4c649ca1c 100644 --- a/code/datums/elements/honkspam.dm +++ b/code/datums/elements/honkspam.dm @@ -5,7 +5,7 @@ . = ..() if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, .proc/interact) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact)) /datum/element/honkspam/Detach(datum/source) UnregisterSignal(source, COMSIG_ITEM_ATTACK_SELF) diff --git a/code/datums/elements/item_fov.dm b/code/datums/elements/item_fov.dm index ff125ff0762..a16e1e90c20 100644 --- a/code/datums/elements/item_fov.dm +++ b/code/datums/elements/item_fov.dm @@ -11,8 +11,8 @@ return ELEMENT_INCOMPATIBLE src.fov_angle = fov_angle - RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(target, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) /datum/element/item_fov/Detach(datum/target) UnregisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) diff --git a/code/datums/elements/item_scaling.dm b/code/datums/elements/item_scaling.dm index 490a762bbcb..bf8ca30dccf 100644 --- a/code/datums/elements/item_scaling.dm +++ b/code/datums/elements/item_scaling.dm @@ -43,9 +43,9 @@ ADD_KEEP_TOGETHER(target, ITEM_SCALING_TRAIT) // Object scaled when dropped/thrown OR when exiting a storage object. - RegisterSignal(target, list(COMSIG_ITEM_DROPPED, COMSIG_ATOM_EXITED), .proc/scale_overworld) + RegisterSignal(target, list(COMSIG_ITEM_DROPPED, COMSIG_ATOM_EXITED), PROC_REF(scale_overworld)) // Object scaled when placed in an inventory slot OR when entering a storage component. - RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ATOM_ENTERED), .proc/scale_storage) + RegisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ATOM_ENTERED), PROC_REF(scale_storage)) /** * Detach proc for the item_scaling element. diff --git a/code/datums/elements/kneecapping.dm b/code/datums/elements/kneecapping.dm index 6460af53d82..c8c53a7b92f 100644 --- a/code/datums/elements/kneecapping.dm +++ b/code/datums/elements/kneecapping.dm @@ -32,7 +32,7 @@ if(. == ELEMENT_INCOMPATIBLE) return - RegisterSignal(target, COMSIG_ITEM_ATTACK_SECONDARY , .proc/try_kneecap_target) + RegisterSignal(target, COMSIG_ITEM_ATTACK_SECONDARY , PROC_REF(try_kneecap_target)) /datum/element/kneecapping/Detach(datum/target) UnregisterSignal(target, COMSIG_ITEM_ATTACK_SECONDARY) @@ -66,7 +66,7 @@ . = COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN - INVOKE_ASYNC(src, .proc/do_kneecap_target, source, leg, target, attacker) + INVOKE_ASYNC(src, PROC_REF(do_kneecap_target), source, leg, target, attacker) /** * After a short do_mob, attacker applies damage to the given leg with a significant wounding bonus, applying the weapon's force as damage. diff --git a/code/datums/elements/kneejerk.dm b/code/datums/elements/kneejerk.dm index efeaa7e5ee3..92b7dff71d0 100644 --- a/code/datums/elements/kneejerk.dm +++ b/code/datums/elements/kneejerk.dm @@ -7,7 +7,7 @@ if (!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/on_item_attack) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(on_item_attack)) /datum/element/kneejerk/Detach(datum/source, ...) . = ..() diff --git a/code/datums/elements/knockback.dm b/code/datums/elements/knockback.dm index af5cb3e0a36..e236521b1e8 100644 --- a/code/datums/elements/knockback.dm +++ b/code/datums/elements/knockback.dm @@ -13,11 +13,11 @@ /datum/element/knockback/Attach(datum/target, throw_distance = 1, throw_anchored = FALSE, throw_gentle = FALSE) . = ..() if(ismachinery(target) || isstructure(target) || isgun(target) || isprojectilespell(target)) // turrets, etc - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(target)) - RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/lazy_fishing_spot.dm b/code/datums/elements/lazy_fishing_spot.dm index 54429483faa..18b62bdcf45 100644 --- a/code/datums/elements/lazy_fishing_spot.dm +++ b/code/datums/elements/lazy_fishing_spot.dm @@ -12,7 +12,7 @@ CRASH("Lazy fishing spot had no configuration passed in.") src.configuration = configuration - RegisterSignal(target, COMSIG_PRE_FISHING, .proc/create_fishing_spot) + RegisterSignal(target, COMSIG_PRE_FISHING, PROC_REF(create_fishing_spot)) /datum/element/lazy_fishing_spot/Detach(datum/target) UnregisterSignal(target, COMSIG_PRE_FISHING) diff --git a/code/datums/elements/lifesteal.dm b/code/datums/elements/lifesteal.dm index 43f37d24247..cd9889b2cb6 100644 --- a/code/datums/elements/lifesteal.dm +++ b/code/datums/elements/lifesteal.dm @@ -12,11 +12,11 @@ /datum/element/lifesteal/Attach(datum/target, flat_heal) . = ..() if(ismachinery(target) || isstructure(target) || isgun(target) || isprojectilespell(target)) - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(target)) - RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/light_blocking.dm b/code/datums/elements/light_blocking.dm index a53fe8d7229..673838ad4f8 100644 --- a/code/datums/elements/light_blocking.dm +++ b/code/datums/elements/light_blocking.dm @@ -9,7 +9,7 @@ . = ..() if(!ismovable(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_target_move) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_target_move)) var/atom/movable/movable_target = target if(!isturf(movable_target.loc)) return diff --git a/code/datums/elements/light_eaten.dm b/code/datums/elements/light_eaten.dm index ceeed7b04a9..feec26be35b 100644 --- a/code/datums/elements/light_eaten.dm +++ b/code/datums/elements/light_eaten.dm @@ -10,10 +10,10 @@ . = ..() var/atom/atom_target = target - RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_POWER, .proc/block_light_power) - RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_RANGE, .proc/block_light_range) - RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_ON, .proc/block_light_on) - RegisterSignal(atom_target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_POWER, PROC_REF(block_light_power)) + RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_RANGE, PROC_REF(block_light_range)) + RegisterSignal(atom_target, COMSIG_ATOM_SET_LIGHT_ON, PROC_REF(block_light_on)) + RegisterSignal(atom_target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /// Because the lighting system does not like movable lights getting set_light() called. switch(atom_target.light_system) diff --git a/code/datums/elements/light_eater.dm b/code/datums/elements/light_eater.dm index d1688082ef9..e461e40579a 100644 --- a/code/datums/elements/light_eater.dm +++ b/code/datums/elements/light_eater.dm @@ -9,19 +9,19 @@ if(isatom(target)) if(ismovable(target)) if(ismachinery(target) || isstructure(target)) - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/on_projectile_hit) - RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/on_throw_impact) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(on_projectile_hit)) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(on_throw_impact)) if(isitem(target)) if(isgun(target)) - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/on_projectile_hit) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/on_afterattack) - RegisterSignal(target, COMSIG_ITEM_HIT_REACT, .proc/on_hit_reaction) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(on_projectile_hit)) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack)) + RegisterSignal(target, COMSIG_ITEM_HIT_REACT, PROC_REF(on_hit_reaction)) else if(isprojectile(target)) - RegisterSignal(target, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/on_projectile_self_hit) + RegisterSignal(target, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(on_projectile_self_hit)) else if(istype(target, /datum/reagent)) - RegisterSignal(target, COMSIG_REAGENT_EXPOSE_ATOM, .proc/on_expose_atom) + RegisterSignal(target, COMSIG_REAGENT_EXPOSE_ATOM, PROC_REF(on_expose_atom)) else if(isprojectilespell(target)) - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/on_projectile_hit) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(on_projectile_hit)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/mob_killed_tally.dm b/code/datums/elements/mob_killed_tally.dm index 973130992f7..00ea748bb40 100644 --- a/code/datums/elements/mob_killed_tally.dm +++ b/code/datums/elements/mob_killed_tally.dm @@ -15,7 +15,7 @@ if(!isliving(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_death)) src.tally_string = tally_string diff --git a/code/datums/elements/movement_turf_changer.dm b/code/datums/elements/movement_turf_changer.dm index 04604340cb2..a5de3d2356d 100644 --- a/code/datums/elements/movement_turf_changer.dm +++ b/code/datums/elements/movement_turf_changer.dm @@ -16,7 +16,7 @@ return ELEMENT_INCOMPATIBLE src.turf_type = turf_type - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) /datum/element/movement_turf_changer/Detach(datum/target) UnregisterSignal(target, COMSIG_MOVABLE_MOVED) diff --git a/code/datums/elements/movetype_handler.dm b/code/datums/elements/movetype_handler.dm index cfaf5a87b82..cdfe9988d26 100644 --- a/code/datums/elements/movetype_handler.dm +++ b/code/datums/elements/movetype_handler.dm @@ -18,11 +18,11 @@ return var/atom/movable/movable_target = target - RegisterSignal(movable_target, GLOB.movement_type_addtrait_signals, .proc/on_movement_type_trait_gain) - RegisterSignal(movable_target, GLOB.movement_type_removetrait_signals, .proc/on_movement_type_trait_loss) - RegisterSignal(movable_target, SIGNAL_ADDTRAIT(TRAIT_NO_FLOATING_ANIM), .proc/on_no_floating_anim_trait_gain) - RegisterSignal(movable_target, SIGNAL_REMOVETRAIT(TRAIT_NO_FLOATING_ANIM), .proc/on_no_floating_anim_trait_loss) - RegisterSignal(movable_target, COMSIG_PAUSE_FLOATING_ANIM, .proc/pause_floating_anim) + RegisterSignal(movable_target, GLOB.movement_type_addtrait_signals, PROC_REF(on_movement_type_trait_gain)) + RegisterSignal(movable_target, GLOB.movement_type_removetrait_signals, PROC_REF(on_movement_type_trait_loss)) + RegisterSignal(movable_target, SIGNAL_ADDTRAIT(TRAIT_NO_FLOATING_ANIM), PROC_REF(on_no_floating_anim_trait_gain)) + RegisterSignal(movable_target, SIGNAL_REMOVETRAIT(TRAIT_NO_FLOATING_ANIM), PROC_REF(on_no_floating_anim_trait_loss)) + RegisterSignal(movable_target, COMSIG_PAUSE_FLOATING_ANIM, PROC_REF(pause_floating_anim)) attached_atoms[movable_target] = TRUE if(movable_target.movement_type & (FLOATING|FLYING) && !HAS_TRAIT(movable_target, TRAIT_NO_FLOATING_ANIM)) diff --git a/code/datums/elements/nerfed_pulling.dm b/code/datums/elements/nerfed_pulling.dm index 054d3218bbb..125ddf3957b 100644 --- a/code/datums/elements/nerfed_pulling.dm +++ b/code/datums/elements/nerfed_pulling.dm @@ -14,8 +14,8 @@ src.typecache = typecache - RegisterSignal(target, COMSIG_LIVING_PUSHING_MOVABLE, .proc/on_push_movable) - RegisterSignal(target, COMSIG_LIVING_UPDATING_PULL_MOVESPEED, .proc/on_updating_pull_movespeed) + RegisterSignal(target, COMSIG_LIVING_PUSHING_MOVABLE, PROC_REF(on_push_movable)) + RegisterSignal(target, COMSIG_LIVING_UPDATING_PULL_MOVESPEED, PROC_REF(on_updating_pull_movespeed)) /datum/element/nerfed_pulling/Detach(mob/living/source) source.remove_movespeed_modifier(/datum/movespeed_modifier/nerfed_bump) diff --git a/code/datums/elements/obj_regen.dm b/code/datums/elements/obj_regen.dm index 1f099d3d7bd..f97be980858 100644 --- a/code/datums/elements/obj_regen.dm +++ b/code/datums/elements/obj_regen.dm @@ -21,7 +21,7 @@ return ELEMENT_INCOMPATIBLE rate = _rate - RegisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE, .proc/on_take_damage) + RegisterSignal(target, COMSIG_ATOM_TAKE_DAMAGE, PROC_REF(on_take_damage)) if(target.get_integrity() < target.max_integrity) if(!length(processing)) START_PROCESSING(SSobj, src) diff --git a/code/datums/elements/openspace_item_click_handler.dm b/code/datums/elements/openspace_item_click_handler.dm index d2571a39fc8..75f91fc244c 100644 --- a/code/datums/elements/openspace_item_click_handler.dm +++ b/code/datums/elements/openspace_item_click_handler.dm @@ -8,7 +8,7 @@ . = ..() if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/on_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack)) /datum/element/openspace_item_click_handler/Detach(datum/source) UnregisterSignal(source, COMSIG_ITEM_AFTERATTACK) @@ -21,4 +21,4 @@ return var/turf/turf_above = get_step_multiz(target, UP) if(turf_above?.z == user.z) - INVOKE_ASYNC(source, /obj/item.proc/handle_openspace_click, turf_above, user, user.CanReach(turf_above, source), click_parameters) + INVOKE_ASYNC(source, TYPE_PROC_REF(/obj/item, handle_openspace_click), turf_above, user, user.CanReach(turf_above, source), click_parameters) diff --git a/code/datums/elements/pet_bonus.dm b/code/datums/elements/pet_bonus.dm index 5ce79487007..390b8d16010 100644 --- a/code/datums/elements/pet_bonus.dm +++ b/code/datums/elements/pet_bonus.dm @@ -20,7 +20,7 @@ src.emote_message = emote_message src.moodlet = moodlet - RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) + RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) /datum/element/pet_bonus/Detach(datum/target) . = ..() diff --git a/code/datums/elements/plant_backfire.dm b/code/datums/elements/plant_backfire.dm index 37887dc5d60..e6b457bd309 100644 --- a/code/datums/elements/plant_backfire.dm +++ b/code/datums/elements/plant_backfire.dm @@ -21,9 +21,9 @@ src.extra_traits = extra_traits src.extra_genes = extra_genes - RegisterSignal(target, COMSIG_ITEM_PRE_ATTACK, .proc/attack_safety_check) - RegisterSignal(target, COMSIG_ITEM_PICKUP, .proc/pickup_safety_check) - RegisterSignal(target, COMSIG_MOVABLE_PRE_THROW, .proc/throw_safety_check) + RegisterSignal(target, COMSIG_ITEM_PRE_ATTACK, PROC_REF(attack_safety_check)) + RegisterSignal(target, COMSIG_ITEM_PICKUP, PROC_REF(pickup_safety_check)) + RegisterSignal(target, COMSIG_MOVABLE_PRE_THROW, PROC_REF(throw_safety_check)) /datum/element/plant_backfire/Detach(datum/target) . = ..() diff --git a/code/datums/elements/prevent_attacking_of_types.dm b/code/datums/elements/prevent_attacking_of_types.dm index cd4608943ec..d4fb750e222 100644 --- a/code/datums/elements/prevent_attacking_of_types.dm +++ b/code/datums/elements/prevent_attacking_of_types.dm @@ -19,7 +19,7 @@ src.alert_message = alert_message src.typecache = typecache - RegisterSignal(target, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, .proc/on_pre_attacking_target) + RegisterSignal(target, COMSIG_HOSTILE_PRE_ATTACKINGTARGET, PROC_REF(on_pre_attacking_target)) /datum/element/prevent_attacking_of_types/Detach(datum/source, ...) UnregisterSignal(source, COMSIG_HOSTILE_PRE_ATTACKINGTARGET) diff --git a/code/datums/elements/projectile_shield.dm b/code/datums/elements/projectile_shield.dm index c8a64e4ac11..2e99ec756e4 100644 --- a/code/datums/elements/projectile_shield.dm +++ b/code/datums/elements/projectile_shield.dm @@ -4,7 +4,7 @@ if(!ismob(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ATOM_BULLET_ACT, .proc/on_bullet_act) + RegisterSignal(target, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act)) /datum/element/projectile_shield/Detach(datum/target) . = ..() diff --git a/code/datums/elements/radiation_protected_clothing.dm b/code/datums/elements/radiation_protected_clothing.dm index ae4cc48ce2b..e0ebb351eae 100644 --- a/code/datums/elements/radiation_protected_clothing.dm +++ b/code/datums/elements/radiation_protected_clothing.dm @@ -10,7 +10,7 @@ return ELEMENT_INCOMPATIBLE ADD_TRAIT(target, TRAIT_RADIATION_PROTECTED_CLOTHING, REF(src)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/element/radiation_protected_clothing/Detach(datum/source, ...) REMOVE_TRAIT(source, TRAIT_RADIATION_PROTECTED_CLOTHING, REF(src)) diff --git a/code/datums/elements/ranged_attacks.dm b/code/datums/elements/ranged_attacks.dm index eaa8c380b45..9f54f7eab57 100644 --- a/code/datums/elements/ranged_attacks.dm +++ b/code/datums/elements/ranged_attacks.dm @@ -15,7 +15,7 @@ src.projectilesound = projectilesound src.projectiletype = projectiletype - RegisterSignal(target, COMSIG_MOB_ATTACK_RANGED, .proc/fire_ranged_attack) + RegisterSignal(target, COMSIG_MOB_ATTACK_RANGED, PROC_REF(fire_ranged_attack)) if(casingtype && projectiletype) CRASH("Set both casing type and projectile type in [target]'s ranged attacks element! uhoh! stinky!") @@ -26,7 +26,7 @@ /datum/element/ranged_attacks/proc/fire_ranged_attack(mob/living/basic/firer, atom/target, modifiers) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/async_fire_ranged_attack, firer, target, modifiers) + INVOKE_ASYNC(src, PROC_REF(async_fire_ranged_attack), firer, target, modifiers) /datum/element/ranged_attacks/proc/async_fire_ranged_attack(mob/living/basic/firer, atom/target, modifiers) diff --git a/code/datums/elements/ridable.dm b/code/datums/elements/ridable.dm index da98279c575..bca5716de56 100644 --- a/code/datums/elements/ridable.dm +++ b/code/datums/elements/ridable.dm @@ -28,11 +28,11 @@ riding_component_type = component_type potion_boosted = potion_boost - RegisterSignal(target, COMSIG_MOVABLE_PREBUCKLE, .proc/check_mounting) + RegisterSignal(target, COMSIG_MOVABLE_PREBUCKLE, PROC_REF(check_mounting)) if(isvehicle(target)) - RegisterSignal(target, COMSIG_SPEED_POTION_APPLIED, .proc/check_potion) + RegisterSignal(target, COMSIG_SPEED_POTION_APPLIED, PROC_REF(check_potion)) if(ismob(target)) - RegisterSignal(target, COMSIG_MOB_STATCHANGE, .proc/on_stat_change) + RegisterSignal(target, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) /datum/element/ridable/Detach(atom/movable/target) target.can_buckle = initial(target.can_buckle) diff --git a/code/datums/elements/rust.dm b/code/datums/elements/rust.dm index c7c50b31512..f0f3a8884f6 100644 --- a/code/datums/elements/rust.dm +++ b/code/datums/elements/rust.dm @@ -15,9 +15,9 @@ if(!rust_overlay) rust_overlay = image(rust_icon, rust_icon_state) ADD_TRAIT(target, TRAIT_RUSTY, ELEMENT_TRAIT(type)) - RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_rust_overlay) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/handle_examine) - RegisterSignal(target, list(COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_WELDER), COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_RUSTSCRAPER)), .proc/secondary_tool_act) + RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_rust_overlay)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(handle_examine)) + RegisterSignal(target, list(COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_WELDER), COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_RUSTSCRAPER)), PROC_REF(secondary_tool_act)) // Unfortunately registering with parent sometimes doesn't cause an overlay update target.update_icon(UPDATE_OVERLAYS) @@ -40,7 +40,7 @@ /// Because do_after sleeps we register the signal here and defer via an async call /datum/element/rust/proc/secondary_tool_act(atom/source, mob/user, obj/item/item) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/handle_tool_use, source, user, item) + INVOKE_ASYNC(src, PROC_REF(handle_tool_use), source, user, item) return COMPONENT_BLOCK_TOOL_ATTACK /// We call this from secondary_tool_act because we sleep with do_after diff --git a/code/datums/elements/screentips/contextual_screentip_bare_hands.dm b/code/datums/elements/screentips/contextual_screentip_bare_hands.dm index 8ffcfbe20e2..824cc0f3eac 100644 --- a/code/datums/elements/screentips/contextual_screentip_bare_hands.dm +++ b/code/datums/elements/screentips/contextual_screentip_bare_hands.dm @@ -41,7 +41,7 @@ var/atom/atom_target = target atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item) + RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/element/contextual_screentip_bare_hands/Detach(datum/source, ...) UnregisterSignal(source, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM) diff --git a/code/datums/elements/screentips/contextual_screentip_item_typechecks.dm b/code/datums/elements/screentips/contextual_screentip_item_typechecks.dm index 9ffe634c586..b57b75436fd 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 2515d6618ab..a2e5baa054e 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 7fa276c8f4e..f23c94096eb 100644 --- a/code/datums/elements/screentips/contextual_screentip_tools.dm +++ b/code/datums/elements/screentips/contextual_screentip_tools.dm @@ -17,7 +17,7 @@ var/atom/atom_target = target atom_target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item) + RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/element/contextual_screentip_tools/Detach(datum/source, ...) UnregisterSignal(source, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM) diff --git a/code/datums/elements/selfknockback.dm b/code/datums/elements/selfknockback.dm index bd59b9d17fe..f12ba1d735d 100644 --- a/code/datums/elements/selfknockback.dm +++ b/code/datums/elements/selfknockback.dm @@ -11,9 +11,9 @@ clamping the Knockback_Force value below. */ /datum/element/selfknockback/Attach(datum/target, throw_amount, speed_amount) . = ..() if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/Item_SelfKnockback) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(Item_SelfKnockback)) else if(isprojectile(target)) - RegisterSignal(target, COMSIG_PROJECTILE_FIRE, .proc/Projectile_SelfKnockback) + RegisterSignal(target, COMSIG_PROJECTILE_FIRE, PROC_REF(Projectile_SelfKnockback)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/series.dm b/code/datums/elements/series.dm index 7808a21d7d8..3ebfb64c456 100644 --- a/code/datums/elements/series.dm +++ b/code/datums/elements/series.dm @@ -20,7 +20,7 @@ subtype_list = subtypesof(subtype) src.series_name = series_name var/atom/attached = target - RegisterSignal(attached, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(attached, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/element/series/Detach(datum/target) . = ..() diff --git a/code/datums/elements/simple_flying.dm b/code/datums/elements/simple_flying.dm index 061270e5769..49b8771687b 100644 --- a/code/datums/elements/simple_flying.dm +++ b/code/datums/elements/simple_flying.dm @@ -12,7 +12,7 @@ return ELEMENT_INCOMPATIBLE var/mob/living/valid_target = target on_stat_change(valid_target, new_stat = valid_target.stat) //immediately try adding flight if they're conscious - RegisterSignal(target, COMSIG_MOB_STATCHANGE, .proc/on_stat_change) + RegisterSignal(target, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) /datum/element/simple_flying/Detach(datum/target) . = ..() diff --git a/code/datums/elements/skittish.dm b/code/datums/elements/skittish.dm index 307b00a4602..0690739c539 100644 --- a/code/datums/elements/skittish.dm +++ b/code/datums/elements/skittish.dm @@ -9,7 +9,7 @@ if(!isliving(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOVABLE_BUMP, .proc/Bump) + RegisterSignal(target, COMSIG_MOVABLE_BUMP, PROC_REF(Bump)) /datum/element/skittish/Detach(datum/target) UnregisterSignal(target, COMSIG_MOVABLE_BUMP) diff --git a/code/datums/elements/snail_crawl.dm b/code/datums/elements/snail_crawl.dm index 77a2f9b274e..4be34518818 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/soft_landing.dm b/code/datums/elements/soft_landing.dm index 0226194f5db..93e3aabece0 100644 --- a/code/datums/elements/soft_landing.dm +++ b/code/datums/elements/soft_landing.dm @@ -10,7 +10,7 @@ . = ..() if(!isatom(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ATOM_INTERCEPT_Z_FALL, .proc/intercept_z_fall) + RegisterSignal(target, COMSIG_ATOM_INTERCEPT_Z_FALL, PROC_REF(intercept_z_fall)) /datum/element/soft_landing/Detach(datum/target) . = ..() diff --git a/code/datums/elements/spooky.dm b/code/datums/elements/spooky.dm index d745b99189a..06f8fded9c7 100644 --- a/code/datums/elements/spooky.dm +++ b/code/datums/elements/spooky.dm @@ -8,7 +8,7 @@ if(!isitem(target)) return ELEMENT_INCOMPATIBLE src.too_spooky = too_spooky - RegisterSignal(target, COMSIG_ITEM_ATTACK, .proc/spectral_attack) + RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(spectral_attack)) /datum/element/spooky/Detach(datum/source) UnregisterSignal(source, COMSIG_ITEM_ATTACK) @@ -25,7 +25,7 @@ U.set_stutter(40 SECONDS) if(U.getStaminaLoss() > 95) to_chat(U, "Your ears weren't meant for this spectral sound.") - INVOKE_ASYNC(src, .proc/spectral_change, U) + INVOKE_ASYNC(src, PROC_REF(spectral_change), U) return if(ishuman(C)) @@ -40,7 +40,7 @@ if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly))) C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live to_chat(C, "DOOT") - INVOKE_ASYNC(src, .proc/spectral_change, H) + INVOKE_ASYNC(src, PROC_REF(spectral_change), H) else //the sound will spook monkeys. C.set_jitter_if_lower(30 SECONDS) diff --git a/code/datums/elements/squish.dm b/code/datums/elements/squish.dm index edddfb8523c..2e8e273eb35 100644 --- a/code/datums/elements/squish.dm +++ b/code/datums/elements/squish.dm @@ -18,7 +18,7 @@ var/mob/living/carbon/C = target var/was_lying = C.body_position == LYING_DOWN - addtimer(CALLBACK(src, .proc/Detach, C, was_lying, reverse), duration) + addtimer(CALLBACK(src, PROC_REF(Detach), C, was_lying, reverse), duration) if(reverse) C.transform = C.transform.Scale(SHORT, TALL) diff --git a/code/datums/elements/strippable.dm b/code/datums/elements/strippable.dm index b35f158a51d..094d80ae89e 100644 --- a/code/datums/elements/strippable.dm +++ b/code/datums/elements/strippable.dm @@ -19,7 +19,7 @@ if (!isatom(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, .proc/mouse_drop_onto) + RegisterSignal(target, COMSIG_MOUSEDROP_ONTO, PROC_REF(mouse_drop_onto)) src.items = items src.should_strip_proc_path = should_strip_proc_path @@ -57,7 +57,7 @@ strip_menu = new(source, src) LAZYSET(strip_menus, source, strip_menu) - INVOKE_ASYNC(strip_menu, /datum/.proc/ui_interact, user) + INVOKE_ASYNC(strip_menu, TYPE_PROC_REF(/datum/, ui_interact), user) /// A representation of an item that can be stripped down /datum/strippable_item diff --git a/code/datums/elements/swabbable.dm b/code/datums/elements/swabbable.dm index 81ad7440eb9..03c328e7cfb 100644 --- a/code/datums/elements/swabbable.dm +++ b/code/datums/elements/swabbable.dm @@ -21,7 +21,7 @@ This element is used in vat growing to allow for the object to be if(!isatom(target) || isarea(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_SWAB_FOR_SAMPLES, .proc/GetSwabbed) + RegisterSignal(target, COMSIG_SWAB_FOR_SAMPLES, PROC_REF(GetSwabbed)) src.cell_line_define = cell_line_define src.virus_define = virus_define diff --git a/code/datums/elements/tenacious.dm b/code/datums/elements/tenacious.dm index 05267b55e59..4d906812c13 100644 --- a/code/datums/elements/tenacious.dm +++ b/code/datums/elements/tenacious.dm @@ -12,7 +12,7 @@ return COMPONENT_INCOMPATIBLE var/mob/living/carbon/human/valid_target = target on_stat_change(valid_target, new_stat = valid_target.stat) //immediately try adding movement bonus if they're in soft crit - RegisterSignal(target, COMSIG_MOB_STATCHANGE, .proc/on_stat_change) + RegisterSignal(target, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) ADD_TRAIT(target, TRAIT_TENACIOUS, ELEMENT_TRAIT(type)) /datum/element/tenacious/Detach(datum/target) diff --git a/code/datums/elements/tool_flash.dm b/code/datums/elements/tool_flash.dm index 3270dbb4846..c6e35d7d222 100644 --- a/code/datums/elements/tool_flash.dm +++ b/code/datums/elements/tool_flash.dm @@ -16,8 +16,8 @@ src.flash_strength = flash_strength - RegisterSignal(target, COMSIG_TOOL_IN_USE, .proc/prob_flash) - RegisterSignal(target, COMSIG_TOOL_START_USE, .proc/flash) + RegisterSignal(target, COMSIG_TOOL_IN_USE, PROC_REF(prob_flash)) + RegisterSignal(target, COMSIG_TOOL_START_USE, PROC_REF(flash)) /datum/element/tool_flash/Detach(datum/source) . = ..() diff --git a/code/datums/elements/trait_loc.dm b/code/datums/elements/trait_loc.dm index f346d602848..24fa2b17a9c 100644 --- a/code/datums/elements/trait_loc.dm +++ b/code/datums/elements/trait_loc.dm @@ -16,7 +16,7 @@ src.trait_to_give = trait_to_give - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_movable_relocated) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_movable_relocated)) if(target.loc) ADD_TRAIT(target.loc, trait_to_give, REF(target)) diff --git a/code/datums/elements/turf_transparency.dm b/code/datums/elements/turf_transparency.dm index f06b49e3cf0..f191309e789 100644 --- a/code/datums/elements/turf_transparency.dm +++ b/code/datums/elements/turf_transparency.dm @@ -151,7 +151,7 @@ GLOBAL_LIST_EMPTY(pillars_by_z) /// We do not need to do this for non transparent holders, because they will have their abstract object cleared /// When a transparent holder comes back. /datum/z_pillar/proc/parent_cleared(turf/visual, turf/current_holder) - addtimer(CALLBACK(src, .proc/refresh_orphan, visual, current_holder)) + addtimer(CALLBACK(src, PROC_REF(refresh_orphan), visual, current_holder)) /// Runs the actual refresh of some formerly orphaned via vis_loc deletiong turf /// We'll only reup if we either have no souece, or if the source is a transparent turf @@ -183,8 +183,8 @@ GLOBAL_LIST_EMPTY(pillars_by_z) 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, ELEMENT_TRAIT(type)) diff --git a/code/datums/elements/undertile.dm b/code/datums/elements/undertile.dm index baa17c55ee7..9348ac18d0f 100644 --- a/code/datums/elements/undertile.dm +++ b/code/datums/elements/undertile.dm @@ -22,7 +22,7 @@ if(!ismovable(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_OBJ_HIDE, .proc/hide) + RegisterSignal(target, COMSIG_OBJ_HIDE, PROC_REF(hide)) src.invisibility_trait = invisibility_trait src.invisibility_level = invisibility_level diff --git a/code/datums/elements/update_icon_blocker.dm b/code/datums/elements/update_icon_blocker.dm index 45206772564..daeb2759b84 100644 --- a/code/datums/elements/update_icon_blocker.dm +++ b/code/datums/elements/update_icon_blocker.dm @@ -6,7 +6,7 @@ if(!isatom(target)) 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/Detach(datum/source, ...) UnregisterSignal(source, COMSIG_ATOM_UPDATE_ICON) diff --git a/code/datums/elements/update_icon_updates_onmob.dm b/code/datums/elements/update_icon_updates_onmob.dm index 728bce2c86e..21a6ba13fd9 100644 --- a/code/datums/elements/update_icon_updates_onmob.dm +++ b/code/datums/elements/update_icon_updates_onmob.dm @@ -12,7 +12,7 @@ . = ..() if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, .proc/update_onmob) + RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_onmob)) update_flags = flags update_body = body diff --git a/code/datums/elements/venomous.dm b/code/datums/elements/venomous.dm index 064da08b219..6488119f7a0 100644 --- a/code/datums/elements/venomous.dm +++ b/code/datums/elements/venomous.dm @@ -15,11 +15,11 @@ . = ..() if(ismachinery(target) || isstructure(target) || isgun(target) || isprojectilespell(target)) - RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit) + RegisterSignal(target, COMSIG_PROJECTILE_ON_HIT, PROC_REF(projectile_hit)) else if(isitem(target)) - RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack) + RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(item_afterattack)) else if(ishostile(target) || isbasicmob(target)) - RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, .proc/hostile_attackingtarget) + RegisterSignal(target, COMSIG_HOSTILE_POST_ATTACKINGTARGET, PROC_REF(hostile_attackingtarget)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/volatile_gas_storage.dm b/code/datums/elements/volatile_gas_storage.dm index 9ef28b04a37..14864b08bfd 100644 --- a/code/datums/elements/volatile_gas_storage.dm +++ b/code/datums/elements/volatile_gas_storage.dm @@ -13,9 +13,9 @@ /datum/element/volatile_gas_storage/Attach(datum/target, minimum_explosive_pressure=5000, max_explosive_pressure=100000, max_explosive_force=9) . = ..() if(istype(target, /obj/machinery/atmospherics/components)) - RegisterSignal(target, COMSIG_ATOM_BREAK, .proc/AtmosComponentBreak) + RegisterSignal(target, COMSIG_ATOM_BREAK, PROC_REF(AtmosComponentBreak)) else if(isobj(target)) - RegisterSignal(target, COMSIG_ATOM_BREAK, .proc/ObjBreak) + RegisterSignal(target, COMSIG_ATOM_BREAK, PROC_REF(ObjBreak)) else return ELEMENT_INCOMPATIBLE diff --git a/code/datums/elements/waddling.dm b/code/datums/elements/waddling.dm index 673b327848f..eff201455d8 100644 --- a/code/datums/elements/waddling.dm +++ b/code/datums/elements/waddling.dm @@ -5,9 +5,9 @@ if(!ismovable(target)) return ELEMENT_INCOMPATIBLE if(isliving(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/LivingWaddle) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(LivingWaddle)) else - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/Waddle) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(Waddle)) /datum/element/waddling/Detach(datum/source) . = ..() diff --git a/code/datums/elements/wall_engraver.dm b/code/datums/elements/wall_engraver.dm index 41a689277c8..ad60f737c98 100644 --- a/code/datums/elements/wall_engraver.dm +++ b/code/datums/elements/wall_engraver.dm @@ -7,8 +7,8 @@ if (!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_ITEM_PRE_ATTACK_SECONDARY, .proc/on_item_pre_attack_secondary) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ITEM_PRE_ATTACK_SECONDARY, PROC_REF(on_item_pre_attack_secondary)) /datum/element/wall_engraver/Detach(datum/source) . = ..() @@ -24,7 +24,7 @@ /datum/element/wall_engraver/proc/on_item_pre_attack_secondary(datum/source, atom/target, mob/living/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/try_chisel, source, target, user) + INVOKE_ASYNC(src, PROC_REF(try_chisel), source, target, user) return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/code/datums/elements/weapon_description.dm b/code/datums/elements/weapon_description.dm index c38a22fa059..3146612d4c0 100644 --- a/code/datums/elements/weapon_description.dm +++ b/code/datums/elements/weapon_description.dm @@ -20,8 +20,8 @@ . = ..() if(!isitem(target)) // Do not attach this to anything that isn't an item return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/warning_label) - RegisterSignal(target, COMSIG_TOPIC, .proc/topic_handler) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(warning_label)) + RegisterSignal(target, COMSIG_TOPIC, PROC_REF(topic_handler)) // Don't perform the assignment if there is nothing to assign, or if we already have something for this bespoke element if(attached_proc && !src.attached_proc) src.attached_proc = attached_proc diff --git a/code/datums/elements/weather_listener.dm b/code/datums/elements/weather_listener.dm index ffb812bf50e..c173abdcd61 100644 --- a/code/datums/elements/weather_listener.dm +++ b/code/datums/elements/weather_listener.dm @@ -24,8 +24,8 @@ weather_trait = trait playlist = weather_playlist - RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, .proc/handle_z_level_change, override = TRUE) - RegisterSignal(target, COMSIG_MOB_LOGOUT, .proc/handle_logout, override = TRUE) + RegisterSignal(target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(handle_z_level_change), override = TRUE) + RegisterSignal(target, COMSIG_MOB_LOGOUT, PROC_REF(handle_logout), override = TRUE) /datum/element/weather_listener/Detach(datum/source) . = ..() diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 10c10744691..dc8abc62a56 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -242,7 +242,7 @@ /obj/item/disk/holodisk/Initialize(mapload) . = ..() if(preset_record_text) - INVOKE_ASYNC(src, .proc/build_record) + INVOKE_ASYNC(src, PROC_REF(build_record)) /obj/item/disk/holodisk/Destroy() QDEL_NULL(record) diff --git a/code/datums/hotkeys_help.dm b/code/datums/hotkeys_help.dm index 1f388a264c2..0e90c7dffe5 100644 --- a/code/datums/hotkeys_help.dm +++ b/code/datums/hotkeys_help.dm @@ -17,7 +17,7 @@ // Show them in alphabetical order by key var/list/key_bindings_by_key = user.client.prefs.key_bindings_by_key.Copy() - sortTim(key_bindings_by_key, cmp = /proc/cmp_text_asc) + sortTim(key_bindings_by_key, cmp = GLOBAL_PROC_REF(cmp_text_asc)) for(var/key in key_bindings_by_key) // Get the full names diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 9d38b6e1197..951b548b87d 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(huds, list( hud_atoms += list(list()) hud_users += list(list()) - RegisterSignal(SSdcs, COMSIG_GLOB_NEW_Z, .proc/add_z_level_huds) + RegisterSignal(SSdcs, COMSIG_GLOB_NEW_Z, PROC_REF(add_z_level_huds)) if(uses_global_hud_category) for(var/hud_icon in hud_icons) @@ -145,12 +145,12 @@ GLOBAL_LIST_INIT(huds, list( hud_users[their_turf.z][new_viewer] = TRUE hud_users_all_z_levels[new_viewer] = 1 - RegisterSignal(new_viewer, COMSIG_PARENT_QDELETING, .proc/unregister_atom, override = TRUE) //both hud users and hud atoms use these signals - RegisterSignal(new_viewer, COMSIG_MOVABLE_Z_CHANGED, .proc/on_atom_or_user_z_level_changed, override = TRUE) + RegisterSignal(new_viewer, COMSIG_PARENT_QDELETING, PROC_REF(unregister_atom), override = TRUE) //both hud users and hud atoms use these signals + RegisterSignal(new_viewer, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_atom_or_user_z_level_changed), override = TRUE) if(next_time_allowed[new_viewer] > world.time) if(!queued_to_see[new_viewer]) - addtimer(CALLBACK(src, .proc/show_hud_images_after_cooldown, new_viewer), next_time_allowed[new_viewer] - world.time) + addtimer(CALLBACK(src, PROC_REF(show_hud_images_after_cooldown), new_viewer), next_time_allowed[new_viewer] - world.time) queued_to_see[new_viewer] = TRUE else @@ -198,8 +198,8 @@ GLOBAL_LIST_INIT(huds, list( if(!atom_turf) return - RegisterSignal(new_hud_atom, COMSIG_MOVABLE_Z_CHANGED, .proc/on_atom_or_user_z_level_changed, override = TRUE) - RegisterSignal(new_hud_atom, COMSIG_PARENT_QDELETING, .proc/unregister_atom, override = TRUE) //both hud atoms and hud users use these signals + RegisterSignal(new_hud_atom, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_atom_or_user_z_level_changed), override = TRUE) + RegisterSignal(new_hud_atom, COMSIG_PARENT_QDELETING, PROC_REF(unregister_atom), override = TRUE) //both hud atoms and hud users use these signals hud_atoms[atom_turf.z] |= new_hud_atom hud_atoms_all_z_levels[new_hud_atom] = TRUE diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index d8b5abc5560..d19b6fcdae3 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -106,7 +106,7 @@ /datum/looping_sound/proc/start_sound_loop() loop_started = TRUE sound_loop() - timer_id = addtimer(CALLBACK(src, .proc/sound_loop, world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP | TIMER_DELETE_ME, SSsound_loops) + timer_id = addtimer(CALLBACK(src, PROC_REF(sound_loop), world.time), mid_length, TIMER_CLIENT_TIME | TIMER_STOPPABLE | TIMER_LOOP | TIMER_DELETE_ME, SSsound_loops) /** * A simple proc handling the looping of the sound itself. @@ -194,7 +194,7 @@ if(start_sound && !skip_starting_sounds) play(start_sound, start_volume) start_wait = start_length - timer_id = addtimer(CALLBACK(src, .proc/start_sound_loop), start_wait, TIMER_CLIENT_TIME | TIMER_DELETE_ME | TIMER_STOPPABLE, SSsound_loops) + timer_id = addtimer(CALLBACK(src, PROC_REF(start_sound_loop)), start_wait, TIMER_CLIENT_TIME | TIMER_DELETE_ME | TIMER_STOPPABLE, SSsound_loops) /// Simple proc that's executed when the looping sound is stopped, so that the `end_sound` can be played, if there's one. /datum/looping_sound/proc/on_stop() @@ -207,7 +207,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)) /// A simple proc that lets us know whether the sounds are currently active or not. /datum/looping_sound/proc/is_active() diff --git a/code/datums/martial/_martial.dm b/code/datums/martial/_martial.dm index cd9acf617b9..4d0e22c6c76 100644 --- a/code/datums/martial/_martial.dm +++ b/code/datums/martial/_martial.dm @@ -37,7 +37,7 @@ streak = copytext(streak, 1 + length(streak[1])) if (display_combos) var/mob/living/holder_living = holder.resolve() - timerid = addtimer(CALLBACK(src, .proc/reset_streak, null, FALSE), combo_timer, TIMER_UNIQUE | TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(reset_streak), null, FALSE), combo_timer, TIMER_UNIQUE | TIMER_STOPPABLE) holder_living?.hud_used?.combo_display.update_icon_state(streak, combo_timer - 2 SECONDS) /datum/martial_art/proc/reset_streak(mob/living/new_target, update_icon = TRUE) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 0f901e3e023..bee85d633be 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -16,7 +16,7 @@ /datum/martial_art/cqc/teach(mob/living/cqc_user, make_temporary) . = ..() - RegisterSignal(cqc_user, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(cqc_user, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) /datum/martial_art/cqc/on_remove(mob/living/cqc_user) UnregisterSignal(cqc_user, COMSIG_PARENT_ATTACKBY) @@ -38,7 +38,7 @@ var/datum/action/cooldown/spell/touch/touch_spell = touch_weapon.spell_which_made_us?.resolve() if(!touch_spell) return - INVOKE_ASYNC(touch_spell, /datum/action/cooldown/spell/touch.proc/do_hand_hit, touch_weapon, attacker, attacker) + INVOKE_ASYNC(touch_spell, TYPE_PROC_REF(/datum/action/cooldown/spell/touch, do_hand_hit), touch_weapon, attacker, attacker) return COMPONENT_NO_AFTERATTACK /datum/martial_art/cqc/reset_streak(mob/living/new_target) diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index 3215fdf8f94..fba91158776 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -36,7 +36,7 @@ /datum/martial_art/plasma_fist/proc/Tornado(mob/living/A, mob/living/D) A.say("TORNADO SWEEP!", forced="plasma fist") - dance_rotate(A, CALLBACK(GLOBAL_PROC, .proc/playsound, A.loc, 'sound/weapons/punch1.ogg', 15, TRUE, -1)) + dance_rotate(A, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), A.loc, 'sound/weapons/punch1.ogg', 15, TRUE, -1)) var/datum/action/cooldown/spell/aoe/repulse/tornado_spell = new(src) tornado_spell.cast(A) @@ -111,7 +111,7 @@ user.apply_damage(rand(50,70), BRUTE) - addtimer(CALLBACK(src,.proc/Apotheosis_end, user), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(Apotheosis_end), user), 6 SECONDS) playsound(boomspot, 'sound/weapons/punch1.ogg', 50, TRUE, -1) explosion(user, devastation_range = plasma_power, heavy_impact_range = plasma_power*2, light_impact_range = plasma_power*4, ignorecap = TRUE, explosion_cause = src) plasma_power = 1 //just in case there is any clever way to cause it to happen again diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 716c5fce92c..ce08cd4f290 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -16,7 +16,7 @@ ADD_TRAIT(target, TRAIT_NOGUNS, SLEEPING_CARP_TRAIT) ADD_TRAIT(target, TRAIT_HARDLY_WOUNDED, SLEEPING_CARP_TRAIT) ADD_TRAIT(target, TRAIT_NODISMEMBER, SLEEPING_CARP_TRAIT) - RegisterSignal(target, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(target, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) target.faction |= "carp" //:D /datum/martial_art/the_sleeping_carp/on_remove(mob/living/target) diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index c303bfa19b2..e572c6a484f 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -199,7 +199,7 @@ If you make a derivative work from this code, you must include this notification if (T && isturf(T)) if (!D.stat) D.emote("scream") - D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, /mob/living.proc/Paralyze, 20)) + D.throw_at(T, 10, 4, A, TRUE, TRUE, callback = CALLBACK(D, TYPE_PROC_REF(/mob/living, Paralyze), 20)) log_combat(A, D, "has thrown with wrestling") return @@ -336,7 +336,7 @@ If you make a derivative work from this code, you must include this notification A.setDir(turn(A.dir, 90)) A.forceMove(D.loc) - addtimer(CALLBACK(src, .proc/CheckStrikeTurf, A, T), 4) + addtimer(CALLBACK(src, PROC_REF(CheckStrikeTurf), A, T), 4) D.visible_message(span_danger("[A] headbutts [D]!"), \ span_userdanger("You're headbutted by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) diff --git a/code/datums/mergers/_merger.dm b/code/datums/mergers/_merger.dm index 8e7d656bcc0..1c677e0fbf5 100644 --- a/code/datums/mergers/_merger.dm +++ b/code/datums/mergers/_merger.dm @@ -52,8 +52,8 @@ /datum/merger/proc/AddMember(atom/thing, connected_dir) // note that this fires for the origin of the merger as well SEND_SIGNAL(thing, COMSIG_MERGER_ADDING, src) - RegisterSignal(thing, refresh_signals, .proc/QueueRefresh) - RegisterSignal(thing, COMSIG_PARENT_QDELETING, .proc/HandleMemberDel) + RegisterSignal(thing, refresh_signals, PROC_REF(QueueRefresh)) + RegisterSignal(thing, COMSIG_PARENT_QDELETING, PROC_REF(HandleMemberDel)) if(!thing.mergers) thing.mergers = list() else if(thing.mergers[id]) @@ -80,7 +80,7 @@ /datum/merger/proc/QueueRefresh() SIGNAL_HANDLER - addtimer(CALLBACK(src, .proc/Refresh), 1, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(Refresh)), 1, TIMER_UNIQUE) /datum/merger/proc/Refresh() // List of turf -> list(interesting dir, found matching atoms) diff --git a/code/datums/mind/_mind.dm b/code/datums/mind/_mind.dm index d87f1646231..2a2c50e9596 100644 --- a/code/datums/mind/_mind.dm +++ b/code/datums/mind/_mind.dm @@ -141,7 +141,7 @@ UnregisterSignal(src, COMSIG_PARENT_QDELETING) current = new_current if(current) - RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/clear_current) + RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(clear_current)) /datum/mind/proc/clear_current(datum/source) SIGNAL_HANDLER @@ -182,7 +182,7 @@ var/mob/living/carbon/C = new_character C.last_mind = src transfer_martial_arts(new_character) - RegisterSignal(new_character, COMSIG_LIVING_DEATH, .proc/set_death_time) + RegisterSignal(new_character, COMSIG_LIVING_DEATH, PROC_REF(set_death_time)) if(active || force_key_move) new_character.key = key //now transfer the key to link the client to our new body if(new_character.client) diff --git a/code/datums/mind/antag.dm b/code/datums/mind/antag.dm index f01227741bd..c58105cf435 100644 --- a/code/datums/mind/antag.dm +++ b/code/datums/mind/antag.dm @@ -23,7 +23,7 @@ var/datum/team/antag_team = A.get_team() if(antag_team) antag_team.add_member(src) - INVOKE_ASYNC(A, /datum/antagonist.proc/on_gain) + INVOKE_ASYNC(A, TYPE_PROC_REF(/datum/antagonist, on_gain)) log_game("[key_name(src)] has gained antag datum [A.name]([A.type]).") handle_exploitables() //SKYRAT EDIT ADDITION - EXPLOITABLES MENU return A diff --git a/code/datums/mood.dm b/code/datums/mood.dm index ca359454357..7cd9c343e91 100644 --- a/code/datums/mood.dm +++ b/code/datums/mood.dm @@ -46,11 +46,11 @@ mob_parent = mob_to_make_moody - RegisterSignal(mob_to_make_moody, COMSIG_MOB_HUD_CREATED, .proc/modify_hud) - RegisterSignal(mob_to_make_moody, COMSIG_ENTER_AREA, .proc/check_area_mood) - RegisterSignal(mob_to_make_moody, COMSIG_LIVING_REVIVE, .proc/on_revive) - RegisterSignal(mob_to_make_moody, COMSIG_MOB_STATCHANGE, .proc/handle_mob_death) - RegisterSignal(mob_to_make_moody, COMSIG_PARENT_QDELETING, .proc/clear_parent_ref) + RegisterSignal(mob_to_make_moody, COMSIG_MOB_HUD_CREATED, PROC_REF(modify_hud)) + RegisterSignal(mob_to_make_moody, COMSIG_ENTER_AREA, PROC_REF(check_area_mood)) + RegisterSignal(mob_to_make_moody, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) + RegisterSignal(mob_to_make_moody, COMSIG_MOB_STATCHANGE, PROC_REF(handle_mob_death)) + RegisterSignal(mob_to_make_moody, COMSIG_PARENT_QDELETING, PROC_REF(clear_parent_ref)) mob_to_make_moody.become_area_sensitive(MOOD_DATUM_TRAIT) if(mob_to_make_moody.hud_used) @@ -152,7 +152,7 @@ clear_mood_event(category) else if (the_event.timeout) - addtimer(CALLBACK(src, .proc/clear_mood_event, category), the_event.timeout, (TIMER_UNIQUE|TIMER_OVERRIDE)) + addtimer(CALLBACK(src, PROC_REF(clear_mood_event), category), the_event.timeout, (TIMER_UNIQUE|TIMER_OVERRIDE)) return // Don't need to update the event. var/list/params = args.Copy(3) @@ -166,7 +166,7 @@ update_mood() if (the_event.timeout) - addtimer(CALLBACK(src, .proc/clear_mood_event, category), the_event.timeout, (TIMER_UNIQUE|TIMER_OVERRIDE)) + addtimer(CALLBACK(src, PROC_REF(clear_mood_event), category), the_event.timeout, (TIMER_UNIQUE|TIMER_OVERRIDE)) /** * Removes a mood event from the mob @@ -285,8 +285,8 @@ mood_screen_object = new mood_screen_object.color = "#4b96c4" hud.infodisplay += mood_screen_object - RegisterSignal(hud, COMSIG_PARENT_QDELETING, .proc/unmodify_hud) - RegisterSignal(mood_screen_object, COMSIG_CLICK, .proc/hud_click) + RegisterSignal(hud, COMSIG_PARENT_QDELETING, PROC_REF(unmodify_hud)) + RegisterSignal(mood_screen_object, COMSIG_CLICK, PROC_REF(hud_click)) /// Removes the mood HUD object /datum/mood/proc/unmodify_hud(datum/source) diff --git a/code/datums/movement_detector.dm b/code/datums/movement_detector.dm index 109290a8a95..be36d62e660 100644 --- a/code/datums/movement_detector.dm +++ b/code/datums/movement_detector.dm @@ -20,7 +20,7 @@ src.listener = listener while(ismovable(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(move_react)) target = target.loc /// Stops tracking @@ -49,7 +49,7 @@ if(tracked.loc != newturf) var/atom/target = mover.loc while(ismovable(target)) - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/move_react, TRUE) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(move_react), TRUE) target = target.loc listener.Invoke(tracked, mover, oldloc, direction) diff --git a/code/datums/mutations/_mutations.dm b/code/datums/mutations/_mutations.dm index 9fc81716b51..506234ea888 100644 --- a/code/datums/mutations/_mutations.dm +++ b/code/datums/mutations/_mutations.dm @@ -81,7 +81,7 @@ . = ..() src.class = class if(timer) - addtimer(CALLBACK(src, .proc/remove), timer) + addtimer(CALLBACK(src, PROC_REF(remove)), timer) timeout = timer if(copymut && istype(copymut, /datum/mutation/human)) copy_mutation(copymut) @@ -120,7 +120,7 @@ owner.apply_overlay(layer_used) grant_power() //we do checks here so nothing about hulk getting magic if(!modified) - addtimer(CALLBACK(src, .proc/modify, 0.5 SECONDS)) //gonna want children calling ..() to run first + addtimer(CALLBACK(src, PROC_REF(modify), 0.5 SECONDS)) //gonna want children calling ..() to run first /datum/mutation/human/proc/get_visual_indicator() return diff --git a/code/datums/mutations/body.dm b/code/datums/mutations/body.dm index bf42d3d6ed0..ace5bb8c1ce 100644 --- a/code/datums/mutations/body.dm +++ b/code/datums/mutations/body.dm @@ -20,7 +20,7 @@ owner.Unconscious(200 * GET_MUTATION_POWER(src)) owner.set_jitter(2000 SECONDS * GET_MUTATION_POWER(src)) //yes this number looks crazy but the jitter animations are amplified based on the duration. owner.add_mood_event("epilepsy", /datum/mood_event/epilepsy) - addtimer(CALLBACK(src, .proc/jitter_less), 90) + addtimer(CALLBACK(src, PROC_REF(jitter_less)), 90) /datum/mutation/human/epilepsy/proc/jitter_less() if(QDELETED(owner)) @@ -31,7 +31,7 @@ /datum/mutation/human/epilepsy/on_acquiring(mob/living/carbon/human/acquirer) if(..()) return - RegisterSignal(owner, COMSIG_MOB_FLASHED, .proc/get_flashed_nerd) + RegisterSignal(owner, COMSIG_MOB_FLASHED, PROC_REF(get_flashed_nerd)) /datum/mutation/human/epilepsy/on_losing(mob/living/carbon/human/owner) if(..()) @@ -442,7 +442,7 @@ . = ..() if(.) return - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) /datum/mutation/human/extrastun/on_losing() . = ..() @@ -473,7 +473,7 @@ . = ..() if(.) return TRUE - RegisterSignal(owner, COMSIG_MOB_STATCHANGE, .proc/bloody_shower) + RegisterSignal(owner, COMSIG_MOB_STATCHANGE, PROC_REF(bloody_shower)) /datum/mutation/human/martyrdom/on_losing() . = ..() @@ -531,7 +531,7 @@ head.drop_organs() qdel(head) owner.regenerate_icons() - RegisterSignal(owner, COMSIG_ATTEMPT_CARBON_ATTACH_LIMB, .proc/abortattachment) + RegisterSignal(owner, COMSIG_ATTEMPT_CARBON_ATTACH_LIMB, PROC_REF(abortattachment)) /datum/mutation/human/headless/on_losing() . = ..() diff --git a/code/datums/mutations/chameleon.dm b/code/datums/mutations/chameleon.dm index ebd0209df7c..25f2bb5535e 100644 --- a/code/datums/mutations/chameleon.dm +++ b/code/datums/mutations/chameleon.dm @@ -15,8 +15,8 @@ return /// SKYRAT EDIT END owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move) - RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/on_attack_hand) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand)) /datum/mutation/human/chameleon/on_life(delta_time, times_fired) /// SKYRAT EDIT BEGIN diff --git a/code/datums/mutations/holy_mutation/burdened.dm b/code/datums/mutations/holy_mutation/burdened.dm index 404688ad750..808109f7de0 100644 --- a/code/datums/mutations/holy_mutation/burdened.dm +++ b/code/datums/mutations/holy_mutation/burdened.dm @@ -15,20 +15,20 @@ /datum/mutation/human/burdened/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, .proc/organ_added_burden) - RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, .proc/organ_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(organ_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(organ_removed_burden)) - RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, .proc/limbs_added_burden) - RegisterSignal(owner, COMSIG_CARBON_REMOVE_LIMB, .proc/limbs_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_ATTACH_LIMB, PROC_REF(limbs_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_REMOVE_LIMB, PROC_REF(limbs_removed_burden)) - RegisterSignal(owner, COMSIG_CARBON_GAIN_ADDICTION, .proc/addict_added_burden) - RegisterSignal(owner, COMSIG_CARBON_LOSE_ADDICTION, .proc/addict_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_GAIN_ADDICTION, PROC_REF(addict_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_ADDICTION, PROC_REF(addict_removed_burden)) - RegisterSignal(owner, COMSIG_CARBON_GAIN_MUTATION, .proc/mutation_added_burden) - RegisterSignal(owner, COMSIG_CARBON_LOSE_MUTATION, .proc/mutation_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_GAIN_MUTATION, PROC_REF(mutation_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_MUTATION, PROC_REF(mutation_removed_burden)) - RegisterSignal(owner, COMSIG_CARBON_GAIN_TRAUMA, .proc/trauma_added_burden) - RegisterSignal(owner, COMSIG_CARBON_LOSE_TRAUMA, .proc/trauma_removed_burden) + RegisterSignal(owner, COMSIG_CARBON_GAIN_TRAUMA, PROC_REF(trauma_added_burden)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_TRAUMA, PROC_REF(trauma_removed_burden)) /datum/mutation/human/burdened/on_losing(mob/living/carbon/human/owner) . = ..() diff --git a/code/datums/mutations/holy_mutation/honorbound.dm b/code/datums/mutations/holy_mutation/honorbound.dm index 5fe9c89dd46..e4112afd104 100644 --- a/code/datums/mutations/holy_mutation/honorbound.dm +++ b/code/datums/mutations/holy_mutation/honorbound.dm @@ -19,18 +19,18 @@ //moodlet owner.add_mood_event("honorbound", /datum/mood_event/honorbound) //checking spells cast by honorbound - RegisterSignal(owner, COMSIG_MOB_CAST_SPELL, .proc/spell_check) - RegisterSignal(owner, COMSIG_MOB_FIRED_GUN, .proc/staff_check) + RegisterSignal(owner, COMSIG_MOB_CAST_SPELL, PROC_REF(spell_check)) + RegisterSignal(owner, COMSIG_MOB_FIRED_GUN, PROC_REF(staff_check)) //signals that check for guilt - RegisterSignal(owner, COMSIG_PARENT_ATTACKBY, .proc/attackby_guilt) - RegisterSignal(owner, COMSIG_ATOM_HULK_ATTACK, .proc/hulk_guilt) - RegisterSignal(owner, COMSIG_ATOM_ATTACK_HAND, .proc/hand_guilt) - RegisterSignal(owner, COMSIG_ATOM_ATTACK_PAW, .proc/paw_guilt) - RegisterSignal(owner, COMSIG_ATOM_BULLET_ACT, .proc/bullet_guilt) - RegisterSignal(owner, COMSIG_ATOM_HITBY, .proc/thrown_guilt) + RegisterSignal(owner, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_guilt)) + RegisterSignal(owner, COMSIG_ATOM_HULK_ATTACK, PROC_REF(hulk_guilt)) + RegisterSignal(owner, COMSIG_ATOM_ATTACK_HAND, PROC_REF(hand_guilt)) + RegisterSignal(owner, COMSIG_ATOM_ATTACK_PAW, PROC_REF(paw_guilt)) + RegisterSignal(owner, COMSIG_ATOM_BULLET_ACT, PROC_REF(bullet_guilt)) + RegisterSignal(owner, COMSIG_ATOM_HITBY, PROC_REF(thrown_guilt)) //signal that checks for dishonorable attacks - RegisterSignal(owner, COMSIG_MOB_CLICKON, .proc/attack_honor) + RegisterSignal(owner, COMSIG_MOB_CLICKON, PROC_REF(attack_honor)) /datum/mutation/human/honorbound/on_losing(mob/living/carbon/human/owner) owner.clear_mood_event("honorbound") @@ -244,7 +244,7 @@ if(QDELETED(honor_mut)) return FALSE - RegisterSignal(honor_mut, COMSIG_PARENT_QDELETING, .proc/on_honor_mutation_lost) + RegisterSignal(honor_mut, COMSIG_PARENT_QDELETING, PROC_REF(on_honor_mutation_lost)) honor_mutation = honor_mut return ..() diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 8b81541f6e8..a26d37579c7 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -25,9 +25,9 @@ part.variable_color = "#00aa00" owner.update_body_parts() owner.add_mood_event("hulk", /datum/mood_event/hulk) - RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/on_attack_hand) - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) - RegisterSignal(owner, COMSIG_MOB_CLICKON, .proc/check_swing) + RegisterSignal(owner, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(on_attack_hand)) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) + RegisterSignal(owner, COMSIG_MOB_CLICKON, PROC_REF(check_swing)) /datum/mutation/human/hulk/proc/on_attack_hand(mob/living/carbon/human/source, atom/target, proximity, modifiers) SIGNAL_HANDLER @@ -39,7 +39,7 @@ if(target.attack_hulk(owner)) if(world.time > (last_scream + scream_delay)) last_scream = world.time - INVOKE_ASYNC(src, .proc/scream_attack, source) + INVOKE_ASYNC(src, PROC_REF(scream_attack), source) log_combat(source, target, "punched", "hulk powers") source.do_attack_animation(target, ATTACK_EFFECT_SMASH) source.changeNext_move(CLICK_CD_MELEE) @@ -127,7 +127,7 @@ return user.face_atom(clicked_atom) - INVOKE_ASYNC(src, .proc/setup_swing, user, possible_throwable) + INVOKE_ASYNC(src, PROC_REF(setup_swing), user, possible_throwable) return(COMSIG_MOB_CANCEL_CLICKON) /// Do a short 2 second do_after before starting the actual swing @@ -233,7 +233,7 @@ the_hulk.visible_message(span_danger("[the_hulk] loses [the_hulk.p_their()] momentum on [yeeted_person]!"), span_warning("You lose your momentum on swinging [yeeted_person]!"), ignored_mobs = yeeted_person) to_chat(yeeted_person, span_userdanger("[the_hulk] loses [the_hulk.p_their()] momentum and lets go of you!")) else - addtimer(CALLBACK(src, .proc/swing_loop, the_hulk, yeeted_person, step, original_dir), delay) + addtimer(CALLBACK(src, PROC_REF(swing_loop), the_hulk, yeeted_person, step, original_dir), delay) /// Time to toss the victim at high speed /datum/mutation/human/hulk/proc/finish_swing(mob/living/carbon/human/the_hulk, mob/living/carbon/yeeted_person, original_dir) diff --git a/code/datums/mutations/sight.dm b/code/datums/mutations/sight.dm index 2ae8ae9fc13..c80979a3645 100644 --- a/code/datums/mutations/sight.dm +++ b/code/datums/mutations/sight.dm @@ -92,7 +92,7 @@ ADD_TRAIT(cast_on, TRAIT_THERMAL_VISION, GENETIC_MUTATION) cast_on.update_sight() to_chat(cast_on, span_info("You focus your eyes intensely, as your vision becomes filled with heat signatures.")) - addtimer(CALLBACK(src, .proc/deactivate, cast_on), thermal_duration) + addtimer(CALLBACK(src, PROC_REF(deactivate), cast_on), thermal_duration) /datum/action/cooldown/spell/thermal_vision/proc/deactivate(mob/living/cast_on) if(QDELETED(cast_on) || !HAS_TRAIT_FROM(cast_on, TRAIT_THERMAL_VISION, GENETIC_MUTATION)) @@ -147,7 +147,7 @@ . = ..() if(.) return - RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, .proc/on_ranged_attack) + RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, PROC_REF(on_ranged_attack)) /datum/mutation/human/laser_eyes/on_losing(mob/living/carbon/human/H) . = ..() @@ -171,7 +171,7 @@ LE.firer = source LE.def_zone = ran_zone(source.zone_selected) LE.preparePixelProjectile(target, source, modifiers) - INVOKE_ASYNC(LE, /obj/projectile.proc/fire) + INVOKE_ASYNC(LE, TYPE_PROC_REF(/obj/projectile, fire)) playsound(source, 'sound/weapons/taser2.ogg', 75, TRUE) ///Projectile type used by laser eyes diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index 51e822806a2..3a061ac4459 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -21,7 +21,7 @@ /datum/mutation/human/wacky/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/wacky/on_losing(mob/living/carbon/human/owner) if(..()) @@ -77,7 +77,7 @@ /datum/mutation/human/swedish/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/swedish/on_losing(mob/living/carbon/human/owner) if(..()) @@ -108,7 +108,7 @@ /datum/mutation/human/chav/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/chav/on_losing(mob/living/carbon/human/owner) if(..()) @@ -157,7 +157,7 @@ /datum/mutation/human/elvis/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/elvis/on_losing(mob/living/carbon/human/owner) if(..()) @@ -210,7 +210,7 @@ /datum/mutation/human/medieval/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/medieval/on_losing(mob/living/carbon/human/owner) if(..()) @@ -250,7 +250,7 @@ /datum/mutation/human/piglatin/on_acquiring(mob/living/carbon/human/owner) if(..()) return - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/mutation/human/piglatin/on_losing(mob/living/carbon/human/owner) if(..()) diff --git a/code/datums/mutations/telekinesis.dm b/code/datums/mutations/telekinesis.dm index 234cc637495..03c144b0d03 100644 --- a/code/datums/mutations/telekinesis.dm +++ b/code/datums/mutations/telekinesis.dm @@ -19,7 +19,7 @@ . = ..() if(.) return - RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, .proc/on_ranged_attack) + RegisterSignal(H, COMSIG_MOB_ATTACK_RANGED, PROC_REF(on_ranged_attack)) /datum/mutation/human/telekinesis/on_losing(mob/living/carbon/human/H) . = ..() diff --git a/code/datums/mutations/tongue_spike.dm b/code/datums/mutations/tongue_spike.dm index 1bd02df0b3e..ecfc037931b 100644 --- a/code/datums/mutations/tongue_spike.dm +++ b/code/datums/mutations/tongue_spike.dm @@ -64,7 +64,7 @@ /obj/item/hardened_spike/Initialize(mapload, mob/living/carbon/source) . = ..() src.fired_by_ref = WEAKREF(source) - addtimer(CALLBACK(src, .proc/check_embedded), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(check_embedded)), 5 SECONDS) /obj/item/hardened_spike/proc/check_embedded() if(missed) diff --git a/code/datums/mutations/void_magnet.dm b/code/datums/mutations/void_magnet.dm index 6253a82c148..f6fe1e23de8 100644 --- a/code/datums/mutations/void_magnet.dm +++ b/code/datums/mutations/void_magnet.dm @@ -50,7 +50,7 @@ if(!owner) return - RegisterSignal(grant_to, COMSIG_LIVING_LIFE, .proc/on_life) + RegisterSignal(grant_to, COMSIG_LIVING_LIFE, PROC_REF(on_life)) /datum/action/cooldown/spell/void/cursed/Remove(mob/remove_from) UnregisterSignal(remove_from, COMSIG_LIVING_LIFE) diff --git a/code/datums/profiling.dm b/code/datums/profiling.dm index 49a80d0eded..1eec8787116 100644 --- a/code/datums/profiling.dm +++ b/code/datums/profiling.dm @@ -6,7 +6,7 @@ GLOBAL_REAL_VAR(PROFILE_SLEEPCHECK) GLOBAL_REAL_VAR(PROFILE_TIME) -/proc/profile_show(user, sort = /proc/cmp_profile_avg_time_dsc) +/proc/profile_show(user, sort = GLOBAL_PROC_REF(cmp_profile_avg_time_dsc)) sortTim(PROFILE_STORE, sort, TRUE) var/list/lines = list() diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index 16bc2b4d4a8..fa89be0f85f 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_LOGOUT, .proc/clean_user_client) - RegisterSignal(user, COMSIG_MOB_LOGIN, .proc/on_user_login) + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(on_user_delete)) + RegisterSignal(user, COMSIG_MOB_LOGOUT, PROC_REF(clean_user_client)) + RegisterSignal(user, COMSIG_MOB_LOGIN, PROC_REF(on_user_login)) /datum/progressbar/Destroy() diff --git a/code/datums/proximity_monitor/fields/projectile_dampener.dm b/code/datums/proximity_monitor/fields/projectile_dampener.dm index 9645d135c77..ce468d39891 100644 --- a/code/datums/proximity_monitor/fields/projectile_dampener.dm +++ b/code/datums/proximity_monitor/fields/projectile_dampener.dm @@ -18,7 +18,7 @@ /datum/proximity_monitor/advanced/projectile_dampener/New(atom/_host, range, _ignore_if_not_on_turf = TRUE, atom/projector) ..() - RegisterSignal(projector, COMSIG_PARENT_QDELETING, .proc/on_projector_del) + RegisterSignal(projector, COMSIG_PARENT_QDELETING, PROC_REF(on_projector_del)) recalculate_field() START_PROCESSING(SSfastprocess, src) diff --git a/code/datums/proximity_monitor/fields/timestop.dm b/code/datums/proximity_monitor/fields/timestop.dm index 324dc5653ad..ef4b744db49 100644 --- a/code/datums/proximity_monitor/fields/timestop.dm +++ b/code/datums/proximity_monitor/fields/timestop.dm @@ -35,7 +35,7 @@ if(stand.summoner && HAS_TRAIT(stand.summoner, TRAIT_TIME_STOP_IMMUNE)) //It would only make sense that a person's stand would also be immune. immune[stand] = TRUE if(start) - INVOKE_ASYNC(src, .proc/timestop) + INVOKE_ASYNC(src, PROC_REF(timestop)) /obj/effect/timestop/Destroy() QDEL_NULL(chronofield) @@ -93,7 +93,7 @@ return FALSE if(immune[A]) //a little special logic but yes immune things don't freeze if(channelled) - RegisterSignal(A, COMSIG_MOVABLE_MOVED, .proc/atom_broke_channel, override = TRUE) + RegisterSignal(A, COMSIG_MOVABLE_MOVED, PROC_REF(atom_broke_channel), override = TRUE) return FALSE if(ismob(A)) var/mob/M = A @@ -121,8 +121,8 @@ A.move_resist = INFINITY global_frozen_atoms[A] = src into_the_negative_zone(A) - RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, .proc/unfreeze_atom) - RegisterSignal(A, COMSIG_ITEM_PICKUP, .proc/unfreeze_atom) + RegisterSignal(A, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(unfreeze_atom)) + RegisterSignal(A, COMSIG_ITEM_PICKUP, PROC_REF(unfreeze_atom)) return TRUE diff --git a/code/datums/proximity_monitor/proximity_monitor.dm b/code/datums/proximity_monitor/proximity_monitor.dm index 9911efe0c95..7b5648c9e2b 100644 --- a/code/datums/proximity_monitor/proximity_monitor.dm +++ b/code/datums/proximity_monitor/proximity_monitor.dm @@ -9,9 +9,9 @@ var/ignore_if_not_on_turf ///The signals of the connect range component, needed to monitor the turfs in range. var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, - COMSIG_ATOM_EXITED = .proc/on_uncrossed, - COMSIG_ATOM_INITIALIZED_ON = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), + COMSIG_ATOM_EXITED = PROC_REF(on_uncrossed), + COMSIG_ATOM_INITIALIZED_ON = PROC_REF(on_entered), ) /datum/proximity_monitor/New(atom/_host, range, _ignore_if_not_on_turf = TRUE) @@ -29,15 +29,15 @@ if(new_receiver) hasprox_receiver = new_receiver if(new_receiver != new_host) - RegisterSignal(new_receiver, COMSIG_PARENT_QDELETING, .proc/on_host_or_receiver_del) + RegisterSignal(new_receiver, COMSIG_PARENT_QDELETING, PROC_REF(on_host_or_receiver_del)) else if(hasprox_receiver == host) //Default case hasprox_receiver = new_host host = new_host - RegisterSignal(new_host, COMSIG_PARENT_QDELETING, .proc/on_host_or_receiver_del) - var/static/list/containers_connections = list(COMSIG_MOVABLE_MOVED = .proc/on_moved, COMSIG_MOVABLE_Z_CHANGED = .proc/on_z_change) + RegisterSignal(new_host, COMSIG_PARENT_QDELETING, PROC_REF(on_host_or_receiver_del)) + var/static/list/containers_connections = list(COMSIG_MOVABLE_MOVED = PROC_REF(on_moved), COMSIG_MOVABLE_Z_CHANGED = PROC_REF(on_z_change)) AddComponent(/datum/component/connect_containers, host, containers_connections) - RegisterSignal(host, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(host, COMSIG_MOVABLE_Z_CHANGED, .proc/on_z_change) + RegisterSignal(host, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(host, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_z_change)) set_range(current_range, TRUE) /datum/proximity_monitor/proc/on_host_or_receiver_del(datum/source) diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index 379ac1cab82..1f24e1e3034 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -77,9 +77,9 @@ if(quirk_holder.client) post_add() else - RegisterSignal(quirk_holder, COMSIG_MOB_LOGIN, .proc/on_quirk_holder_first_login) + RegisterSignal(quirk_holder, COMSIG_MOB_LOGIN, PROC_REF(on_quirk_holder_first_login)) - RegisterSignal(quirk_holder, COMSIG_PARENT_QDELETING, .proc/on_holder_qdeleting) + RegisterSignal(quirk_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdeleting)) return TRUE diff --git a/code/datums/quirks/negative.dm b/code/datums/quirks/negative.dm index 9209019d42e..f1d458b8fff 100644 --- a/code/datums/quirks/negative.dm +++ b/code/datums/quirks/negative.dm @@ -18,9 +18,9 @@ var/obj/item/storage/backpack/equipped_backpack = human_holder.back if(istype(equipped_backpack)) quirk_holder.add_mood_event("back_pain", /datum/mood_event/back_pain) - RegisterSignal(human_holder.back, COMSIG_ITEM_POST_UNEQUIP, .proc/on_unequipped_backpack) + RegisterSignal(human_holder.back, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(on_unequipped_backpack)) else - RegisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM, .proc/on_equipped_item) + RegisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM, PROC_REF(on_equipped_item)) /datum/quirk/badback/remove() UnregisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM) @@ -38,7 +38,7 @@ return quirk_holder.add_mood_event("back_pain", /datum/mood_event/back_pain) - RegisterSignal(equipped_item, COMSIG_ITEM_POST_UNEQUIP, .proc/on_unequipped_backpack) + RegisterSignal(equipped_item, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(on_unequipped_backpack)) UnregisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM) backpack = WEAKREF(equipped_item) @@ -49,7 +49,7 @@ UnregisterSignal(source, COMSIG_ITEM_POST_UNEQUIP) quirk_holder.clear_mood_event("back_pain") backpack = null - RegisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM, .proc/on_equipped_item) + RegisterSignal(quirk_holder, COMSIG_MOB_EQUIPPED_ITEM, PROC_REF(on_equipped_item)) /datum/quirk/blooddeficiency name = "Blood Deficiency" @@ -345,7 +345,7 @@ mail_goodies = list(/obj/effect/spawner/random/engineering/flashlight) /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) @@ -580,9 +580,9 @@ var/dumb_thing = TRUE /datum/quirk/social_anxiety/add() - RegisterSignal(quirk_holder, COMSIG_MOB_EYECONTACT, .proc/eye_contact) - RegisterSignal(quirk_holder, COMSIG_MOB_EXAMINATE, .proc/looks_at_floor) - RegisterSignal(quirk_holder, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(quirk_holder, COMSIG_MOB_EYECONTACT, PROC_REF(eye_contact)) + RegisterSignal(quirk_holder, COMSIG_MOB_EXAMINATE, PROC_REF(looks_at_floor)) + RegisterSignal(quirk_holder, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /datum/quirk/social_anxiety/remove() UnregisterSignal(quirk_holder, list(COMSIG_MOB_EYECONTACT, COMSIG_MOB_EXAMINATE, COMSIG_MOB_SAY)) @@ -648,7 +648,7 @@ if(prob(85) || (istype(mind_check) && mind_check.mind)) return - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, quirk_holder, span_smallnotice("You make eye contact with [A].")), 3) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), quirk_holder, span_smallnotice("You make eye contact with [A].")), 3) /datum/quirk/social_anxiety/proc/eye_contact(datum/source, mob/living/other_mob, triggering_examiner) SIGNAL_HANDLER @@ -673,7 +673,7 @@ msg += "causing you to freeze up!" quirk_holder.add_mood_event("anxiety_eyecontact", /datum/mood_event/anxiety_eyecontact) - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, quirk_holder, span_userdanger("[msg]")), 3) // so the examine signal has time to fire and this will print after + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), quirk_holder, span_userdanger("[msg]")), 3) // so the examine signal has time to fire and this will print after return COMSIG_BLOCK_EYECONTACT /datum/mood_event/anxiety_eyecontact @@ -910,7 +910,7 @@ mail_goodies = list(/obj/item/reagent_containers/spray/pepper) // show me on the doll where the bad man touched you /datum/quirk/bad_touch/add() - RegisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT), .proc/uncomfortable_touch) + RegisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT), PROC_REF(uncomfortable_touch)) /datum/quirk/bad_touch/remove() UnregisterSignal(quirk_holder, list(COMSIG_LIVING_GET_PULLED, COMSIG_CARBON_HELP_ACT)) diff --git a/code/datums/quirks/neutral.dm b/code/datums/quirks/neutral.dm index 54a753518c4..25d0da4d505 100644 --- a/code/datums/quirks/neutral.dm +++ b/code/datums/quirks/neutral.dm @@ -71,7 +71,7 @@ var/datum/species/species = human_holder.dna.species species.liked_food &= ~MEAT species.disliked_food |= MEAT - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) /datum/quirk/vegetarian/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -113,7 +113,7 @@ var/mob/living/carbon/human/human_holder = quirk_holder var/datum/species/species = human_holder.dna.species species.liked_food |= PINEAPPLE - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) /datum/quirk/pineapple_liker/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -145,7 +145,7 @@ var/mob/living/carbon/human/human_holder = quirk_holder var/datum/species/species = human_holder.dna.species species.disliked_food |= PINEAPPLE - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) /datum/quirk/pineapple_hater/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -173,7 +173,7 @@ var/liked = species.liked_food species.liked_food = species.disliked_food species.disliked_food = liked - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) /datum/quirk/deviant_tastes/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -221,7 +221,7 @@ human_holder.eye_color_heterochromatic = TRUE human_holder.eye_color_right = color // We set override to TRUE as link to holder will be called whenever the preference is applied, given this quirk exists on the mob - RegisterSignal(human_holder, COMSIG_CARBON_LOSE_ORGAN, .proc/check_eye_removal, override=TRUE) + RegisterSignal(human_holder, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_eye_removal), override=TRUE) var/obj/item/organ/internal/eyes/eyes_of_the_holder = quirk_holder.getorgan(/obj/item/organ/internal/eyes) if(!eyes_of_the_holder) @@ -320,8 +320,8 @@ old_hair = human_holder.hairstyle human_holder.hairstyle = "Bald" human_holder.update_body_parts() - RegisterSignal(human_holder, COMSIG_CARBON_EQUIP_HAT, .proc/equip_hat) - RegisterSignal(human_holder, COMSIG_CARBON_UNEQUIP_HAT, .proc/unequip_hat) + RegisterSignal(human_holder, COMSIG_CARBON_EQUIP_HAT, PROC_REF(equip_hat)) + RegisterSignal(human_holder, COMSIG_CARBON_UNEQUIP_HAT, PROC_REF(unequip_hat)) /datum/quirk/item_quirk/bald/add_unique() var/obj/item/clothing/head/wig/natural/baldie_wig = new(get_turf(quirk_holder)) @@ -464,10 +464,10 @@ var/mob/living/carbon/human/human_holder = quirk_holder var/datum/species/species = human_holder.dna.species species.liked_food = JUNKFOOD - RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, .proc/on_species_gain) - RegisterSignal(human_holder, COMSIG_MOB_WON_VIDEOGAME, .proc/won_game) - RegisterSignal(human_holder, COMSIG_MOB_LOST_VIDEOGAME, .proc/lost_game) - RegisterSignal(human_holder, COMSIG_MOB_PLAYED_VIDEOGAME, .proc/gamed) + RegisterSignal(human_holder, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) + RegisterSignal(human_holder, COMSIG_MOB_WON_VIDEOGAME, PROC_REF(won_game)) + RegisterSignal(human_holder, COMSIG_MOB_LOST_VIDEOGAME, PROC_REF(lost_game)) + RegisterSignal(human_holder, COMSIG_MOB_PLAYED_VIDEOGAME, PROC_REF(gamed)) /datum/quirk/gamer/proc/on_species_gain(datum/source, datum/species/new_species, datum/species/old_species) SIGNAL_HANDLER @@ -484,7 +484,7 @@ /datum/quirk/gamer/add_unique() // The gamer starts off quelled - gaming_withdrawal_timer = addtimer(CALLBACK(src, .proc/enter_withdrawal), GAMING_WITHDRAWAL_TIME, TIMER_STOPPABLE) + gaming_withdrawal_timer = addtimer(CALLBACK(src, PROC_REF(enter_withdrawal)), GAMING_WITHDRAWAL_TIME, TIMER_STOPPABLE) /** * Gamer won a game @@ -512,7 +512,7 @@ var/mob/living/carbon/human/human_holder = quirk_holder human_holder.add_mood_event("gamer_lost", /datum/mood_event/gamer_lost) // Executed asynchronously due to say() - INVOKE_ASYNC(src, .proc/gamer_moment) + INVOKE_ASYNC(src, PROC_REF(gamer_moment)) /** * Gamer is playing a game * @@ -528,7 +528,7 @@ // Reset withdrawal timer if (gaming_withdrawal_timer) deltimer(gaming_withdrawal_timer) - gaming_withdrawal_timer = addtimer(CALLBACK(src, .proc/enter_withdrawal), GAMING_WITHDRAWAL_TIME, TIMER_STOPPABLE) + gaming_withdrawal_timer = addtimer(CALLBACK(src, PROC_REF(enter_withdrawal)), GAMING_WITHDRAWAL_TIME, TIMER_STOPPABLE) /datum/quirk/gamer/proc/gamer_moment() diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index ac952956a10..95f7650470b 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -18,7 +18,7 @@ * transfers reagents from prerequisite objects, * deletes all prerequisite objects (even not needed for recipe at the moment). * - * /proc/select_recipe(list/datum/recipe/avaiable_recipes, obj/obj as obj, exact = 1) + * /proc/select_recipe(list/datum/recipe/avaiable_recipes), obj/obj as obj, exact = 1) * Wonderful function that select suitable recipe for you. * obj is a machine (or magik hat) with prerequisites, * exact = 0 forces algorithm to ignore superfluous stuff. diff --git a/code/datums/screentips/atom_context.dm b/code/datums/screentips/atom_context.dm index 7696a3d8e77..557ad52c0f3 100644 --- a/code/datums/screentips/atom_context.dm +++ b/code/datums/screentips/atom_context.dm @@ -4,7 +4,7 @@ /// This is not necessary for Type-B interactions, as you can just apply the flag and register to the signal yourself. /atom/proc/register_context() flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(src, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/add_context) + RegisterSignal(src, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(add_context)) /// Creates a "Type-B" contextual screentip interaction. /// When a user hovers over this, this proc will be called in order diff --git a/code/datums/screentips/item_context.dm b/code/datums/screentips/item_context.dm index 239cd186836..8afa99ddcf2 100644 --- a/code/datums/screentips/item_context.dm +++ b/code/datums/screentips/item_context.dm @@ -7,7 +7,7 @@ RegisterSignal( src, COMSIG_ITEM_REQUESTING_CONTEXT_FOR_TARGET, - .proc/add_item_context, + PROC_REF(add_item_context), ) /// Creates a "Type-A" contextual screentip interaction. diff --git a/code/datums/station_traits/_station_trait.dm b/code/datums/station_traits/_station_trait.dm index 5fbf8611d57..cb0de6afd4e 100644 --- a/code/datums/station_traits/_station_trait.dm +++ b/code/datums/station_traits/_station_trait.dm @@ -26,7 +26,7 @@ /datum/station_trait/New() . = ..() - RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, .proc/on_round_start) + RegisterSignal(SSticker, COMSIG_TICKER_ROUND_STARTING, PROC_REF(on_round_start)) if(trait_processes) START_PROCESSING(SSstation, src) diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index 24ce225f747..fdcffd5fb69 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -46,7 +46,7 @@ /datum/station_trait/hangover/New() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_LATEJOIN_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_LATEJOIN_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/hangover/revert() for (var/obj/effect/landmark/start/hangover/hangover_spot in GLOB.start_landmarks_list) @@ -106,7 +106,7 @@ /datum/station_trait/overflow_job_bureaucracy/New() . = ..() - RegisterSignal(SSjob, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/set_overflow_job_override) + RegisterSignal(SSjob, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(set_overflow_job_override)) /datum/station_trait/overflow_job_bureaucracy/get_report() return "[name] - It seems for some reason we put out the wrong job-listing for the overflow role this shift...I hope you like [chosen_job_name]s." @@ -181,7 +181,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 63278e06535..60d5cc7ac0c 100644 --- a/code/datums/station_traits/neutral_traits.dm +++ b/code/datums/station_traits/neutral_traits.dm @@ -51,7 +51,7 @@ // Also gives him a couple extra lives to survive eventual tiders. dog.deadchat_plays(DEMOCRACY_MODE|MUTE_DEMOCRACY_MESSAGES, 3 SECONDS) dog.AddComponent(/datum/component/multiple_lives, 2) - RegisterSignal(dog, COMSIG_ON_MULTIPLE_LIVES_RESPAWN, .proc/do_corgi_respawn) + RegisterSignal(dog, COMSIG_ON_MULTIPLE_LIVES_RESPAWN, PROC_REF(do_corgi_respawn)) // The extended safety checks at time of writing are about chasms and lava // if there are any chasms and lava on stations in the future, woah @@ -89,7 +89,7 @@ new_dog.regenerate_icons() new_dog.deadchat_plays(DEMOCRACY_MODE|MUTE_DEMOCRACY_MESSAGES, 3 SECONDS) if(lives_left) - RegisterSignal(new_dog, COMSIG_ON_MULTIPLE_LIVES_RESPAWN, .proc/do_corgi_respawn) + RegisterSignal(new_dog, COMSIG_ON_MULTIPLE_LIVES_RESPAWN, PROC_REF(do_corgi_respawn)) if(!gibbed) //The old dog will now disappear so we won't have more than one Ian at a time. qdel(old_dog) @@ -150,7 +150,7 @@ /datum/station_trait/cargorilla/New() . = ..() - RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/replace_cargo) + RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(replace_cargo)) /// Replace some cargo equipment and 'personnel' with a gorilla. /datum/station_trait/cargorilla/proc/replace_cargo(datum/source) @@ -164,7 +164,7 @@ cargorilla.name = cargo_sloth.name // We do a poll on roundstart, don't let ghosts in early cargorilla.being_polled_for = TRUE - INVOKE_ASYNC(src, .proc/make_id_for_gorilla) + INVOKE_ASYNC(src, PROC_REF(make_id_for_gorilla)) // hm our sloth looks funny today qdel(cargo_sloth) @@ -185,7 +185,7 @@ if(!cargorilla) return - addtimer(CALLBACK(src, .proc/get_ghost_for_gorilla, cargorilla), 12 SECONDS) // give ghosts a bit of time to funnel in + addtimer(CALLBACK(src, PROC_REF(get_ghost_for_gorilla), cargorilla), 12 SECONDS) // give ghosts a bit of time to funnel in cargorilla = null /// Get us a ghost for the gorilla. diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index 9ae7bef3e81..902ac8f2386 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -95,7 +95,7 @@ /obj/item/clothing/neck/large_scarf/blue, ) - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/scarves/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/spawned, client/player_client) @@ -145,7 +145,7 @@ deathrattle_group = new("[department_name] group") blacklist += subtypesof(/datum/station_trait/deathrattle_department) - type //All but ourselves report_message = "All members of [department_name] have received an implant to notify each other if one of them dies. This should help improve job-safety!" - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/deathrattle_department/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/spawned, client/player_client) @@ -221,7 +221,7 @@ . = ..() deathrattle_group = new("station group") blacklist = subtypesof(/datum/station_trait/deathrattle_department) - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/deathrattle_all/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/spawned, client/player_client) @@ -241,7 +241,7 @@ /datum/station_trait/wallets/New() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, .proc/on_job_after_spawn) + RegisterSignal(SSdcs, COMSIG_GLOB_JOB_AFTER_SPAWN, PROC_REF(on_job_after_spawn)) /datum/station_trait/wallets/proc/on_job_after_spawn(datum/source, datum/job/job, mob/living/living_mob, mob/M, joined_late) SIGNAL_HANDLER diff --git a/code/datums/status_effects/debuffs/choke.dm b/code/datums/status_effects/debuffs/choke.dm index 27ed856d8bf..683c7e70a42 100644 --- a/code/datums/status_effects/debuffs/choke.dm +++ b/code/datums/status_effects/debuffs/choke.dm @@ -39,18 +39,18 @@ choking_on.forceMove(owner) // backup else choking_on.forceMove(owner) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_NOBREATH), .proc/no_breathing) - RegisterSignal(owner, COMSIG_MOB_LOGOUT, .proc/on_logout) - RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, .proc/remove_choke) - RegisterSignal(owner, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_NOBREATH), PROC_REF(no_breathing)) + RegisterSignal(owner, COMSIG_MOB_LOGOUT, PROC_REF(on_logout)) + RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(remove_choke)) + RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(on_death)) // Of note, this means plasma lovers lose some methods of vomiting up - RegisterSignal(owner, COMSIG_CARBON_VOMITED, .proc/on_vomit) - RegisterSignal(owner, COMSIG_CARBON_ATTEMPT_EAT, .proc/attempt_eat) - RegisterSignal(owner, COMSIG_CARBON_PRE_HELP, .proc/helped) - RegisterSignal(owner, COMSIG_CARBON_PRE_MISC_HELP, .proc/shook) + RegisterSignal(owner, COMSIG_CARBON_VOMITED, PROC_REF(on_vomit)) + RegisterSignal(owner, COMSIG_CARBON_ATTEMPT_EAT, PROC_REF(attempt_eat)) + RegisterSignal(owner, COMSIG_CARBON_PRE_HELP, PROC_REF(helped)) + RegisterSignal(owner, COMSIG_CARBON_PRE_MISC_HELP, PROC_REF(shook)) - RegisterSignal(choking_on, COMSIG_PARENT_QDELETING, .proc/remove_choke) - RegisterSignal(choking_on, COMSIG_MOVABLE_MOVED, .proc/hazard_moved) + RegisterSignal(choking_on, COMSIG_PARENT_QDELETING, PROC_REF(remove_choke)) + RegisterSignal(choking_on, COMSIG_MOVABLE_MOVED, PROC_REF(hazard_moved)) ADD_TRAIT(owner, TRAIT_MUTE, CHOKING_TRAIT) owner.add_mood_event(id, /datum/mood_event/choke) @@ -68,7 +68,7 @@ var/clear_in = rand(15 SECONDS, 25 SECONDS) if(duration != -1) clear_in = min(duration, clear_in) - addtimer(CALLBACK(src, .proc/clear_flame), clear_in) + addtimer(CALLBACK(src, PROC_REF(clear_flame)), clear_in) return TRUE /datum/status_effect/choke/proc/should_do_effects() @@ -138,7 +138,7 @@ /datum/status_effect/choke/proc/no_breathing(mob/living/source) SIGNAL_HANDLER - RegisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_NOBREATH), .proc/on_breathable) + RegisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_NOBREATH), PROC_REF(on_breathable)) check_audio_state() /datum/status_effect/choke/proc/on_breathable(mob/living/source) @@ -152,7 +152,7 @@ /datum/status_effect/choke/proc/on_death(mob/living/source) SIGNAL_HANDLER - RegisterSignal(source, COMSIG_LIVING_REVIVE, .proc/on_revive) + RegisterSignal(source, COMSIG_LIVING_REVIVE, PROC_REF(on_revive)) check_audio_state() /datum/status_effect/choke/proc/on_revive(mob/living/source) @@ -167,12 +167,12 @@ /datum/status_effect/choke/proc/helped(mob/source, mob/helping) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/heimlich, source, helping) + INVOKE_ASYNC(src, PROC_REF(heimlich), source, helping) return COMPONENT_BLOCK_HELP_ACT /datum/status_effect/choke/proc/shook(mob/source, mob/helping) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/heimlich, source, helping) + INVOKE_ASYNC(src, PROC_REF(heimlich), source, helping) return COMPONENT_BLOCK_MISC_HELP /datum/status_effect/choke/proc/heimlich(mob/victim, mob/aggressor) @@ -204,7 +204,7 @@ owner.visible_message(span_warning("[aggressor] places [aggressor.p_their()] [hand_name]s on [victim]'s back, and begins forcefully striking it!"), \ span_boldwarning("You feel [aggressor]\s [hand_name]s on your back, and then repeated striking!")) - if(!do_after_mob(aggressor, victim, 7 SECONDS, extra_checks = CALLBACK(src, .proc/thrusting_continues, victim, aggressor), interaction_key = "heimlich")) + if(!do_after_mob(aggressor, victim, 7 SECONDS, extra_checks = CALLBACK(src, PROC_REF(thrusting_continues), victim, aggressor), interaction_key = "heimlich")) aggressor.stop_pulling() return aggressor.stop_pulling() diff --git a/code/datums/status_effects/debuffs/confusion.dm b/code/datums/status_effects/debuffs/confusion.dm index ae115e4315d..209e9bdebb2 100644 --- a/code/datums/status_effects/debuffs/confusion.dm +++ b/code/datums/status_effects/debuffs/confusion.dm @@ -15,8 +15,8 @@ return ..() /datum/status_effect/confusion/on_apply() - RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, .proc/remove_confusion) - RegisterSignal(owner, COMSIG_MOB_CLIENT_PRE_MOVE, .proc/on_move) + RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(remove_confusion)) + RegisterSignal(owner, COMSIG_MOB_CLIENT_PRE_MOVE, PROC_REF(on_move)) return TRUE /datum/status_effect/confusion/on_remove() diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm index cc26922ac72..874e72530bf 100644 --- a/code/datums/status_effects/debuffs/debuffs.dm +++ b/code/datums/status_effects/debuffs/debuffs.dm @@ -141,8 +141,8 @@ if(!HAS_TRAIT(owner, TRAIT_SLEEPIMMUNE)) ADD_TRAIT(owner, TRAIT_KNOCKEDOUT, TRAIT_STATUS_EFFECT(id)) tick_interval = -1 - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_SLEEPIMMUNE), .proc/on_owner_insomniac) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_SLEEPIMMUNE), .proc/on_owner_sleepy) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_SLEEPIMMUNE), PROC_REF(on_owner_insomniac)) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_SLEEPIMMUNE), PROC_REF(on_owner_sleepy)) /datum/status_effect/incapacitating/sleeping/on_remove() UnregisterSignal(owner, list(SIGNAL_ADDTRAIT(TRAIT_SLEEPIMMUNE), SIGNAL_REMOVETRAIT(TRAIT_SLEEPIMMUNE))) @@ -563,7 +563,7 @@ /datum/status_effect/trance/on_apply() if(!iscarbon(owner)) return FALSE - RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/hypnotize) + RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(hypnotize)) ADD_TRAIT(owner, TRAIT_MUTE, STATUS_EFFECT_TRAIT) owner.add_client_colour(/datum/client_colour/monochrome/trance) owner.visible_message("[stun ? span_warning("[owner] stands still as [owner.p_their()] eyes seem to focus on a distant point.") : ""]", \ @@ -598,8 +598,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("hypnotised [key_name(C)] with the phrase '[hearing_args[HEARING_RAW_MESSAGE]]'", LOG_ATTACK, color="red") C.log_message("has been hypnotised by the phrase '[hearing_args[HEARING_RAW_MESSAGE]]' spoken by [key_name(hearing_speaker)]", LOG_VICTIM, color="orange", log_globally = FALSE) - addtimer(CALLBACK(C, /mob/living/carbon.proc/gain_trauma, /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 10) - addtimer(CALLBACK(C, /mob/living.proc/Stun, 60, TRUE, TRUE), 15) //Take some time to think about it + addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, gain_trauma), /datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY, hearing_args[HEARING_RAW_MESSAGE]), 10) + addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living, Stun), 60, TRUE, TRUE), 15) //Take some time to think about it qdel(src) /datum/status_effect/spasms @@ -801,7 +801,7 @@ if(new_owner.stat < UNCONSCIOUS) // Unconcious people won't get messages to_chat(new_owner, span_userdanger("You're covered in ants!")) ants_remaining += amount_left - RegisterSignal(new_owner, COMSIG_COMPONENT_CLEAN_ACT, .proc/ants_washed) + RegisterSignal(new_owner, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(ants_washed)) . = ..() /datum/status_effect/ants/refresh(effect, amount_left) @@ -818,7 +818,7 @@ /datum/status_effect/ants/on_remove() ants_remaining = 0 to_chat(owner, span_notice("All of the ants are off of your body!")) - UnregisterSignal(owner, COMSIG_COMPONENT_CLEAN_ACT, .proc/ants_washed) + UnregisterSignal(owner, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(ants_washed)) . = ..() /datum/status_effect/ants/proc/ants_washed() diff --git a/code/datums/status_effects/debuffs/dizziness.dm b/code/datums/status_effects/debuffs/dizziness.dm index 2ee73cef442..82ced79e26a 100644 --- a/code/datums/status_effects/debuffs/dizziness.dm +++ b/code/datums/status_effects/debuffs/dizziness.dm @@ -8,7 +8,7 @@ return ..() /datum/status_effect/dizziness/on_apply() - RegisterSignal(owner, list(COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_DEATH), .proc/clear_dizziness) + RegisterSignal(owner, list(COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_DEATH), PROC_REF(clear_dizziness)) return TRUE /datum/status_effect/dizziness/on_remove() diff --git a/code/datums/status_effects/debuffs/drugginess.dm b/code/datums/status_effects/debuffs/drugginess.dm index d3c5aa5e584..651eb862148 100644 --- a/code/datums/status_effects/debuffs/drugginess.dm +++ b/code/datums/status_effects/debuffs/drugginess.dm @@ -8,7 +8,7 @@ return ..() /datum/status_effect/drugginess/on_apply() - RegisterSignal(owner, list(COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_DEATH), .proc/remove_drugginess) + RegisterSignal(owner, list(COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_DEATH), PROC_REF(remove_drugginess)) owner.add_mood_event(id, /datum/mood_event/high) owner.overlay_fullscreen(id, /atom/movable/screen/fullscreen/high) diff --git a/code/datums/status_effects/debuffs/drunk.dm b/code/datums/status_effects/debuffs/drunk.dm index bae68bc241f..062658b504b 100644 --- a/code/datums/status_effects/debuffs/drunk.dm +++ b/code/datums/status_effects/debuffs/drunk.dm @@ -22,7 +22,7 @@ set_drunk_value(drunk_value) /datum/status_effect/inebriated/on_apply() - RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, .proc/clear_drunkenness) + RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(clear_drunkenness)) return TRUE /datum/status_effect/inebriated/on_remove() diff --git a/code/datums/status_effects/debuffs/hallucination.dm b/code/datums/status_effects/debuffs/hallucination.dm index d2e9c2f4e65..5179758356b 100644 --- a/code/datums/status_effects/debuffs/hallucination.dm +++ b/code/datums/status_effects/debuffs/hallucination.dm @@ -28,11 +28,11 @@ if(!affects_silicons && issilicon(owner)) return FALSE - RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, .proc/remove_hallucinations) - RegisterSignal(owner, COMSIG_LIVING_HEALTHSCAN, .proc/on_health_scan) + RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(remove_hallucinations)) + RegisterSignal(owner, COMSIG_LIVING_HEALTHSCAN, PROC_REF(on_health_scan)) if(iscarbon(owner)) - RegisterSignal(owner, COMSIG_CARBON_CHECKING_BODYPART, .proc/on_check_bodypart) - RegisterSignal(owner, COMSIG_CARBON_BUMPED_AIRLOCK_OPEN, .proc/on_bump_airlock) + RegisterSignal(owner, COMSIG_CARBON_CHECKING_BODYPART, PROC_REF(on_check_bodypart)) + RegisterSignal(owner, COMSIG_CARBON_BUMPED_AIRLOCK_OPEN, PROC_REF(on_bump_airlock)) return TRUE diff --git a/code/datums/status_effects/debuffs/jitteriness.dm b/code/datums/status_effects/debuffs/jitteriness.dm index 6c2a77cdfd6..95a3060ca45 100644 --- a/code/datums/status_effects/debuffs/jitteriness.dm +++ b/code/datums/status_effects/debuffs/jitteriness.dm @@ -14,7 +14,7 @@ owner.do_jitter_animation(duration / 10) return FALSE - RegisterSignal(owner, list(COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_DEATH), .proc/remove_jitter) + RegisterSignal(owner, list(COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_DEATH), PROC_REF(remove_jitter)) owner.add_mood_event(id, /datum/mood_event/jittery) return TRUE diff --git a/code/datums/status_effects/debuffs/screwy_hud.dm b/code/datums/status_effects/debuffs/screwy_hud.dm index a270652262a..2e8fc566cf4 100644 --- a/code/datums/status_effects/debuffs/screwy_hud.dm +++ b/code/datums/status_effects/debuffs/screwy_hud.dm @@ -18,7 +18,7 @@ if(!iscarbon(owner)) return FALSE - RegisterSignal(owner, COMSIG_CARBON_UPDATING_HEALTH_HUD, .proc/on_health_hud_updated) + RegisterSignal(owner, COMSIG_CARBON_UPDATING_HEALTH_HUD, PROC_REF(on_health_hud_updated)) owner.update_health_hud() return TRUE diff --git a/code/datums/status_effects/debuffs/silenced.dm b/code/datums/status_effects/debuffs/silenced.dm index 953af872841..84b6d537f70 100644 --- a/code/datums/status_effects/debuffs/silenced.dm +++ b/code/datums/status_effects/debuffs/silenced.dm @@ -7,7 +7,7 @@ return ..() /datum/status_effect/silenced/on_apply() - RegisterSignal(owner, list(COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_DEATH), .proc/clear_silence) + RegisterSignal(owner, list(COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_LIVING_DEATH), PROC_REF(clear_silence)) ADD_TRAIT(owner, TRAIT_MUTE, id) return TRUE diff --git a/code/datums/status_effects/debuffs/speech_debuffs.dm b/code/datums/status_effects/debuffs/speech_debuffs.dm index 023073091b2..4a5ff20b302 100644 --- a/code/datums/status_effects/debuffs/speech_debuffs.dm +++ b/code/datums/status_effects/debuffs/speech_debuffs.dm @@ -7,8 +7,8 @@ return ..() /datum/status_effect/speech/on_apply() - RegisterSignal(owner, COMSIG_LIVING_TREAT_MESSAGE, .proc/handle_message) - RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, .proc/on_heal) + RegisterSignal(owner, COMSIG_LIVING_TREAT_MESSAGE, PROC_REF(handle_message)) + RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(on_heal)) return TRUE /datum/status_effect/speech/on_remove() diff --git a/code/datums/status_effects/debuffs/strandling.dm b/code/datums/status_effects/debuffs/strandling.dm index 0b63c17401f..accb4717461 100644 --- a/code/datums/status_effects/debuffs/strandling.dm +++ b/code/datums/status_effects/debuffs/strandling.dm @@ -10,9 +10,9 @@ var/time_to_remove = 3.5 SECONDS /datum/status_effect/strandling/on_apply() - RegisterSignal(owner, COMSIG_CARBON_PRE_BREATHE, .proc/on_breathe) - RegisterSignal(owner, COMSIG_ATOM_TOOL_ACT(TOOL_WIRECUTTER), .proc/on_cut) - RegisterSignal(owner, COMSIG_CARBON_PRE_MISC_HELP, .proc/on_self_check) + RegisterSignal(owner, COMSIG_CARBON_PRE_BREATHE, PROC_REF(on_breathe)) + RegisterSignal(owner, COMSIG_ATOM_TOOL_ACT(TOOL_WIRECUTTER), PROC_REF(on_cut)) + RegisterSignal(owner, COMSIG_CARBON_PRE_MISC_HELP, PROC_REF(on_self_check)) return TRUE /datum/status_effect/strandling/on_remove() @@ -37,7 +37,7 @@ if(DOING_INTERACTION(user, REF(src))) return - INVOKE_ASYNC(src, .proc/try_remove_effect, user, tool) + INVOKE_ASYNC(src, PROC_REF(try_remove_effect), user, tool) return COMPONENT_BLOCK_TOOL_ATTACK /// Signal proc for [COMSIG_CARBON_PRE_MISC_HELP], allowing someone to remove the effect by hand @@ -47,7 +47,7 @@ if(DOING_INTERACTION(helper, REF(src))) return - INVOKE_ASYNC(src, .proc/try_remove_effect, helper) + INVOKE_ASYNC(src, PROC_REF(try_remove_effect), helper) return COMPONENT_BLOCK_MISC_HELP /** diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm index 6a8c9b793b6..898995dbc3b 100644 --- a/code/datums/status_effects/gas.dm +++ b/code/datums/status_effects/gas.dm @@ -16,7 +16,7 @@ if(!.) return ADD_TRAIT(owner, TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(id)) - RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/owner_resist) + RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(owner_resist)) if(!owner.stat) to_chat(owner, span_userdanger("You become frozen in a cube!")) cube = icon('icons/effects/freeze.dmi', "ice_cube") @@ -29,7 +29,7 @@ /datum/status_effect/freon/proc/owner_resist() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/do_resist) + INVOKE_ASYNC(src, PROC_REF(do_resist)) /datum/status_effect/freon/proc/do_resist() to_chat(owner, span_notice("You start breaking out of the ice cube...")) diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index a162766e3f1..4299bd5d1ac 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -183,9 +183,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) @@ -200,7 +200,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 @@ -384,7 +384,7 @@ alt_clone = new typepath(owner.loc) alt_clone.appearance = owner.appearance alt_clone.real_name = owner.real_name - RegisterSignal(alt_clone, COMSIG_PARENT_QDELETING, .proc/remove_clone_from_var) + RegisterSignal(alt_clone, COMSIG_PARENT_QDELETING, PROC_REF(remove_clone_from_var)) owner.visible_message("[owner] splits into seemingly two versions of themselves!") do_teleport(alt_clone, get_turf(alt_clone), 2, no_effects=TRUE) //teleports clone so it's hard to find the real one! do_sparks(5,FALSE,alt_clone) diff --git a/code/datums/status_effects/wound_effects.dm b/code/datums/status_effects/wound_effects.dm index fada8508ae9..7e93c2318ab 100644 --- a/code/datums/status_effects/wound_effects.dm +++ b/code/datums/status_effects/wound_effects.dm @@ -52,8 +52,8 @@ left = C.get_bodypart(BODY_ZONE_L_LEG) right = C.get_bodypart(BODY_ZONE_R_LEG) update_limp() - RegisterSignal(C, COMSIG_MOVABLE_MOVED, .proc/check_step) - RegisterSignal(C, list(COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB), .proc/update_limp) + RegisterSignal(C, COMSIG_MOVABLE_MOVED, PROC_REF(check_step)) + RegisterSignal(C, list(COMSIG_CARBON_GAIN_WOUND, COMSIG_CARBON_LOSE_WOUND, COMSIG_CARBON_ATTACH_LIMB, COMSIG_CARBON_REMOVE_LIMB), PROC_REF(update_limp)) return TRUE /datum/status_effect/limp/on_remove() @@ -154,7 +154,7 @@ /datum/status_effect/wound/on_apply() if(!iscarbon(owner)) return FALSE - RegisterSignal(owner, COMSIG_CARBON_LOSE_WOUND, .proc/check_remove) + RegisterSignal(owner, COMSIG_CARBON_LOSE_WOUND, PROC_REF(check_remove)) return TRUE /// check if the wound getting removed is the wound we're tied to @@ -170,7 +170,7 @@ /datum/status_effect/wound/blunt/on_apply() . = ..() - RegisterSignal(owner, COMSIG_MOB_SWAP_HANDS, .proc/on_swap_hands) + RegisterSignal(owner, COMSIG_MOB_SWAP_HANDS, PROC_REF(on_swap_hands)) on_swap_hands() /datum/status_effect/wound/blunt/on_remove() diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index 8f70bb7bac5..7d513eb9b23 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -111,26 +111,26 @@ qdel(src) return - RegisterSignal(resolve_parent, list(COMSIG_ATOM_ATTACK_PAW, COMSIG_ATOM_ATTACK_HAND), .proc/on_attack) - RegisterSignal(resolve_parent, COMSIG_MOUSEDROP_ONTO, .proc/on_mousedrop_onto) - RegisterSignal(resolve_parent, COMSIG_MOUSEDROPPED_ONTO, .proc/on_mousedropped_onto) + RegisterSignal(resolve_parent, list(COMSIG_ATOM_ATTACK_PAW, COMSIG_ATOM_ATTACK_HAND), PROC_REF(on_attack)) + RegisterSignal(resolve_parent, COMSIG_MOUSEDROP_ONTO, PROC_REF(on_mousedrop_onto)) + RegisterSignal(resolve_parent, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(on_mousedropped_onto)) - RegisterSignal(resolve_parent, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act) - RegisterSignal(resolve_parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) - RegisterSignal(resolve_parent, COMSIG_ITEM_PRE_ATTACK, .proc/on_preattack) - RegisterSignal(resolve_parent, COMSIG_OBJ_DECONSTRUCT, .proc/on_deconstruct) + RegisterSignal(resolve_parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act)) + RegisterSignal(resolve_parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(resolve_parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(on_preattack)) + RegisterSignal(resolve_parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_deconstruct)) - RegisterSignal(resolve_parent, COMSIG_ITEM_ATTACK_SELF, .proc/mass_empty) + RegisterSignal(resolve_parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(mass_empty)) - RegisterSignal(resolve_parent, list(COMSIG_CLICK_ALT, COMSIG_ATOM_ATTACK_GHOST, COMSIG_ATOM_ATTACK_HAND_SECONDARY), .proc/open_storage_on_signal) - RegisterSignal(resolve_parent, COMSIG_PARENT_ATTACKBY_SECONDARY, .proc/open_storage_attackby_secondary) + RegisterSignal(resolve_parent, list(COMSIG_CLICK_ALT, COMSIG_ATOM_ATTACK_GHOST, COMSIG_ATOM_ATTACK_HAND_SECONDARY), PROC_REF(open_storage_on_signal)) + RegisterSignal(resolve_parent, COMSIG_PARENT_ATTACKBY_SECONDARY, PROC_REF(open_storage_attackby_secondary)) - RegisterSignal(resolve_location, COMSIG_ATOM_ENTERED, .proc/handle_enter) - RegisterSignal(resolve_location, COMSIG_ATOM_EXITED, .proc/handle_exit) - RegisterSignal(resolve_parent, COMSIG_MOVABLE_MOVED, .proc/close_distance) - RegisterSignal(resolve_parent, COMSIG_ITEM_EQUIPPED, .proc/update_actions) + RegisterSignal(resolve_location, COMSIG_ATOM_ENTERED, PROC_REF(handle_enter)) + RegisterSignal(resolve_location, COMSIG_ATOM_EXITED, PROC_REF(handle_exit)) + RegisterSignal(resolve_parent, COMSIG_MOVABLE_MOVED, PROC_REF(close_distance)) + RegisterSignal(resolve_parent, COMSIG_ITEM_EQUIPPED, PROC_REF(update_actions)) - RegisterSignal(resolve_parent, COMSIG_TOPIC, .proc/topic_handle) + RegisterSignal(resolve_parent, COMSIG_TOPIC, PROC_REF(topic_handle)) orient_to_hud() @@ -216,8 +216,8 @@ UnregisterSignal(resolve_location, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_EXITED)) - RegisterSignal(real, COMSIG_ATOM_ENTERED, .proc/handle_enter) - RegisterSignal(real, COMSIG_ATOM_EXITED, .proc/handle_exit) + RegisterSignal(real, COMSIG_ATOM_ENTERED, PROC_REF(handle_enter)) + RegisterSignal(real, COMSIG_ATOM_EXITED, PROC_REF(handle_exit)) real_location = WEAKREF(real) @@ -286,7 +286,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) return var/datum/action/modeswitch_action = resolve_parent.add_item_action(/datum/action/item_action/storage_gather_mode) - RegisterSignal(modeswitch_action, COMSIG_ACTION_TRIGGER, .proc/action_trigger) + RegisterSignal(modeswitch_action, COMSIG_ACTION_TRIGGER, PROC_REF(action_trigger)) modeswitch_action_ref = WEAKREF(modeswitch_action) /// Refreshes and item to be put back into the real world, out of storage. @@ -640,7 +640,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(!isturf(thing.loc)) return COMPONENT_CANCEL_ATTACK_CHAIN - INVOKE_ASYNC(src, .proc/collect_on_turf, thing, user) + INVOKE_ASYNC(src, PROC_REF(collect_on_turf), thing, user) return COMPONENT_CANCEL_ATTACK_CHAIN /** @@ -667,7 +667,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) var/datum/progressbar/progress = new(user, amount, thing.loc) var/list/rejections = list() - while(do_after(user, 1 SECONDS, resolve_parent, NONE, FALSE, CALLBACK(src, .proc/handle_mass_pickup, user, turf_things, thing.loc, rejections, progress))) + while(do_after(user, 1 SECONDS, resolve_parent, NONE, FALSE, CALLBACK(src, PROC_REF(handle_mass_pickup), user, turf_things, thing.loc, rejections, progress))) stoplag(1) progress.end_progress() @@ -699,10 +699,10 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(over_object != user) return - INVOKE_ASYNC(src, .proc/open_storage, user) + INVOKE_ASYNC(src, PROC_REF(open_storage), user) else if(!istype(over_object, /atom/movable/screen)) - INVOKE_ASYNC(src, .proc/dump_content_at, over_object, user) + INVOKE_ASYNC(src, PROC_REF(dump_content_at), over_object, user) /** * Dumps all of our contents at a specific location. @@ -803,16 +803,16 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) if(ishuman(user)) var/mob/living/carbon/human/hum = user if(hum.l_store == resolve_parent && !hum.get_active_held_item()) - INVOKE_ASYNC(hum, /mob.proc/put_in_hands, resolve_parent) + INVOKE_ASYNC(hum, TYPE_PROC_REF(/mob, put_in_hands), resolve_parent) hum.l_store = null return if(hum.r_store == resolve_parent && !hum.get_active_held_item()) - INVOKE_ASYNC(hum, /mob.proc/put_in_hands, resolve_parent) + INVOKE_ASYNC(hum, TYPE_PROC_REF(/mob, put_in_hands), resolve_parent) hum.r_store = null return if(resolve_parent.loc == user) - INVOKE_ASYNC(src, .proc/open_storage, user) + INVOKE_ASYNC(src, PROC_REF(open_storage), user) return TRUE /// Generates the numbers on an item in storage to show stacking. @@ -917,7 +917,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) /datum/storage/proc/open_storage_on_signal(datum/source, mob/to_show) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/open_storage, to_show) + INVOKE_ASYNC(src, PROC_REF(open_storage), to_show) return COMPONENT_NO_AFTERATTACK /// Opens the storage to the mob, showing them the contents to their UI. @@ -964,7 +964,7 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) attempt_remove(to_remove) - INVOKE_ASYNC(src, .proc/put_in_hands_async, to_show, to_remove) + INVOKE_ASYNC(src, PROC_REF(put_in_hands_async), to_show, to_remove) if(!silent) to_show.visible_message(span_warning("[to_show] draws [to_remove] from [resolve_parent]!"), span_notice("You draw [to_remove] from [resolve_parent].")) diff --git a/code/datums/storage/subtypes/bag_of_holding.dm b/code/datums/storage/subtypes/bag_of_holding.dm index 6644c7734d7..e1de38948e8 100644 --- a/code/datums/storage/subtypes/bag_of_holding.dm +++ b/code/datums/storage/subtypes/bag_of_holding.dm @@ -7,7 +7,7 @@ matching -= resolve_parent if(istype(to_insert, /obj/item/storage/backpack/holding) || matching.len) - INVOKE_ASYNC(src, .proc/recursive_insertion, to_insert, user) + INVOKE_ASYNC(src, PROC_REF(recursive_insertion), to_insert, user) return return ..() diff --git a/code/datums/tgs_event_handler.dm b/code/datums/tgs_event_handler.dm index 6bf806915a0..6fd3d5b53a0 100644 --- a/code/datums/tgs_event_handler.dm +++ b/code/datums/tgs_event_handler.dm @@ -23,7 +23,7 @@ to_chat(world, span_boldannounce("Server updated, changes will be applied on the next round...")) if(TGS_EVENT_WATCHDOG_DETACH) message_admins("TGS restarting...") - reattach_timer = addtimer(CALLBACK(src, .proc/LateOnReattach), 1 MINUTES, TIMER_STOPPABLE) + reattach_timer = addtimer(CALLBACK(src, PROC_REF(LateOnReattach)), 1 MINUTES, TIMER_STOPPABLE) if(TGS_EVENT_WATCHDOG_REATTACH) var/datum/tgs_version/old_version = world.TgsVersion() var/datum/tgs_version/new_version = args[2] diff --git a/code/datums/visual_data.dm b/code/datums/visual_data.dm index a09eedb50ae..ca4aecfe429 100644 --- a/code/datums/visual_data.dm +++ b/code/datums/visual_data.dm @@ -27,14 +27,14 @@ /datum/visual_data/proc/shadow(mob/mirror_off) do_updates = FALSE mirroring_off_ref = WEAKREF(mirror_off) - RegisterSignal(mirror_off, COMSIG_MOB_SIGHT_CHANGE, .proc/sight_changed) + RegisterSignal(mirror_off, COMSIG_MOB_SIGHT_CHANGE, PROC_REF(sight_changed)) sight_changed(mirror_off) - RegisterSignal(mirror_off, COMSIG_MOB_SEE_INVIS_CHANGE, .proc/invis_changed) + RegisterSignal(mirror_off, COMSIG_MOB_SEE_INVIS_CHANGE, PROC_REF(invis_changed)) invis_changed(mirror_off) - RegisterSignal(mirror_off, COMSIG_MOB_SEE_IN_DARK_CHANGE, .proc/in_dark_changed) + RegisterSignal(mirror_off, COMSIG_MOB_SEE_IN_DARK_CHANGE, PROC_REF(in_dark_changed)) in_dark_changed(mirror_off) - RegisterSignal(mirror_off, COMSIG_MOB_LOGIN, .proc/on_login) - RegisterSignal(mirror_off, COMSIG_MOB_LOGOUT, .proc/on_logout) + RegisterSignal(mirror_off, COMSIG_MOB_LOGIN, PROC_REF(on_login)) + RegisterSignal(mirror_off, COMSIG_MOB_LOGOUT, PROC_REF(on_logout)) if(mirror_off.client) on_login(mirror_off) do_updates = TRUE @@ -76,7 +76,7 @@ SIGNAL_HANDLER // visual data can be created off login, so conflicts here are inevitable // Best to just override - RegisterSignal(source.client, COMSIG_CLIENT_SET_EYE, .proc/eye_change, override = TRUE) + RegisterSignal(source.client, COMSIG_CLIENT_SET_EYE, PROC_REF(eye_change), override = TRUE) set_eye(source.client.eye) /datum/visual_data/proc/on_logout(mob/source) @@ -95,7 +95,7 @@ UnregisterSignal(old_eye, COMSIG_PARENT_QDELETING) if(new_eye) // Need to update any party's client.eyes - RegisterSignal(new_eye, COMSIG_PARENT_QDELETING, .proc/eye_deleted) + RegisterSignal(new_eye, COMSIG_PARENT_QDELETING, PROC_REF(eye_deleted)) client_eye = WEAKREF(new_eye) on_update() @@ -143,7 +143,7 @@ UnregisterSignal(old_target, COMSIG_MOB_HUD_REFRESHED) mirror_onto_ref = WEAKREF(target) if(target) - RegisterSignal(target, COMSIG_MOB_HUD_REFRESHED, .proc/push_ontod_hud_refreshed) + RegisterSignal(target, COMSIG_MOB_HUD_REFRESHED, PROC_REF(push_ontod_hud_refreshed)) /datum/visual_data/mirroring/proc/push_ontod_hud_refreshed(mob/source) SIGNAL_HANDLER diff --git a/code/datums/voice_of_god_command.dm b/code/datums/voice_of_god_command.dm index f4397fb9fab..9dd8c13730a 100644 --- a/code/datums/voice_of_god_command.dm +++ b/code/datums/voice_of_god_command.dm @@ -263,7 +263,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) /datum/voice_of_god_command/who_are_you/execute(list/listeners, mob/living/user, power_multiplier = 1, message) var/iteration = 1 for(var/mob/living/target as anything in listeners) - addtimer(CALLBACK(src, .proc/state_name, target), 0.5 SECONDS * iteration) + addtimer(CALLBACK(src, PROC_REF(state_name), target), 0.5 SECONDS * iteration) iteration++ ///just states the target's name, but also includes the renaming funny. @@ -339,7 +339,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) else if(findtext(message, right_words)) direction = EAST for(var/mob/living/target as anything in listeners) - addtimer(CALLBACK(GLOBAL_PROC, .proc/_step, target, direction || pick(GLOB.cardinals)), 1 SECONDS * (iteration - 1)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step), target, direction || pick(GLOB.cardinals)), 1 SECONDS * (iteration - 1)) iteration++ /// This command forces the listeners to switch to walk intent. @@ -419,7 +419,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) if(prob(25)) addtimer(CALLBACK(target, /atom/movable/proc/say, "HOW HIGH?!!"), 0.5 SECONDS * iteration) else - addtimer(CALLBACK(target, /mob/living/.proc/emote, "jump"), 0.5 SECONDS * iteration) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living/, emote), "jump"), 0.5 SECONDS * iteration) iteration++ ///This command plays a bikehorn sound after 2 seconds and a half have passed, and also slips listeners if the user is a clown. @@ -427,7 +427,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) trigger = "ho+nk" /datum/voice_of_god_command/honk/execute(list/listeners, mob/living/user, power_multiplier = 1, message) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 2.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), get_turf(user), 'sound/items/bikehorn.ogg', 300, 1), 2.5 SECONDS) if(is_clown_job(user.mind?.assigned_role)) . = COOLDOWN_STUN //it slips. for(var/mob/living/carbon/target in listeners) @@ -449,7 +449,7 @@ GLOBAL_LIST_INIT(voice_of_god_commands, init_voice_of_god_commands()) /datum/voice_of_god_command/emote/execute(list/listeners, mob/living/user, power_multiplier = 1, message) var/iteration = 1 for(var/mob/living/target as anything in listeners) - addtimer(CALLBACK(target, /mob/living/.proc/emote, emote_name), 0.5 SECONDS * iteration) + addtimer(CALLBACK(target, TYPE_PROC_REF(/mob/living/, emote), emote_name), 0.5 SECONDS * iteration) iteration++ /datum/voice_of_god_command/emote/flip diff --git a/code/datums/weather/weather.dm b/code/datums/weather/weather.dm index 6ef0905772b..deac74b8740 100644 --- a/code/datums/weather/weather.dm +++ b/code/datums/weather/weather.dm @@ -123,7 +123,7 @@ to_chat(player, telegraph_message) if(telegraph_sound) SEND_SOUND(player, sound(telegraph_sound)) - addtimer(CALLBACK(src, .proc/start), telegraph_duration) + addtimer(CALLBACK(src, PROC_REF(start)), telegraph_duration) /** * Starts the actual weather and effects from it @@ -148,7 +148,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 @@ -172,7 +172,7 @@ to_chat(player, end_message) if(end_sound) SEND_SOUND(player, sound(end_sound)) - addtimer(CALLBACK(src, .proc/end), end_duration) + addtimer(CALLBACK(src, PROC_REF(end)), end_duration) /** * Fully ends the weather diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index db3503a2f95..95ada4deabb 100644 --- a/code/datums/wires/_wires.dm +++ b/code/datums/wires/_wires.dm @@ -51,7 +51,7 @@ // If there is a dictionary key set, we'll want to use that. Otherwise, use the holder type. var/key = dictionary_key ? dictionary_key : holder_type - RegisterSignal(holder, COMSIG_PARENT_QDELETING, .proc/on_holder_qdel) + RegisterSignal(holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel)) if(randomize) randomize() else diff --git a/code/datums/wires/airalarm.dm b/code/datums/wires/airalarm.dm index 2fd182adac8..16895642e55 100644 --- a/code/datums/wires/airalarm.dm +++ b/code/datums/wires/airalarm.dm @@ -33,13 +33,13 @@ if(!A.shorted) A.shorted = TRUE A.update_appearance() - addtimer(CALLBACK(A, /obj/machinery/airalarm.proc/reset, wire), 1200) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 1200) if(WIRE_IDSCAN) // Toggle lock. A.locked = !A.locked if(WIRE_AI) // Disable AI control for a while. if(!A.aidisabled) A.aidisabled = TRUE - addtimer(CALLBACK(A, /obj/machinery/airalarm.proc/reset, wire), 100) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/airalarm, reset), wire), 100) if(WIRE_PANIC) // Toggle panic siphon. if(!A.shorted) if(A.mode == 1) // AALARM_MODE_SCRUB diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index 0b59e794769..dda4e79f6c0 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -115,9 +115,9 @@ return if(!A.requiresID() || A.check_access(null)) if(A.density) - INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/open, 1) + INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, open), 1) else - INVOKE_ASYNC(A, /obj/machinery/door/airlock.proc/close, 1) + INVOKE_ASYNC(A, TYPE_PROC_REF(/obj/machinery/door/airlock, close), 1) if(WIRE_BOLTS) // Pulse to toggle bolts (but only raises if power is on). if(!A.locked) A.bolt() @@ -136,7 +136,7 @@ A.aiControlDisabled = AI_WIRE_DISABLED else if(A.aiControlDisabled == AI_WIRE_DISABLED_HACKED) A.aiControlDisabled = AI_WIRE_HACKED - addtimer(CALLBACK(A, /obj/machinery/door/airlock.proc/reset_ai_wire), 1 SECONDS) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/door/airlock, reset_ai_wire)), 1 SECONDS) if(WIRE_SHOCK) // Pulse to shock the door for 10 ticks. if(!A.secondsElectrified) A.set_electrified(MACHINE_DEFAULT_ELECTRIFY_TIME, usr) diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm index 38020f7bb99..92e3254210f 100644 --- a/code/datums/wires/apc.dm +++ b/code/datums/wires/apc.dm @@ -31,14 +31,14 @@ if(WIRE_POWER1, WIRE_POWER2) // Short for a long while. if(!A.shorted) A.shorted = TRUE - addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 2 MINUTES) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 2 MINUTES) if(WIRE_IDSCAN) // Unlock for a little while. A.locked = FALSE - addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 30 SECONDS) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 30 SECONDS) if(WIRE_AI) // Disable AI control for a very short time. if(!A.aidisabled) A.aidisabled = TRUE - addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 1 SECONDS) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/power/apc, reset), wire), 1 SECONDS) /datum/wires/apc/on_cut(index, mend) var/obj/machinery/power/apc/A = holder diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm index 8c0516270d2..bf30ba39c08 100644 --- a/code/datums/wires/autolathe.dm +++ b/code/datums/wires/autolathe.dm @@ -29,13 +29,13 @@ switch(wire) if(WIRE_HACK) A.adjust_hacked(!A.hacked) - addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60) if(WIRE_SHOCK) A.shocked = !A.shocked - addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60) if(WIRE_DISABLE) A.disabled = !A.disabled - addtimer(CALLBACK(A, /obj/machinery/autolathe.proc/reset, wire), 60) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/autolathe, reset), wire), 60) /datum/wires/autolathe/on_cut(wire, mend) var/obj/machinery/autolathe/A = holder diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index 6e8ee86e767..51e50f5fdd8 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -104,7 +104,7 @@ var/list/data = list("input" = input) // Did we have to pass the soft filter on our origin server? Passed as a boolean value. var/soft_filter_passed = !!input["is_filtered"] - var/timer_id = addtimer(CALLBACK(src, .proc/receive_cross_comms_message, data), soft_filter_passed ? EXTENDED_CROSS_SECTOR_CANCEL_TIME : CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) + var/timer_id = addtimer(CALLBACK(src, PROC_REF(receive_cross_comms_message), data), soft_filter_passed ? EXTENDED_CROSS_SECTOR_CANCEL_TIME : CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) data["timer_id"] = timer_id LAZYADD(timers, timer_id) diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 551b3e029c1..db619e5fa33 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -172,7 +172,7 @@ remove_wound_from_victim() victim = new_victim if(victim) - RegisterSignal(victim, COMSIG_PARENT_QDELETING, .proc/null_victim) + RegisterSignal(victim, COMSIG_PARENT_QDELETING, PROC_REF(null_victim)) /datum/wound/proc/source_died() SIGNAL_HANDLER @@ -229,7 +229,7 @@ if(limb) UnregisterSignal(limb, COMSIG_PARENT_QDELETING) limb = new_value - RegisterSignal(new_value, COMSIG_PARENT_QDELETING, .proc/source_died) + RegisterSignal(new_value, COMSIG_PARENT_QDELETING, PROC_REF(source_died)) if(. && disabling) var/obj/item/bodypart/old_limb = . REMOVE_TRAIT(old_limb, TRAIT_PARALYSIS, REF(src)) diff --git a/code/datums/wounds/bones.dm b/code/datums/wounds/bones.dm index 2c2f03e2935..be385dbcb69 100644 --- a/code/datums/wounds/bones.dm +++ b/code/datums/wounds/bones.dm @@ -36,14 +36,14 @@ */ /datum/wound/blunt/wound_injury(datum/wound/old_wound = null, attack_direction = null) // hook into gaining/losing gauze so crit bone wounds can re-enable/disable depending if they're slung or not - RegisterSignal(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_GAUZE_DESTROYED), .proc/update_inefficiencies) + RegisterSignal(limb, list(COMSIG_BODYPART_GAUZED, COMSIG_BODYPART_GAUZE_DESTROYED), PROC_REF(update_inefficiencies)) if(limb.body_zone == BODY_ZONE_HEAD && brain_trauma_group) processes = TRUE active_trauma = victim.gain_trauma_type(brain_trauma_group, TRAUMA_RESILIENCE_WOUND) next_trauma_cycle = world.time + (rand(100-WOUND_BONE_HEAD_TIME_VARIANCE, 100+WOUND_BONE_HEAD_TIME_VARIANCE) * 0.01 * trauma_cycle_cooldown) - RegisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/attack_with_hurt_hand) + RegisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(attack_with_hurt_hand)) if(limb.held_index && victim.get_item_for_held_index(limb.held_index) && (disabling || prob(30 * severity))) var/obj/item/I = victim.get_item_for_held_index(limb.held_index) if(istype(I, /obj/item/offhand)) @@ -112,7 +112,7 @@ else victim.visible_message(span_danger("[victim] weakly strikes [target] with [victim.p_their()] broken [limb.plaintext_zone], recoiling from pain!"), \ span_userdanger("You fail to strike [target] as the fracture in your [limb.plaintext_zone] lights up in unbearable pain!"), vision_distance=COMBAT_MESSAGE_RANGE) - INVOKE_ASYNC(victim, /mob.proc/emote, "scream") + INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") victim.Stun(0.5 SECONDS) limb.receive_damage(brute=rand(3,7)) return COMPONENT_CANCEL_ATTACK_CHAIN @@ -227,7 +227,7 @@ /datum/wound/blunt/moderate/wound_injury(datum/wound/old_wound, attack_direction = null) . = ..() - RegisterSignal(victim, COMSIG_LIVING_DOORCRUSHED, .proc/door_crush) + RegisterSignal(victim, COMSIG_LIVING_DOORCRUSHED, PROC_REF(door_crush)) /// Getting smushed in an airlock/firelock is a last-ditch attempt to try relocating your limb /datum/wound/blunt/moderate/proc/door_crush() @@ -257,7 +257,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)) @@ -276,7 +276,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)) @@ -297,7 +297,7 @@ else user.visible_message(span_danger("[user] begins resetting [victim]'s [limb.plaintext_zone] with [I]."), span_notice("You begin resetting [victim]'s [limb.plaintext_zone] 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) @@ -382,7 +382,7 @@ user.visible_message(span_danger("[user] begins hastily applying [I] to [victim]'s' [limb.plaintext_zone]..."), span_warning("You begin hastily applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone], 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) @@ -423,7 +423,7 @@ user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [limb.plaintext_zone]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone]...")) - if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, PROC_REF(still_exists)))) return I.use(1) @@ -447,7 +447,7 @@ user.visible_message(span_danger("[user] begins applying [I] to [victim]'s' [limb.plaintext_zone]..."), span_warning("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone]...")) - if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, PROC_REF(still_exists)))) return if(victim == user) diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index 3b186e2ca52..29e9a976293 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -202,7 +202,7 @@ user.visible_message(span_notice("[user] begins applying [I] to [victim]'s [limb.plaintext_zone]..."), span_notice("You begin applying [I] to [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone]...")) if (I.amount <= 0) return - if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, (user == victim ? I.self_delay : I.other_delay), extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return limb.heal_damage(I.heal_brute, I.heal_burn) diff --git a/code/datums/wounds/pierce.dm b/code/datums/wounds/pierce.dm index 3a493f9287f..eee69a1f8d4 100644 --- a/code/datums/wounds/pierce.dm +++ b/code/datums/wounds/pierce.dm @@ -106,7 +106,7 @@ /datum/wound/pierce/proc/suture(obj/item/stack/medical/suture/I, mob/user) var/self_penalty_mult = (user == victim ? 1.4 : 1) user.visible_message(span_notice("[user] begins stitching [victim]'s [limb.plaintext_zone] with [I]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone] with [I]...")) - if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")) var/blood_sutured = I.stop_bleeding / self_penalty_mult @@ -125,7 +125,7 @@ var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself user.visible_message(span_danger("[user] begins cauterizing [victim]'s [limb.plaintext_zone] with [I]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone] with [I]...")) - if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim].")) diff --git a/code/datums/wounds/scars/_scars.dm b/code/datums/wounds/scars/_scars.dm index 6bab95d056c..375eac41adc 100644 --- a/code/datums/wounds/scars/_scars.dm +++ b/code/datums/wounds/scars/_scars.dm @@ -48,7 +48,7 @@ */ /datum/scar/proc/generate(obj/item/bodypart/BP, datum/wound/W, add_to_scars=TRUE) limb = BP - RegisterSignal(limb, COMSIG_PARENT_QDELETING, .proc/limb_gone) + RegisterSignal(limb, COMSIG_PARENT_QDELETING, PROC_REF(limb_gone)) severity = W.severity if(limb.owner) @@ -92,7 +92,7 @@ return limb = BP - RegisterSignal(limb, COMSIG_PARENT_QDELETING, .proc/limb_gone) + RegisterSignal(limb, COMSIG_PARENT_QDELETING, PROC_REF(limb_gone)) if(limb.owner) victim = limb.owner if(victim.get_biological_state() != biology) diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm index 972bea16899..b6311cc7a28 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -52,7 +52,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) @@ -192,7 +192,7 @@ user.visible_message(span_notice("[user] begins licking the wounds on [victim]'s [limb.plaintext_zone]."), span_notice("You begin licking the wounds on [victim]'s [limb.plaintext_zone]..."), ignored_mobs=victim) to_chat(victim, span_notice("[user] begins to lick the wounds on your [limb.plaintext_zone].")) - if(!do_after(user, base_treat_time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_notice("[user] licks the wounds on [victim]'s [limb.plaintext_zone]."), span_notice("You lick some of the wounds on [victim]'s [limb.plaintext_zone]"), ignored_mobs=victim) @@ -216,7 +216,7 @@ /datum/wound/slash/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user) var/self_penalty_mult = (user == victim ? 1.25 : 1) user.visible_message(span_warning("[user] begins aiming [lasgun] directly at [victim]'s [limb.plaintext_zone]..."), span_userdanger("You begin aiming [lasgun] directly at [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone]...")) - if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return var/damage = lasgun.chambered.loaded_projectile.damage lasgun.chambered.loaded_projectile.wound_bonus -= 30 @@ -233,7 +233,7 @@ var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself user.visible_message(span_danger("[user] begins cauterizing [victim]'s [limb.plaintext_zone] with [I]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone] with [I]...")) - if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim].")) @@ -253,7 +253,7 @@ var/self_penalty_mult = (user == victim ? 1.4 : 1) user.visible_message(span_notice("[user] begins stitching [victim]'s [limb.plaintext_zone] with [I]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [limb.plaintext_zone] with [I]...")) - if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index acc29a9136c..514cf27fe31 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -139,7 +139,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if (picked && is_station_level(picked.z)) GLOB.teleportlocs[AR.name] = AR - sortTim(GLOB.teleportlocs, /proc/cmp_text_asc) + sortTim(GLOB.teleportlocs, GLOBAL_PROC_REF(cmp_text_asc)) /** * Called when an area loads diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 1fb835c6e82..ea5ba467079 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -926,7 +926,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 @@ -1299,7 +1299,7 @@ if(!valid_id) to_chat(usr, span_warning("A reagent with that ID doesn't exist!")) if("Choose from a list") - chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in sort_list(subtypesof(/datum/reagent), /proc/cmp_typepaths_asc) + chosen_id = input(usr, "Choose a reagent to add.", "Choose a reagent.") as null|anything in sort_list(subtypesof(/datum/reagent), GLOBAL_PROC_REF(cmp_typepaths_asc)) if("I'm feeling lucky") chosen_id = pick(subtypesof(/datum/reagent)) if(chosen_id) @@ -1611,7 +1611,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 167eb0d59e9..769cd233734 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -232,7 +232,7 @@ if(isobj(hurt_atom) || ismob(hurt_atom)) if(hurt_atom.layer > highest.layer) highest = hurt_atom - INVOKE_ASYNC(src, .proc/SpinAnimation, 5, 2) + INVOKE_ASYNC(src, PROC_REF(SpinAnimation), 5, 2) return TRUE /* @@ -325,9 +325,9 @@ return destination //used by some child types checks and zMove() /atom/movable/vv_edit_var(var_name, var_value) - var/static/list/banned_edits = list(NAMEOF(src, step_x) = TRUE, NAMEOF(src, step_y) = TRUE, NAMEOF(src, step_size) = TRUE, NAMEOF(src, bounds) = TRUE) - var/static/list/careful_edits = list(NAMEOF(src, bound_x) = TRUE, NAMEOF(src, bound_y) = TRUE, NAMEOF(src, bound_width) = TRUE, NAMEOF(src, bound_height) = TRUE) - var/static/list/not_falsey_edits = list(NAMEOF(src, bound_width) = TRUE, NAMEOF(src, bound_height) = TRUE) + var/static/list/banned_edits = list(NAMEOF_STATIC(src, step_x) = TRUE, NAMEOF_STATIC(src, step_y) = TRUE, NAMEOF_STATIC(src, step_size) = TRUE, NAMEOF_STATIC(src, bounds) = TRUE) + var/static/list/careful_edits = list(NAMEOF_STATIC(src, bound_x) = TRUE, NAMEOF_STATIC(src, bound_y) = TRUE, NAMEOF_STATIC(src, bound_width) = TRUE, NAMEOF_STATIC(src, bound_height) = TRUE) + var/static/list/not_falsey_edits = list(NAMEOF_STATIC(src, bound_width) = TRUE, NAMEOF_STATIC(src, bound_height) = TRUE) if(banned_edits[var_name]) return FALSE //PLEASE no. if(careful_edits[var_name] && (var_value % world.icon_size) != 0) diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index 26d3ef948ab..c8f1cc3952a 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -450,14 +450,14 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) /datum/game_mode/dynamic/post_setup(report) for(var/datum/dynamic_ruleset/roundstart/rule in executed_rules) rule.candidates.Cut() // The rule should not use candidates at this point as they all are null. - addtimer(CALLBACK(src, /datum/game_mode/dynamic/.proc/execute_roundstart_rule, rule), rule.delay) + addtimer(CALLBACK(src, TYPE_PROC_REF(/datum/game_mode/dynamic/, execute_roundstart_rule), rule), rule.delay) if (!CONFIG_GET(flag/no_intercept_report)) - addtimer(CALLBACK(src, .proc/send_intercept), rand(waittime_l, waittime_h)) + addtimer(CALLBACK(src, PROC_REF(send_intercept)), rand(waittime_l, waittime_h)) //SKYRAT EDIT START - DIVERGENCY/GOALS REPORT else - addtimer(CALLBACK(src, .proc/send_trait_report), rand(waittime_l, waittime_h)) + addtimer(CALLBACK(src, PROC_REF(send_trait_report)), rand(waittime_l, waittime_h)) //SKYRAT EDIT END ..() @@ -680,7 +680,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 && (forced_injection || prob(latejoin_roll_chance))) diff --git a/code/game/gamemodes/dynamic/dynamic_hijacking.dm b/code/game/gamemodes/dynamic/dynamic_hijacking.dm index 335a4246a2b..84da5f91262 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/dynamic_unfavorable_situation.dm b/code/game/gamemodes/dynamic/dynamic_unfavorable_situation.dm index a74e03739ea..7625ab70901 100644 --- a/code/game/gamemodes/dynamic/dynamic_unfavorable_situation.dm +++ b/code/game/gamemodes/dynamic/dynamic_unfavorable_situation.dm @@ -5,7 +5,7 @@ /datum/game_mode/dynamic/proc/unfavorable_situation() SHOULD_NOT_SLEEP(TRUE) - INVOKE_ASYNC(src, .proc/_unfavorable_situation) + INVOKE_ASYNC(src, PROC_REF(_unfavorable_situation)) /datum/game_mode/dynamic/proc/_unfavorable_situation() var/static/list/unfavorable_random_events = list( @@ -50,7 +50,7 @@ dynamic_log("An unfavorable situation was requested, but no heavy rulesets could be drafted. Spawning [initial(round_event_control_type.name)] in [DisplayTimeText(delay)] instead.") var/datum/round_event_control/round_event_control = new round_event_control_type - addtimer(CALLBACK(round_event_control, /datum/round_event_control.proc/runEvent), delay) + addtimer(CALLBACK(round_event_control, TYPE_PROC_REF(/datum/round_event_control, runEvent)), delay) else var/datum/dynamic_ruleset/midround/heavy_ruleset = pick_weight(possible_heavies) dynamic_log("An unfavorable situation was requested, spawning [initial(heavy_ruleset.name)]") diff --git a/code/game/gamemodes/dynamic/ruleset_picking.dm b/code/game/gamemodes/dynamic/ruleset_picking.dm index cb61a8b7fab..d692d67d36b 100644 --- a/code/game/gamemodes/dynamic/ruleset_picking.dm +++ b/code/game/gamemodes/dynamic/ruleset_picking.dm @@ -48,7 +48,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, \ ) @@ -66,7 +66,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) @@ -75,7 +75,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 ac6dce63835..5b899b774c8 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -22,7 +22,7 @@ /datum/game_mode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report. if(!report) report = !CONFIG_GET(flag/no_intercept_report) - addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(display_roundstart_logout_report)), ROUNDSTART_LOGOUT_REPORT_TIME) if(CONFIG_GET(flag/reopen_roundstart_suicide_roles)) var/delay = CONFIG_GET(number/reopen_roundstart_suicide_roles_delay) @@ -30,7 +30,7 @@ delay = (delay SECONDS) else delay = (4 MINUTES) //default to 4 minutes if the delay isn't defined. - addtimer(CALLBACK(GLOBAL_PROC, .proc/reopen_roundstart_suicide_roles), delay) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(reopen_roundstart_suicide_roles)), delay) if(SSdbcore.Connect()) var/list/to_set = list() diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index fe599ddf8be..2e945c6034e 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -957,7 +957,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) /proc/generate_admin_objective_list() GLOB.admin_objective_list = list() - var/list/allowed_types = sort_list(subtypesof(/datum/objective), /proc/cmp_typepaths_asc) + var/list/allowed_types = sort_list(subtypesof(/datum/objective), GLOBAL_PROC_REF(cmp_typepaths_asc)) for(var/datum/objective/goal as anything in allowed_types) if(!initial(goal.admin_grantable)) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 90943b9fa25..e619985adee 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -200,14 +200,14 @@ /obj/machinery/proc/setup_area_power_relationship() var/area/our_area = get_area(src) if(our_area) - RegisterSignal(our_area, COMSIG_AREA_POWER_CHANGE, .proc/power_change) + RegisterSignal(our_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(power_change)) if(HAS_TRAIT_FROM(src, TRAIT_AREA_SENSITIVE, INNATE_TRAIT)) // If we for some reason have not lost our area sensitivity, there's no reason to set it back up return FALSE become_area_sensitive(INNATE_TRAIT) - RegisterSignal(src, COMSIG_ENTER_AREA, .proc/on_enter_area) - RegisterSignal(src, COMSIG_EXIT_AREA, .proc/on_exit_area) + RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(on_enter_area)) + RegisterSignal(src, COMSIG_EXIT_AREA, PROC_REF(on_exit_area)) return TRUE /** @@ -234,7 +234,7 @@ return update_current_power_usage() power_change() - RegisterSignal(area_to_register, COMSIG_AREA_POWER_CHANGE, .proc/power_change) + RegisterSignal(area_to_register, COMSIG_AREA_POWER_CHANGE, PROC_REF(power_change)) /obj/machinery/proc/on_exit_area(datum/source, area/area_to_unregister) SIGNAL_HANDLER @@ -873,7 +873,7 @@ wrench.play_tool_sound(src, 50) var/prev_anchored = anchored //as long as we're the same anchored state and we're either on a floor or are anchored, toggle our anchored state - if(!wrench.use_tool(src, user, time, extra_checks = CALLBACK(src, .proc/unfasten_wrench_check, prev_anchored, user))) + if(!wrench.use_tool(src, user, time, extra_checks = CALLBACK(src, PROC_REF(unfasten_wrench_check), prev_anchored, user))) return FAILED_UNFASTEN if(!anchored && ground.is_blocked_turf(exclude_mobs = TRUE, source_atom = src)) to_chat(user, span_notice("You fail to secure [src].")) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index b0f2e8ab857..0ae59f2b196 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -44,4 +44,4 @@ to_chat(user, span_notice("You activate [src]. It now has [uses] uses of foam remaining.")) COOLDOWN_START(src, foam_cooldown,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 1b234ce8052..0e29e62bf24 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -19,7 +19,7 @@ var/datum/techweb/stored_research /obj/machinery/autolathe/Initialize(mapload) - AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 0, MATCONTAINER_EXAMINE, _after_insert = CALLBACK(src, .proc/AfterMaterialInsert)) + AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 0, MATCONTAINER_EXAMINE, _after_insert = CALLBACK(src, PROC_REF(AfterMaterialInsert))) . = ..() @@ -202,7 +202,7 @@ usr, "Choose [used_material]", "Custom Material", - sort_list(list_to_show, /proc/cmp_typepaths_asc) + sort_list(list_to_show, GLOBAL_PROC_REF(cmp_typepaths_asc)) ) if(isnull(used_material)) @@ -219,7 +219,7 @@ use_power(power) icon_state = "autolathe_n" var/time = is_stack ? 32 : (32 * coeff * multiplier) ** 0.8 - addtimer(CALLBACK(src, .proc/make_item, power, materials_used, custom_materials, multiplier, coeff, is_stack, usr), time) + addtimer(CALLBACK(src, PROC_REF(make_item), power, materials_used, custom_materials, multiplier, coeff, is_stack, usr), time) . = TRUE else to_chat(usr, span_alert("Not enough materials for this operation.")) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index fc8e9675185..748e5cf8f87 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -185,7 +185,7 @@ device.pulsed(pulser = user) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_BUTTON_PRESSED,src) - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 15) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_appearance)), 15) /obj/machinery/button/door name = "door button" diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 73164cfa63e..d18fb6791f0 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -171,7 +171,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) set_light(0) emped = emped+1 //Increase the number of consecutive EMP's update_appearance() - addtimer(CALLBACK(src, .proc/post_emp_reset, emped, network), 90 SECONDS) + addtimer(CALLBACK(src, PROC_REF(post_emp_reset), emped, network), 90 SECONDS) for(var/i in GLOB.player_list) var/mob/M = i if (M.client?.eye == src) @@ -191,7 +191,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) if(can_use()) GLOB.cameranet.addCamera(src) emped = 0 //Resets the consecutive EMP count - addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100) + addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100) /obj/machinery/camera/ex_act(severity, target) if(invuln) @@ -494,7 +494,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/camera/xray, 0) change_msg = "reactivates" triggerCameraAlarm() if(!QDELETED(src)) //We'll be doing it anyway in destroy - addtimer(CALLBACK(src, .proc/cancelCameraAlarm), 100) + addtimer(CALLBACK(src, PROC_REF(cancelCameraAlarm)), 100) if(displaymessage) if(user) visible_message(span_danger("[user] [change_msg] [src]!")) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 02dbdc437c3..00c8eb6c5ac 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -90,7 +90,7 @@ to_chat(U, span_notice("Now tracking [target.get_visible_name()] on camera.")) - INVOKE_ASYNC(src, .proc/do_track, target, U) + INVOKE_ASYNC(src, PROC_REF(do_track), target, U) /mob/living/silicon/ai/proc/do_track(mob/living/target, mob/living/silicon/ai/U) var/cameraticks = 0 diff --git a/code/game/machinery/civilian_bounties.dm b/code/game/machinery/civilian_bounties.dm index 921f83ba367..cca6ed02979 100644 --- a/code/game/machinery/civilian_bounties.dm +++ b/code/game/machinery/civilian_bounties.dm @@ -274,7 +274,7 @@ radio.keyslot = new radio_key radio.set_listening(FALSE) radio.recalculateChannels() - RegisterSignal(radio, COMSIG_ITEM_PRE_EXPORT, .proc/on_export) + RegisterSignal(radio, COMSIG_ITEM_PRE_EXPORT, PROC_REF(on_export)) /obj/item/bounty_cube/Destroy() if(radio) @@ -370,7 +370,7 @@ /obj/item/civ_bounty_beacon/attack_self() loc.visible_message(span_warning("\The [src] begins to beep loudly!")) - addtimer(CALLBACK(src, .proc/launch_payload), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(launch_payload)), 1 SECONDS) /obj/item/civ_bounty_beacon/proc/launch_payload() playsound(src, SFX_SPARKS, 80, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 0ff70c601ad..11b7754362c 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -151,7 +151,7 @@ usr.log_message("set the logs of [src] [should_log ? "On" : "Off"].", LOG_GAME) if("restore-console") restoring = TRUE - addtimer(CALLBACK(src, .proc/restore_comp), rand(3,5) * 9 SECONDS) + addtimer(CALLBACK(src, PROC_REF(restore_comp)), rand(3,5) * 9 SECONDS) if("access-apc") var/ref = params["ref"] playsound(src, SFX_TERMINAL_TYPE, 50, FALSE) diff --git a/code/game/machinery/computer/arcade/arcade.dm b/code/game/machinery/computer/arcade/arcade.dm index 8ac7f49b644..55453cc4f65 100644 --- a/code/game/machinery/computer/arcade/arcade.dm +++ b/code/game/machinery/computer/arcade/arcade.dm @@ -363,7 +363,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( else playsound(src, 'sound/arcade/hit.ogg', 50, TRUE, extrarange = -3) - timer_id = addtimer(CALLBACK(src, .proc/enemy_action,player_stance,user),1 SECONDS,TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(enemy_action),player_stance,user),1 SECONDS,TIMER_STOPPABLE) gameover_check(user) @@ -660,7 +660,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( to_chat(user, span_warning("You move your hand towards the machine, and begin to hesitate as a bloodied guillotine emerges from inside of it...")) user.played_game() var/obj/item/bodypart/chopchop = user.get_active_hand() - if(do_after(user, 5 SECONDS, target = src, extra_checks = CALLBACK(src, .proc/do_they_still_have_that_hand, user, chopchop))) + if(do_after(user, 5 SECONDS, target = src, extra_checks = CALLBACK(src, PROC_REF(do_they_still_have_that_hand), user, chopchop))) playsound(src, 'sound/weapons/slice.ogg', 25, TRUE, -1) to_chat(user, span_userdanger("The guillotine drops on your arm, and the machine sucks it in!")) chopchop.dismember() diff --git a/code/game/machinery/computer/arcade/orion_event.dm b/code/game/machinery/computer/arcade/orion_event.dm index 03da88e601b..129bc6c83eb 100644 --- a/code/game/machinery/computer/arcade/orion_event.dm +++ b/code/game/machinery/computer/arcade/orion_event.dm @@ -120,7 +120,7 @@ game.food = rand(10,80) / rand(1,2) game.fuel = rand(10,60) / rand(1,2) if(game.electronics) - addtimer(CALLBACK(src, .proc/revert_random, game, oldfood, oldfuel), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(revert_random), game, oldfood, oldfuel), 1 SECONDS) /datum/orion_event/electronic_part/proc/revert_random(obj/machinery/computer/arcade/orion_trail/game, oldfood, oldfuel) if(oldfuel > game.fuel && oldfood > game.food) @@ -166,7 +166,7 @@ smashed.ScrapeAway() game.say("Something slams into the floor around [game], exposing it to space!") if(game.hull) - addtimer(CALLBACK(src, .proc/fix_floor, game), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(fix_floor), game), 1 SECONDS) /datum/orion_event/hull_part/proc/fix_floor(obj/machinery/computer/arcade/orion_trail/game) game.say("A new floor suddenly appears around [game]. What the hell?") diff --git a/code/game/machinery/computer/arena.dm b/code/game/machinery/computer/arena.dm index a21f3f6a241..154b91a3aba 100644 --- a/code/game/machinery/computer/arena.dm +++ b/code/game/machinery/computer/arena.dm @@ -77,7 +77,7 @@ var/list/default_arenas = flist(arena_dir) for(var/arena_file in default_arenas) var/simple_name = replacetext(replacetext(arena_file,arena_dir,""),".dmm","") - INVOKE_ASYNC(src, .proc/add_new_arena_template, null, arena_dir + arena_file, simple_name) + INVOKE_ASYNC(src, PROC_REF(add_new_arena_template), null, arena_dir + arena_file, simple_name) /obj/machinery/computer/arena/proc/get_landmark_turf(landmark_tag) for(var/obj/effect/landmark/arena/L in GLOB.landmarks_list) @@ -221,7 +221,7 @@ for(var/mob/M in all_contestants()) to_chat(M,span_userdanger("The gates will open in [timetext]!")) start_time = world.time + start_delay - addtimer(CALLBACK(src,.proc/begin),start_delay) + addtimer(CALLBACK(src, PROC_REF(begin)),start_delay) for(var/team in teams) var/obj/machinery/arena_spawn/team_spawn = get_spawn(team) var/obj/effect/countdown/arena/A = new(team_spawn) @@ -248,9 +248,9 @@ if(D.id != arena_id) continue if(closed) - INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) else - INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/open) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, open)) /obj/machinery/computer/arena/Topic(href, href_list) if(..()) diff --git a/code/game/machinery/computer/atmos_computers/_air_sensor.dm b/code/game/machinery/computer/atmos_computers/_air_sensor.dm index 72a3df3153e..b75882c5b1d 100644 --- a/code/game/machinery/computer/atmos_computers/_air_sensor.dm +++ b/code/game/machinery/computer/atmos_computers/_air_sensor.dm @@ -21,7 +21,7 @@ return ..() /obj/machinery/air_sensor/Destroy() - INVOKE_ASYNC(src, .proc/broadcast_destruction, src.frequency) + INVOKE_ASYNC(src, PROC_REF(broadcast_destruction), src.frequency) SSair.stop_processing_machine(src) SSradio.remove_object(src, frequency) return ..() diff --git a/code/game/machinery/computer/atmos_computers/inlets.dm b/code/game/machinery/computer/atmos_computers/inlets.dm index 4df5a9185f8..f172a59270b 100644 --- a/code/game/machinery/computer/atmos_computers/inlets.dm +++ b/code/game/machinery/computer/atmos_computers/inlets.dm @@ -21,7 +21,7 @@ /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/on_deconstruction() . = ..() - INVOKE_ASYNC(src, .proc/broadcast_destruction, src.frequency) + INVOKE_ASYNC(src, PROC_REF(broadcast_destruction), src.frequency) /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ui_act(action, params) . = ..() diff --git a/code/game/machinery/computer/atmos_computers/meters.dm b/code/game/machinery/computer/atmos_computers/meters.dm index 226335fcbcf..546ade8839c 100644 --- a/code/game/machinery/computer/atmos_computers/meters.dm +++ b/code/game/machinery/computer/atmos_computers/meters.dm @@ -16,7 +16,7 @@ /obj/machinery/meter/monitored/on_deconstruction() . = ..() - INVOKE_ASYNC(src, .proc/broadcast_destruction, src.frequency) + INVOKE_ASYNC(src, PROC_REF(broadcast_destruction), src.frequency) /obj/machinery/meter/monitored/proc/broadcast_destruction(frequency) var/datum/signal/signal = new(list( diff --git a/code/game/machinery/computer/atmos_computers/outlets.dm b/code/game/machinery/computer/atmos_computers/outlets.dm index c20a431dacc..34d7199af3a 100644 --- a/code/game/machinery/computer/atmos_computers/outlets.dm +++ b/code/game/machinery/computer/atmos_computers/outlets.dm @@ -15,7 +15,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/on_deconstruction() . = ..() - INVOKE_ASYNC(src, .proc/broadcast_destruction, src.frequency) + INVOKE_ASYNC(src, PROC_REF(broadcast_destruction), src.frequency) /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/set_frequency(new_frequency) SSradio.remove_object(src, frequency) @@ -140,13 +140,13 @@ return ..() /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/Destroy() - INVOKE_ASYNC(src, .proc/broadcast_destruction, src.frequency) + INVOKE_ASYNC(src, PROC_REF(broadcast_destruction), src.frequency) SSradio.remove_object(src, frequency) return ..() /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/on_deconstruction() . = ..() - INVOKE_ASYNC(src, .proc/broadcast_destruction, src.frequency) + INVOKE_ASYNC(src, PROC_REF(broadcast_destruction), src.frequency) /obj/machinery/atmospherics/components/unary/vent_pump/high_volume/siphon/monitored/set_frequency(new_frequency) SSradio.remove_object(src, frequency) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index d42b17a9c5d..161ecf71e6b 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -274,7 +274,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai /obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_CLICK, .proc/BigClick) + RegisterSignal(src, COMSIG_CLICK, PROC_REF(BigClick)) // Bypass clickchain to allow humans to use the telescreen from a distance /obj/machinery/computer/security/telescreen/entertainment/proc/BigClick() @@ -284,7 +284,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/security/telescreen/entertai balloon_alert(usr, "there's nothing on TV!") return - INVOKE_ASYNC(src, /atom.proc/interact, usr) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, interact), usr) ///Sets the monitor's icon to the selected state, and says an announcement /obj/machinery/computer/security/telescreen/entertainment/proc/notify(on, announcement) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 5d8da1f4807..c3c272143c4 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -139,7 +139,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) return battlecruiser_called = TRUE caller_card.use_charge(user) - addtimer(CALLBACK(GLOBAL_PROC, /proc/summon_battlecruiser, caller_card.team), rand(3 MINUTES, 5 MINUTES)) //skyrat edit: original values (20 SECONDS, 1 MINUTES) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(summon_battlecruiser), caller_card.team), rand(20 SECONDS, 1 MINUTES)) playsound(src, 'sound/machines/terminal_alert.ogg', 50, FALSE) priority_announce("Attention crew: deep-space sensors detect a Syndicate battlecruiser-class signature subspace rift forming near your station. Estimated time until arrival: three to five minutes.", "[command_name()] High-Priority Update") //skyrat add: announcement on battlecruiser call return @@ -368,7 +368,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) ) ) - send_cross_comms_message_timer = addtimer(CALLBACK(src, .proc/send_cross_comms_message, usr, destination, message), SScommunications.soft_filtering ? EXTENDED_CROSS_SECTOR_CANCEL_TIME : CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) + send_cross_comms_message_timer = addtimer(CALLBACK(src, PROC_REF(send_cross_comms_message), usr, destination, message), SScommunications.soft_filtering ? EXTENDED_CROSS_SECTOR_CANCEL_TIME : CROSS_SECTOR_CANCEL_TIME, TIMER_STOPPABLE) COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) if ("setState") @@ -461,7 +461,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) SSjob.safe_code_request_loc = pod_location SSjob.safe_code_requested = TRUE - SSjob.safe_code_timer_id = addtimer(CALLBACK(SSjob, /datum/controller/subsystem/job.proc/send_spare_id_safe_code, pod_location), 120 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) + SSjob.safe_code_timer_id = addtimer(CALLBACK(SSjob, TYPE_PROC_REF(/datum/controller/subsystem/job, send_spare_id_safe_code), pod_location), 120 SECONDS, TIMER_UNIQUE | TIMER_STOPPABLE) minor_announce("Due to staff shortages, your station has been approved for delivery of access codes to secure the Captain's Spare ID. Delivery via drop pod at [get_area(pod_location)]. ETA 120 seconds.") // SKYRAT EDIT ADDITION START if ("callThePolice") @@ -854,7 +854,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) return FALSE AI_notify_hack() - if(!do_after(hacker, duration, src, extra_checks = CALLBACK(src, .proc/can_hack, hacker))) + if(!do_after(hacker, duration, src, extra_checks = CALLBACK(src, PROC_REF(can_hack), hacker))) return FALSE hack_console(hacker) @@ -911,7 +911,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) var/datum/round_event_control/pirates/pirate_event = locate() in SSevents.control if(!pirate_event) CRASH("hack_console() attempted to run pirates, but could not find an event controller!") - addtimer(CALLBACK(pirate_event, /datum/round_event_control.proc/runEvent), rand(20 SECONDS, 1 MINUTES)) + addtimer(CALLBACK(pirate_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)), rand(20 SECONDS, 1 MINUTES)) if(HACK_FUGITIVES) // Triggers fugitives, which can cause confusion / chaos as the crew decides which side help priority_announce( @@ -922,7 +922,7 @@ GLOBAL_VAR_INIT(cops_arrived, FALSE) var/datum/round_event_control/fugitives/fugitive_event = locate() in SSevents.control if(!fugitive_event) CRASH("hack_console() attempted to run fugitives, but could not find an event controller!") - addtimer(CALLBACK(fugitive_event, /datum/round_event_control.proc/runEvent), rand(20 SECONDS, 1 MINUTES)) + addtimer(CALLBACK(fugitive_event, TYPE_PROC_REF(/datum/round_event_control, runEvent)), rand(20 SECONDS, 1 MINUTES)) if(HACK_THREAT) // Force an unfavorable situation on the crew priority_announce( diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 3062b431fc0..3c5b998b888 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -2291,7 +2291,7 @@ connected_scanner.set_linked_console(null) connected_scanner = new_scanner if(connected_scanner) - RegisterSignal(connected_scanner, COMSIG_PARENT_QDELETING, .proc/react_to_scanner_del) + RegisterSignal(connected_scanner, COMSIG_PARENT_QDELETING, PROC_REF(react_to_scanner_del)) connected_scanner.set_linked_console(src) /obj/machinery/computer/scan_consolenew/proc/react_to_scanner_del(datum/source) diff --git a/code/game/machinery/computer/mechlaunchpad.dm b/code/game/machinery/computer/mechlaunchpad.dm index fe49ba7d97c..f803980b5e8 100644 --- a/code/game/machinery/computer/mechlaunchpad.dm +++ b/code/game/machinery/computer/mechlaunchpad.dm @@ -28,7 +28,7 @@ return connected_mechpad = pad connected_mechpad.id = id - RegisterSignal(connected_mechpad, COMSIG_PARENT_QDELETING, .proc/unconnect_launchpad) + RegisterSignal(connected_mechpad, COMSIG_PARENT_QDELETING, PROC_REF(unconnect_launchpad)) /obj/machinery/computer/mechpad/proc/unconnect_launchpad(obj/machinery/mechpad/pad) SIGNAL_HANDLER @@ -51,8 +51,8 @@ return ..() var/mech_dir = mecha_attacker.dir balloon_alert(user, "carefully starting launch process...") - INVOKE_ASYNC(src, .proc/random_beeps, user, MECH_LAUNCH_TIME, 0.5 SECONDS, 1.5 SECONDS) - if(!do_after(user, MECH_LAUNCH_TIME, src, extra_checks = CALLBACK(src, .proc/do_after_checks, mecha_attacker, mech_dir))) + INVOKE_ASYNC(src, PROC_REF(random_beeps), user, MECH_LAUNCH_TIME, 0.5 SECONDS, 1.5 SECONDS) + if(!do_after(user, MECH_LAUNCH_TIME, src, extra_checks = CALLBACK(src, PROC_REF(do_after_checks), mecha_attacker, mech_dir))) balloon_alert(user, "interrupted!") return var/obj/machinery/mechpad/current_pad = mechpads[selected_id] @@ -110,7 +110,7 @@ /obj/machinery/computer/mechpad/proc/add_pad(obj/machinery/mechpad/pad) mechpads += pad - RegisterSignal(pad, COMSIG_PARENT_QDELETING, .proc/remove_pad) + RegisterSignal(pad, COMSIG_PARENT_QDELETING, PROC_REF(remove_pad)) /obj/machinery/computer/mechpad/proc/remove_pad(obj/machinery/mechpad/pad) SIGNAL_HANDLER @@ -128,7 +128,7 @@ return flick("mechpad-launch", connected_mechpad) playsound(connected_mechpad, 'sound/machines/triple_beep.ogg', 50, TRUE) - addtimer(CALLBACK(src, .proc/start_launch, user, where), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_launch), user, where), 1 SECONDS) /obj/machinery/computer/mechpad/proc/start_launch(mob/user, obj/machinery/mechpad/where) if(!can_launch(user, where, silent = TRUE)) diff --git a/code/game/machinery/computer/prisoner/gulag_teleporter.dm b/code/game/machinery/computer/prisoner/gulag_teleporter.dm index 7199b5bdb11..acdb74f9442 100644 --- a/code/game/machinery/computer/prisoner/gulag_teleporter.dm +++ b/code/game/machinery/computer/prisoner/gulag_teleporter.dm @@ -115,7 +115,7 @@ if("teleport") if(!teleporter || !beacon) return - addtimer(CALLBACK(src, .proc/teleport, usr), 5) + addtimer(CALLBACK(src, PROC_REF(teleport), usr), 5) return TRUE /obj/machinery/computer/prisoner/gulag_teleporter_computer/proc/scan_machinery() diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 4af3dfe8cb1..6167acc33a1 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -10,7 +10,7 @@ /obj/machinery/computer/station_alert/Initialize(mapload) alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), list(z), title = name) - RegisterSignal(alert_control.listener, list(COMSIG_ALARM_LISTENER_TRIGGERED, COMSIG_ALARM_LISTENER_CLEARED), .proc/update_alarm_display) + RegisterSignal(alert_control.listener, list(COMSIG_ALARM_LISTENER_TRIGGERED, COMSIG_ALARM_LISTENER_CLEARED), PROC_REF(update_alarm_display)) return ..() /obj/machinery/computer/station_alert/Destroy() diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index 9cc3fb41814..ba08355314b 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -101,7 +101,7 @@ say("Processing hub calibration to target...") calibrating = TRUE power_station.update_appearance() - addtimer(CALLBACK(src, .proc/finish_calibration), 50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration + addtimer(CALLBACK(src, PROC_REF(finish_calibration)), 50 * (3 - power_station.teleporter_hub.accuracy)) //Better parts mean faster calibration return TRUE /obj/machinery/computer/teleporter/proc/set_teleport_target(new_target) @@ -247,7 +247,7 @@ if (istype(shell, /obj/machinery/computer/teleporter)) attached_console = shell - RegisterSignal(attached_console, COMSIG_TELEPORTER_NEW_TARGET, .proc/on_teleporter_new_target) + RegisterSignal(attached_console, COMSIG_TELEPORTER_NEW_TARGET, PROC_REF(on_teleporter_new_target)) update_targets() /obj/item/circuit_component/teleporter_control_console/unregister_usb_parent(atom/movable/shell) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 37442ed5ed1..656c1119ae1 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -246,7 +246,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 625ccba80de..5849208a888 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -312,7 +312,7 @@ glow.set_light_color(COLOR_SOFT_RED) glow.even_cycle = !glow.even_cycle if(prob(2)) // Unique effects for the dance floor that show up randomly to mix things up - INVOKE_ASYNC(src, .proc/hierofunk) + INVOKE_ASYNC(src, PROC_REF(hierofunk)) sleep(selection.song_beat) if(QDELETED(src)) return @@ -333,7 +333,7 @@ /obj/machinery/jukebox/disco/proc/dance2(mob/living/M) for(var/i in 0 to 9) - dance_rotate(M, CALLBACK(M, /mob.proc/dance_flip)) + dance_rotate(M, CALLBACK(M, TYPE_PROC_REF(/mob, dance_flip))) sleep(2 SECONDS) /mob/proc/dance_flip() diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index a2055d7da1a..e212a635ecf 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -147,7 +147,7 @@ /obj/structure/barricade/security/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/deploy), deploy_time) + addtimer(CALLBACK(src, PROC_REF(deploy)), deploy_time) /obj/structure/barricade/security/proc/deploy() icon_state = "barrier1" diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 9d65666a44c..764372b5057 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -151,7 +151,7 @@ UnregisterSignal(linked_console, COMSIG_PARENT_QDELETING) linked_console = new_console if(linked_console) - RegisterSignal(linked_console, COMSIG_PARENT_QDELETING, .proc/react_to_console_del) + RegisterSignal(linked_console, COMSIG_PARENT_QDELETING, PROC_REF(react_to_console_del)) /obj/machinery/dna_scannernew/proc/react_to_console_del(datum/source) SIGNAL_HANDLER diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 2d9c02d8c51..a6ed0df6cd9 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -188,12 +188,12 @@ diag_hud_set_electrified() - RegisterSignal(src, COMSIG_MACHINERY_BROKEN, .proc/on_break) - RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, .proc/ntnet_receive) + RegisterSignal(src, COMSIG_MACHINERY_BROKEN, PROC_REF(on_break)) + RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, PROC_REF(ntnet_receive)) // Click on the floor to close airlocks var/static/list/connections = list( - COMSIG_ATOM_ATTACK_HAND = .proc/on_attack_hand + COMSIG_ATOM_ATTACK_HAND = PROC_REF(on_attack_hand) ) AddElement(/datum/element/connect_loc, connections) @@ -264,9 +264,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) @@ -430,7 +430,7 @@ secondsBackupPowerLost = 10 if(!spawnPowerRestoreRunning) spawnPowerRestoreRunning = TRUE - INVOKE_ASYNC(src, .proc/handlePowerRestore) + INVOKE_ASYNC(src, PROC_REF(handlePowerRestore)) update_appearance() /obj/machinery/door/airlock/proc/loseBackupPower() @@ -438,7 +438,7 @@ secondsBackupPowerLost = 60 if(!spawnPowerRestoreRunning) spawnPowerRestoreRunning = TRUE - INVOKE_ASYNC(src, .proc/handlePowerRestore) + INVOKE_ASYNC(src, PROC_REF(handlePowerRestore)) update_appearance() /obj/machinery/door/airlock/proc/regainBackupPower() @@ -1019,7 +1019,7 @@ user.visible_message(span_notice("[user] begins welding the airlock."), \ span_notice("You begin repairing the airlock..."), \ span_hear("You hear welding.")) - if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, W, user))) + if(W.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), W, user))) atom_integrity = max_integrity set_machine_stat(machine_stat & ~BROKEN) user.visible_message(span_notice("[user] finishes welding [src]."), \ @@ -1034,7 +1034,7 @@ user.visible_message(span_notice("[user] begins [welded ? "unwelding":"welding"] the airlock."), \ span_notice("You begin [welded ? "unwelding":"welding"] the airlock..."), \ span_hear("You hear welding.")) - if(!tool.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/weld_checks, tool, user))) + if(!tool.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(weld_checks), tool, user))) return welded = !welded user.visible_message(span_notice("[user] [welded? "welds shut":"unwelds"] [src]."), \ @@ -1145,7 +1145,7 @@ if(istype(I, /obj/item/fireaxe) && !HAS_TRAIT(I, TRAIT_WIELDED)) //being fireaxe'd to_chat(user, span_warning("You need to be wielding [I] to do that!")) return - INVOKE_ASYNC(src, (density ? .proc/open : .proc/close), 2) + INVOKE_ASYNC(src, density ? PROC_REF(open) : PROC_REF(close), 2) /obj/machinery/door/airlock/open(forced=0) if( operating || welded || locked || seal ) @@ -1169,7 +1169,7 @@ return TRUE if(closeOther != null && istype(closeOther, /obj/machinery/door/airlock)) - addtimer(CALLBACK(closeOther, .proc/close), 2) + addtimer(CALLBACK(closeOther, PROC_REF(close)), 2) if(close_others) for(var/obj/machinery/door/airlock/otherlock as anything in close_others) @@ -1177,14 +1177,14 @@ if(otherlock.operating) otherlock.delayed_close_requested = TRUE else - addtimer(CALLBACK(otherlock, .proc/close), 2) + addtimer(CALLBACK(otherlock, PROC_REF(close)), 2) if(cyclelinkedairlock) if(!shuttledocked && !emergency && !cyclelinkedairlock.shuttledocked && !cyclelinkedairlock.emergency) if(cyclelinkedairlock.operating) cyclelinkedairlock.delayed_close_requested = TRUE else - addtimer(CALLBACK(cyclelinkedairlock, .proc/close), 2) + addtimer(CALLBACK(cyclelinkedairlock, PROC_REF(close)), 2) SEND_SIGNAL(src, COMSIG_AIRLOCK_OPEN, forced) operating = TRUE @@ -1210,7 +1210,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 @@ -1398,7 +1398,7 @@ secondsElectrified = seconds diag_hud_set_electrified() if(secondsElectrified > MACHINE_NOT_ELECTRIFIED) - INVOKE_ASYNC(src, .proc/electrified_loop) + INVOKE_ASYNC(src, PROC_REF(electrified_loop)) if(user) var/message diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index c1d32ebdbdc..796c51c3ca8 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -23,7 +23,7 @@ . = ..() SSradio.remove_object(src, air_frequency) air_connection = SSradio.add_object(src, air_frequency, RADIO_TO_AIRALARM) - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) /obj/machinery/door/airlock/alarmlock/receive_signal(datum/signal/signal) ..() diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 4f375c64405..2a1e19a0184 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -107,7 +107,7 @@ continue if(door.density) continue - INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/close) + INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door/window/brigdoor, close)) for(var/datum/weakref/closet_ref as anything in closets) var/obj/structure/closet/secure_closet/brig/closet = closet_ref.resolve() @@ -147,7 +147,7 @@ continue if(!door.density) continue - INVOKE_ASYNC(door, /obj/machinery/door/window/brigdoor.proc/open) + INVOKE_ASYNC(door, TYPE_PROC_REF(/obj/machinery/door/window/brigdoor, open)) for(var/datum/weakref/closet_ref as anything in closets) var/obj/structure/closet/secure_closet/brig/closet = closet_ref.resolve() diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 7c7ba9bc45d..002339a8ff3 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -62,10 +62,10 @@ //doors only block while dense though so we have to use the proc real_explosion_block = explosion_block explosion_block = EXPLOSION_BLOCK_PROC - RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, .proc/check_security_level) + RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_security_level)) var/static/list/loc_connections = list( - COMSIG_ATOM_MAGICALLY_UNLOCKED = .proc/on_magic_unlock, + COMSIG_ATOM_MAGICALLY_UNLOCKED = PROC_REF(on_magic_unlock), ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/can_barricade) @@ -323,7 +323,7 @@ if (. & EMP_PROTECT_SELF) return if(prob(20/severity) && (istype(src, /obj/machinery/door/airlock) || istype(src, /obj/machinery/door/window)) ) - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) /obj/machinery/door/update_icon_state() icon_state = "[base_icon_state][density]" @@ -442,7 +442,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 @@ -499,6 +499,6 @@ /obj/machinery/door/proc/on_magic_unlock(datum/source, datum/action/cooldown/spell/aoe/knock/spell, mob/living/caster) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) #undef DOOR_CLOSE_WAIT diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 4096fde008f..0111a2c97f9 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -77,14 +77,14 @@ base_icon_state = "sus" desc += " This one looks a bit sus..." - RegisterSignal(src, COMSIG_MACHINERY_POWER_RESTORED, .proc/on_power_restore) - RegisterSignal(src, COMSIG_MACHINERY_POWER_LOST, .proc/on_power_loss) + RegisterSignal(src, COMSIG_MACHINERY_POWER_RESTORED, PROC_REF(on_power_restore)) + RegisterSignal(src, COMSIG_MACHINERY_POWER_LOST, PROC_REF(on_power_loss)) return INITIALIZE_HINT_LATELOAD /obj/machinery/door/firedoor/LateInitialize() . = ..() - RegisterSignal(src, COMSIG_MERGER_ADDING, .proc/merger_adding) - RegisterSignal(src, COMSIG_MERGER_REMOVING, .proc/merger_removing) + RegisterSignal(src, COMSIG_MERGER_ADDING, PROC_REF(merger_adding)) + RegisterSignal(src, COMSIG_MERGER_REMOVING, PROC_REF(merger_removing)) GetMergeGroup(merger_id, merger_typecache) register_adjacent_turfs() @@ -200,7 +200,7 @@ SIGNAL_HANDLER if(new_merger.id != merger_id) return - RegisterSignal(new_merger, COMSIG_MERGER_REFRESH_COMPLETE, .proc/refresh_shared_turfs) + RegisterSignal(new_merger, COMSIG_MERGER_REFRESH_COMPLETE, PROC_REF(refresh_shared_turfs)) /obj/machinery/door/firedoor/proc/merger_removing(obj/machinery/door/firedoor/us, datum/merger/old_merger) SIGNAL_HANDLER @@ -229,7 +229,7 @@ return var/turf/our_turf = get_turf(loc) - RegisterSignal(our_turf, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS, .proc/process_results) + RegisterSignal(our_turf, COMSIG_TURF_CALCULATED_ADJACENT_ATMOS, PROC_REF(process_results)) for(var/dir in GLOB.cardinals) var/turf/checked_turf = get_step(our_turf, dir) @@ -238,7 +238,7 @@ if(isclosedturf(checked_turf)) continue process_results(checked_turf) - RegisterSignal(checked_turf, COMSIG_TURF_EXPOSE, .proc/process_results) + RegisterSignal(checked_turf, COMSIG_TURF_EXPOSE, PROC_REF(process_results)) /obj/machinery/door/firedoor/proc/unregister_adjacent_turfs(atom/old_loc) @@ -339,7 +339,7 @@ return if(code != FIRELOCK_ALARM_TYPE_GENERIC && !COOLDOWN_FINISHED(src, activation_cooldown)) // Non generic activation, subject to crowbar safety // Properly activate once the timeleft's up - addtimer(CALLBACK(src, .proc/activate, code), COOLDOWN_TIMELEFT(src, activation_cooldown)) + addtimer(CALLBACK(src, PROC_REF(activate), code), COOLDOWN_TIMELEFT(src, activation_cooldown)) return active = TRUE alarm_type = code @@ -393,7 +393,7 @@ correct_state() /// Please be called 3 seconds after the LAST open, rather then 3 seconds after the first - addtimer(CALLBACK(src, .proc/release_constraints), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(release_constraints)), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) /** * Reset our temporary alarm ignoring @@ -425,7 +425,7 @@ var/obj/item/card/emag/doorjack/digital_crowbar = emag_type digital_crowbar.use_charge(user) obj_flags |= EMAGGED - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) /obj/machinery/door/firedoor/Bumped(atom/movable/AM) if(panel_open || operating) @@ -523,9 +523,9 @@ if(QDELETED(user)) being_held_open = FALSE return - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/handle_held_open_adjacency) - RegisterSignal(user, COMSIG_LIVING_SET_BODY_POSITION, .proc/handle_held_open_adjacency) - RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/handle_held_open_adjacency) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(handle_held_open_adjacency)) + RegisterSignal(user, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(handle_held_open_adjacency)) + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(handle_held_open_adjacency)) handle_held_open_adjacency(user) else close() @@ -538,7 +538,7 @@ if(density) open() if(active) - addtimer(CALLBACK(src, .proc/correct_state), 2 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) else close() @@ -563,7 +563,7 @@ if(density) open() if(active) - addtimer(CALLBACK(src, .proc/correct_state), 2 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) else close() return TRUE @@ -578,7 +578,7 @@ return open() if(active) - addtimer(CALLBACK(src, .proc/correct_state), 2 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(correct_state)), 2 SECONDS, TIMER_UNIQUE) /obj/machinery/door/firedoor/do_animate(animation) switch(animation) @@ -618,10 +618,10 @@ if(obj_flags & EMAGGED || being_held_open || QDELETED(src)) return //Unmotivated, indifferent, we have no real care what state we're in anymore. if(active && !density) //We should be closed but we're not - INVOKE_ASYNC(src, .proc/close) + INVOKE_ASYNC(src, PROC_REF(close)) return if(!active && density) //We should be open but we're not - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) return /obj/machinery/door/firedoor/open() diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 7a2a584b88e..49c057c0413 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -170,9 +170,9 @@ /obj/machinery/door/poddoor/shuttledock/proc/check() var/turf/turf = get_step(src, checkdir) if(!istype(turf, turftype)) - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) else - INVOKE_ASYNC(src, .proc/close) + INVOKE_ASYNC(src, PROC_REF(close)) /obj/machinery/door/poddoor/incinerator_ordmix name = "combustion chamber vent" diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index faa1defe7cf..2129d2ddfea 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -47,10 +47,10 @@ src.unres_sides = unres_sides update_appearance(UPDATE_ICON) - RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, .proc/ntnet_receive) + RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, PROC_REF(ntnet_receive)) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -391,11 +391,11 @@ return if(density) - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) else - INVOKE_ASYNC(src, .proc/close) + INVOKE_ASYNC(src, PROC_REF(close)) if("touch") - INVOKE_ASYNC(src, .proc/open_and_close) + INVOKE_ASYNC(src, PROC_REF(open_and_close)) /obj/machinery/door/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) diff --git a/code/game/machinery/ecto_sniffer.dm b/code/game/machinery/ecto_sniffer.dm index a87e0307cf3..fe0e3c78390 100644 --- a/code/game/machinery/ecto_sniffer.dm +++ b/code/game/machinery/ecto_sniffer.dm @@ -35,7 +35,7 @@ say("Reporting [pick(world.file2list("strings/spook_levels.txt"))] levels of paranormal activity!") if(activator?.ckey) ectoplasmic_residues += activator.ckey - addtimer(CALLBACK(src, .proc/clear_residue, activator.ckey), 15 SECONDS) + addtimer(CALLBACK(src, PROC_REF(clear_residue), activator.ckey), 15 SECONDS) /obj/machinery/ecto_sniffer/attack_hand(mob/living/user, list/modifiers) . = ..() diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 6a8df511c90..b08b2f189c1 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -80,7 +80,7 @@ else controller.onlyClose(door) use_power(active_power_usage) - addtimer(CALLBACK(src, .proc/not_busy), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(not_busy)), 2 SECONDS) /obj/machinery/door_buttons/access_button/proc/not_busy() busy = FALSE @@ -208,7 +208,7 @@ goIdle(TRUE) return A.unbolt() - INVOKE_ASYNC(src, .proc/do_openDoor, A) + INVOKE_ASYNC(src, PROC_REF(do_openDoor), A) /obj/machinery/door_buttons/airlock_controller/proc/do_openDoor(obj/machinery/door/airlock/A) if(A?.open()) diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 1ffa4921b8b..9897f4d00b9 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -58,12 +58,12 @@ process_command(href_list["command"]) usr.set_machine(src) - addtimer(CALLBACK(src, .proc/updateDialog), 5) + addtimer(CALLBACK(src, PROC_REF(updateDialog)), 5) /obj/machinery/embedded_controller/proc/process_command(command) if(program) program.receive_user_command(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) /obj/machinery/embedded_controller/process(delta_time) if(program) diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm index 47f11afc4f1..85f78be9a27 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -62,7 +62,7 @@ set_occupant(null) return to_chat(occupant, span_notice("You enter [src].")) - addtimer(CALLBACK(src, .proc/start_extracting), 20, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(start_extracting)), 20, TIMER_OVERRIDE|TIMER_UNIQUE) update_appearance() /obj/machinery/fat_sucker/open_machine(mob/user) diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index a6ef5cb36fc..547b59f5cd6 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -50,7 +50,7 @@ LAZYADD(my_area.firealarms, src) AddElement(/datum/element/atmos_sensitive, mapload) - RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, .proc/check_security_level) + RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_security_level)) soundloop = new(src, FALSE) AddComponent(/datum/component/usb_port, list( @@ -77,11 +77,11 @@ if(!.) return var/area/our_area = get_area(src) - RegisterSignal(our_area, COMSIG_AREA_FIRE_CHANGED, .proc/handle_fire) + RegisterSignal(our_area, COMSIG_AREA_FIRE_CHANGED, PROC_REF(handle_fire)) /obj/machinery/firealarm/on_enter_area(datum/source, area/area_to_register) ..() - RegisterSignal(area_to_register, COMSIG_AREA_FIRE_CHANGED, .proc/handle_fire) + RegisterSignal(area_to_register, COMSIG_AREA_FIRE_CHANGED, PROC_REF(handle_fire)) handle_fire(area_to_register, area_to_register.fire) /obj/machinery/firealarm/on_exit_area(datum/source, area/area_to_unregister) @@ -485,8 +485,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 26) . = ..() if(istype(parent, /obj/machinery/firealarm)) attached_alarm = parent - RegisterSignal(parent, COMSIG_FIREALARM_ON_TRIGGER, .proc/on_firealarm_triggered) - RegisterSignal(parent, COMSIG_FIREALARM_ON_RESET, .proc/on_firealarm_reset) + RegisterSignal(parent, COMSIG_FIREALARM_ON_TRIGGER, PROC_REF(on_firealarm_triggered)) + RegisterSignal(parent, COMSIG_FIREALARM_ON_RESET, PROC_REF(on_firealarm_reset)) /obj/item/circuit_component/firealarm/unregister_usb_parent(atom/movable/parent) attached_alarm = null diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index b38f0c81d74..9f5ddbd727f 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -98,7 +98,7 @@ visible_message(span_notice("The [name] begins warming up!")) say("Initializing harvest protocol.") update_appearance() - addtimer(CALLBACK(src, .proc/harvest), interval) + addtimer(CALLBACK(src, PROC_REF(harvest)), interval) /obj/machinery/harvester/proc/harvest() warming_up = FALSE @@ -133,7 +133,7 @@ operation_order.Remove(BP) break use_power(active_power_usage) - 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 89a7049290c..6f86d2affb1 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -620,7 +620,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ AI.current = src SetLightsAndPower() update_holoray(user, get_turf(loc)) - RegisterSignal(user, COMSIG_MOB_EMOTE, .proc/handle_hologram_emote) // SKYRAT ADDITION - HOLOGRAM EMOTE MIRROR + RegisterSignal(user, COMSIG_MOB_EMOTE, PROC_REF(handle_hologram_emote)) // SKYRAT ADDITION - HOLOGRAM EMOTE MIRROR return TRUE // SKYRAT ADDITION - HOLOGRAM EMOTE MIRROR @@ -824,7 +824,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 f3866db4900..af368428d8d 100644 --- a/code/game/machinery/hypnochair.dm +++ b/code/game/machinery/hypnochair.dm @@ -99,7 +99,7 @@ START_PROCESSING(SSobj, src) start_time = world.time update_appearance() - timerid = addtimer(CALLBACK(src, .proc/finish_interrogation), 450, TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(finish_interrogation)), 450, TIMER_STOPPABLE) /obj/machinery/hypnochair/process(delta_time) var/mob/living/carbon/C = occupant diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index d73124d2657..788965f009d 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -512,9 +512,9 @@ return if(COMPONENT_TRIGGERED_BY(send_trigger, port)) - INVOKE_ASYNC(attached_launchpad, /obj/machinery/launchpad.proc/doteleport, null, TRUE, parent.get_creator()) + INVOKE_ASYNC(attached_launchpad, TYPE_PROC_REF(/obj/machinery/launchpad, doteleport), null, TRUE, parent.get_creator()) sent.set_output(COMPONENT_SIGNAL) if(COMPONENT_TRIGGERED_BY(retrieve_trigger, port)) - INVOKE_ASYNC(attached_launchpad, /obj/machinery/launchpad.proc/doteleport, null, FALSE, parent.get_creator()) + INVOKE_ASYNC(attached_launchpad, TYPE_PROC_REF(/obj/machinery/launchpad, doteleport), null, FALSE, parent.get_creator()) retrieved.set_output(COMPONENT_SIGNAL) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 64f264155eb..de631cfbca0 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -106,7 +106,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26) . = ..() if(istype(parent, /obj/machinery/light_switch)) attached_switch = parent - RegisterSignal(parent, COMSIG_LIGHT_SWITCH_SET, .proc/on_light_switch_set) + RegisterSignal(parent, COMSIG_LIGHT_SWITCH_SET, PROC_REF(on_light_switch_set)) /obj/item/circuit_component/light_switch/unregister_usb_parent(atom/movable/parent) attached_switch = null diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 9af7908d0c9..bd5364b9dc7 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -167,7 +167,7 @@ flick("limbgrower_fill",src) icon_state = "limbgrower_idleon" selected_category = params["active_tab"] - addtimer(CALLBACK(src, .proc/build_item, consumed_reagents_list), production_speed * production_coefficient) + addtimer(CALLBACK(src, PROC_REF(build_item), consumed_reagents_list), production_speed * production_coefficient) . = TRUE return diff --git a/code/game/machinery/medipen_refiller.dm b/code/game/machinery/medipen_refiller.dm index f4ceab57c37..5cea2c22312 100644 --- a/code/game/machinery/medipen_refiller.dm +++ b/code/game/machinery/medipen_refiller.dm @@ -58,7 +58,7 @@ if(reagents.has_reagent(allowed[P.type], 10)) busy = TRUE add_overlay("active") - addtimer(CALLBACK(src, .proc/refill, P, user), 20) + addtimer(CALLBACK(src, PROC_REF(refill), P, user), 20) qdel(P) return to_chat(user, span_danger("There aren't enough reagents to finish this operation.")) diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index 53c8906a0b6..cb6e85a7f42 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -488,7 +488,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) return user.balloon_alert_to_viewers("started welding...", "started repairing...") audible_message(span_hear("You hear welding.")) - if(!tool.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, .proc/needs_repair))) + if(!tool.use_tool(src, user, 40, volume=50, extra_checks = CALLBACK(src, PROC_REF(needs_repair)))) user.balloon_alert_to_viewers("stopped welding!", "interrupted the repair!") return user.balloon_alert_to_viewers("repaired [src]") @@ -623,7 +623,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/newscaster, 30) playsound(loc, 'sound/machines/twobeep_high.ogg', 75, TRUE) alert = TRUE update_appearance() - addtimer(CALLBACK(src, .proc/remove_alert), ALERT_DELAY, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(remove_alert)), ALERT_DELAY, TIMER_UNIQUE|TIMER_OVERRIDE) else if(!channel && update_alert) say("Attention! Wanted issue distributed!") diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 44d5b9b165b..da988395bd0 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -122,7 +122,7 @@ DEFINE_BITFIELD(turret_flags, list( base.layer = NOT_HIGH_OBJ_LAYER underlays += base if(!has_cover) - INVOKE_ASYNC(src, .proc/popUp) + INVOKE_ASYNC(src, PROC_REF(popUp)) /obj/machinery/porta_turret/proc/toggle_on(set_to) var/current = on @@ -174,7 +174,7 @@ DEFINE_BITFIELD(turret_flags, list( turret_gun.forceMove(src) stored_gun = turret_gun - RegisterSignal(stored_gun, COMSIG_PARENT_QDELETING, .proc/null_gun) + RegisterSignal(stored_gun, COMSIG_PARENT_QDELETING, PROC_REF(null_gun)) var/list/gun_properties = stored_gun.get_turret_properties() //required properties @@ -356,7 +356,7 @@ DEFINE_BITFIELD(turret_flags, list( toggle_on(FALSE) //turns off the turret temporarily update_appearance() //6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit - addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 6 SECONDS) //turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here /obj/machinery/porta_turret/emp_act(severity) @@ -376,7 +376,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) . = ..() @@ -385,7 +385,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 @@ -776,9 +776,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 @@ -1142,8 +1142,8 @@ DEFINE_BITFIELD(turret_flags, list( if(team_color == "blue") if(istype(P, /obj/projectile/beam/lasertag/redtag)) toggle_on(FALSE) - addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 10 SECONDS) else if(team_color == "red") if(istype(P, /obj/projectile/beam/lasertag/bluetag)) toggle_on(FALSE) - addtimer(CALLBACK(src, .proc/toggle_on, TRUE), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(toggle_on), TRUE), 10 SECONDS) diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index fce961781e5..f0db6c05066 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -147,7 +147,7 @@ playsound(get_turf(src), 'sound/weapons/flash.ogg', 25, TRUE) teleporting = TRUE - addtimer(CALLBACK(src, .proc/teleport_contents, user, target_pad), teleport_speed) + addtimer(CALLBACK(src, PROC_REF(teleport_contents), user, target_pad), teleport_speed) /obj/machinery/quantumpad/proc/teleport_contents(mob/user, obj/machinery/quantumpad/target_pad) teleporting = FALSE diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 4946e2fa98f..564e9752f8c 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -46,7 +46,7 @@ update_appearance(UPDATE_ICON) req_one_access = SSid_access.get_region_access_list(list(REGION_ALL_STATION, REGION_CENTCOM)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -109,7 +109,7 @@ /obj/machinery/recycler/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/eat, AM) + INVOKE_ASYNC(src, PROC_REF(eat), AM) /obj/machinery/recycler/proc/eat(atom/movable/AM0, sound=TRUE) if(machine_stat & (BROKEN|NOPOWER)) @@ -184,7 +184,7 @@ playsound(src, 'sound/machines/buzz-sigh.ogg', 50, FALSE) safety_mode = TRUE update_appearance() - addtimer(CALLBACK(src, .proc/reboot), SAFETY_COOLDOWN) + addtimer(CALLBACK(src, PROC_REF(reboot)), SAFETY_COOLDOWN) /obj/machinery/recycler/proc/reboot() playsound(src, 'sound/machines/ping.ogg', 50, FALSE) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 24f510eb5af..616da895c5d 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -334,7 +334,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) Radio.set_frequency(radio_freq) Radio.talk_into(src,"[emergency] emergency in [department]!!",radio_freq) update_appearance() - addtimer(CALLBACK(src, .proc/clear_emergency), 5 MINUTES) + addtimer(CALLBACK(src, PROC_REF(clear_emergency)), 5 MINUTES) if(href_list["send"] && message && to_department && priority) diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 9bb658abbf8..cc5f26edff8 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -175,7 +175,7 @@ playsound(src, 'sound/machines/piston_raise.ogg', 70) playsound(src, 'sound/machines/chime.ogg', 50) - addtimer(CALLBACK(src, .proc/play, user, player_card, chosen_bet_type, chosen_bet_amount, potential_payout), 4) //Animation first + addtimer(CALLBACK(src, PROC_REF(play), user, player_card, chosen_bet_type, chosen_bet_amount, potential_payout), 4) //Animation first return TRUE else var/msg = tgui_input_text(user, "Name of your roulette wheel", "Roulette Customization", "Roulette Machine", MAX_NAME_LEN) @@ -184,7 +184,7 @@ name = msg desc = "Owned by [player_card.registered_account.account_holder], draws directly from [user.p_their()] account." my_card = player_card - RegisterSignal(my_card, COMSIG_PARENT_QDELETING, .proc/on_my_card_deleted) + RegisterSignal(my_card, COMSIG_PARENT_QDELETING, PROC_REF(on_my_card_deleted)) to_chat(user, span_notice("You link the wheel to your account.")) power_change() return @@ -214,8 +214,8 @@ var/rolled_number = rand(0, 36) playsound(src, 'sound/machines/roulettewheel.ogg', 50) - addtimer(CALLBACK(src, .proc/finish_play, player_id, bet_type, bet_amount, payout, rolled_number), 34) //4 deciseconds more so the animation can play - addtimer(CALLBACK(src, .proc/finish_play_animation), 30) + addtimer(CALLBACK(src, PROC_REF(finish_play), player_id, bet_type, bet_amount, payout, rolled_number), 34) //4 deciseconds more so the animation can play + addtimer(CALLBACK(src, PROC_REF(finish_play_animation)), 30) use_power(active_power_usage) @@ -296,7 +296,7 @@ var/obj/item/cash = new coin_to_drop(drop_loc) playsound(cash, pick(list('sound/machines/coindrop.ogg', 'sound/machines/coindrop2.ogg')), 40, TRUE) - addtimer(CALLBACK(src, .proc/drop_coin), 3) //Recursion time + addtimer(CALLBACK(src, PROC_REF(drop_coin)), 3) //Recursion time ///Fills a list of coins that should be dropped. @@ -439,7 +439,7 @@ return loc.visible_message(span_warning("\The [src] begins to beep loudly!")) used = TRUE - addtimer(CALLBACK(src, .proc/launch_payload), 40) + addtimer(CALLBACK(src, PROC_REF(launch_payload)), 40) /obj/item/roulette_wheel_beacon/proc/launch_payload() var/obj/structure/closet/supplypod/centcompod/toLaunch = new() diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm index cf11171fdef..90e3242b4ea 100644 --- a/code/game/machinery/scan_gate.dm +++ b/code/game/machinery/scan_gate.dm @@ -72,7 +72,7 @@ wires = new /datum/wires/scanner_gate(src) set_scanline("passive") var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -90,7 +90,7 @@ /obj/machinery/scanner_gate/proc/on_entered(datum/source, atom/movable/AM) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/auto_scan, AM) + INVOKE_ASYNC(src, PROC_REF(auto_scan), AM) /obj/machinery/scanner_gate/proc/auto_scan(atom/movable/AM) if(!(machine_stat & (BROKEN|NOPOWER)) && isliving(AM) & (!panel_open)) @@ -101,7 +101,7 @@ deltimer(scanline_timer) add_overlay(type) if(duration) - scanline_timer = addtimer(CALLBACK(src, .proc/set_scanline, "passive"), duration, TIMER_STOPPABLE) + scanline_timer = addtimer(CALLBACK(src, PROC_REF(set_scanline), "passive"), duration, TIMER_STOPPABLE) /obj/machinery/scanner_gate/attackby(obj/item/W, mob/user, params) var/obj/item/card/id/card = W.GetID() diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm index 700f017a78f..82eae7d395f 100644 --- a/code/game/machinery/sheetifier.dm +++ b/code/game/machinery/sheetifier.dm @@ -10,7 +10,8 @@ /obj/machinery/sheetifier/Initialize(mapload) . = ..() - AddComponent(/datum/component/material_container, list(/datum/material/meat, /datum/material/hauntium), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), null, CALLBACK(src, .proc/CanInsertMaterials), CALLBACK(src, .proc/AfterInsertMaterials)) + + AddComponent(/datum/component/material_container, list(/datum/material/meat, /datum/material/hauntium), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), null, CALLBACK(src, PROC_REF(CanInsertMaterials)), CALLBACK(src, PROC_REF(AfterInsertMaterials))) /obj/machinery/sheetifier/update_overlays() . = ..() @@ -33,7 +34,7 @@ var/mutable_appearance/processing_overlay = mutable_appearance(icon, "processing") processing_overlay.color = last_inserted_material.color flick_overlay_static(processing_overlay, src, 64) - addtimer(CALLBACK(src, .proc/finish_processing), 64) + addtimer(CALLBACK(src, PROC_REF(finish_processing)), 64) /obj/machinery/sheetifier/proc/finish_processing() busy_processing = FALSE diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 0bfd1105a6a..3647dc89aaf 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -290,7 +290,7 @@ . = ..() if(anchored) connect_to_network() - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity_if_active) + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity_if_active)) /obj/machinery/power/shieldwallgen/Destroy() for(var/d in GLOB.cardinals) @@ -475,7 +475,7 @@ visible_message(span_danger("\The [src] is suddenly occupying the same space as \the [L]!")) L.investigate_log("has been gibbed by [src].", INVESTIGATE_DEATHS) L.gib() - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity) + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity)) /obj/machinery/shieldwall/Destroy() gen_primary = null diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 25367292ede..62b6972dc09 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -41,13 +41,13 @@ jackpots = rand(1, 4) //false hope plays = rand(75, 200) - INVOKE_ASYNC(src, .proc/toggle_reel_spin, TRUE)//The reels won't spin unless we activate them + INVOKE_ASYNC(src, PROC_REF(toggle_reel_spin), TRUE)//The reels won't spin unless we activate them var/list/reel = reels[1] for(var/i in 1 to reel.len) //Populate the reels. randomize_reels() - INVOKE_ASYNC(src, .proc/toggle_reel_spin, FALSE) + INVOKE_ASYNC(src, PROC_REF(toggle_reel_spin), FALSE) if (isnull(coinvalues)) coinvalues = list() @@ -213,9 +213,9 @@ update_appearance() updateDialog() - var/spin_loop = addtimer(CALLBACK(src, .proc/do_spin), 2, TIMER_LOOP|TIMER_STOPPABLE) + var/spin_loop = addtimer(CALLBACK(src, PROC_REF(do_spin)), 2, TIMER_LOOP|TIMER_STOPPABLE) - addtimer(CALLBACK(src, .proc/finish_spinning, spin_loop, user, the_name), SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len)) + addtimer(CALLBACK(src, PROC_REF(finish_spinning), spin_loop, user, the_name), SPIN_TIME - (REEL_DEACTIVATE_DELAY * reels.len)) //WARNING: no sanity checking for user since it's not needed and would complicate things (machine should still spin even if user is gone), be wary of this if you're changing this code. /obj/machinery/computer/slot_machine/proc/do_spin() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 6500f5ce734..0dab2e23bdd 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -261,7 +261,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), ) @@ -381,7 +381,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 @@ -484,7 +484,7 @@ if(locked) visible_message(span_notice("You see [user] kicking against the doors of [src]!"), \ span_notice("You start kicking against the doors...")) - addtimer(CALLBACK(src, .proc/resist_open, user), 300) + addtimer(CALLBACK(src, PROC_REF(resist_open), user), 300) else open_machine() dump_inventory_contents() diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 6616ba8cce1..6c08a0039ed 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -64,7 +64,7 @@ if(0 to 5) volume = 50 for(var/i,i<3,i++) - addtimer(CALLBACK(src, .proc/play_fearsome_ping), i*5) + addtimer(CALLBACK(src, PROC_REF(play_fearsome_ping)), i*5) if(5 to 10) volume = 40 if(10 to 15) @@ -448,7 +448,7 @@ chem_splash(get_turf(src), reagents, spread_range, list(reactants), temp_boost) // Detonate it again in one second, until it's out of juice. - addtimer(CALLBACK(src, .proc/detonate), 10) + addtimer(CALLBACK(src, PROC_REF(detonate)), 10) // If it's not a time release bomb, do normal explosion diff --git a/code/game/machinery/teambuilder.dm b/code/game/machinery/teambuilder.dm index c8b55bf5b52..4bc0969f583 100644 --- a/code/game/machinery/teambuilder.dm +++ b/code/game/machinery/teambuilder.dm @@ -21,7 +21,7 @@ . = ..() add_filter("teambuilder", 2, list("type" = "outline", "color" = team_color, "size" = 2)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 0d0a6c9fb97..71b7e371adb 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -60,7 +60,7 @@ // Will help make emagging the console not so easy to get away with. monitor_key_paper.add_raw_text("

£%@%(*$%&(£&?*(%&£/{}") var/time = 100 * length(linkedServer.decryptkey) - addtimer(CALLBACK(src, .proc/UnmagConsole), time) + addtimer(CALLBACK(src, PROC_REF(UnmagConsole)), time) message = rebootmsg else to_chat(user, span_notice("A no server error appears on the screen.")) @@ -345,7 +345,7 @@ hacking = TRUE screen = MSG_MON_SCREEN_HACKED //Time it takes to bruteforce is dependant on the password length. - addtimer(CALLBACK(src, .proc/finish_bruteforce, usr), 100*length(linkedServer.decryptkey)) + addtimer(CALLBACK(src, PROC_REF(finish_bruteforce), usr), 100*length(linkedServer.decryptkey)) //Delete the log. if (href_list["delete_logs"]) diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm index 2e66f7cec62..c66e359b0a6 100644 --- a/code/game/machinery/telecomms/machines/broadcaster.dm +++ b/code/game/machinery/telecomms/machines/broadcaster.dm @@ -48,7 +48,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages if(!GLOB.message_delay) GLOB.message_delay = TRUE - addtimer(CALLBACK(GLOBAL_PROC, .proc/end_message_delay), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(end_message_delay)), 1 SECONDS) /* --- Do a snazzy animation! --- */ flick("broadcaster_send", src) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index 3e724114ad8..6f3f886b91e 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -170,7 +170,7 @@ GLOBAL_LIST_EMPTY(telecomms_list) if(prob(100/severity) && !(machine_stat & EMPED)) set_machine_stat(machine_stat | EMPED) var/duration = (300 * 10)/severity - addtimer(CALLBACK(src, .proc/de_emp), rand(duration - 20, duration + 20)) + addtimer(CALLBACK(src, PROC_REF(de_emp)), rand(duration - 20, duration + 20)) /obj/machinery/telecomms/proc/de_emp() set_machine_stat(machine_stat & ~EMPED) diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 77d4b9af588..4039c397110 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 = TRUE - addtimer(CALLBACK(src, .proc/unlock_new_robot, R), 50) + addtimer(CALLBACK(src, PROC_REF(unlock_new_robot), R), 50) /obj/machinery/transformer/proc/unlock_new_robot(mob/living/silicon/robot/R) playsound(src.loc, 'sound/machines/ping.ogg', 50, FALSE) diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 0b71a6ff46d..371af191a13 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -405,7 +405,7 @@ GLOBAL_LIST_INIT(dye_registry, list( if(HAS_TRAIT(user, TRAIT_BRAINWASHING)) ADD_TRAIT(src, TRAIT_BRAINWASHING, SKILLCHIP_TRAIT) update_appearance() - addtimer(CALLBACK(src, .proc/wash_cycle), 20 SECONDS) + addtimer(CALLBACK(src, PROC_REF(wash_cycle)), 20 SECONDS) START_PROCESSING(SSfastprocess, src) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 0fa657a7d8f..e222b451380 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -112,7 +112,7 @@ if(anchored) ADD_TRAIT(M, TRAIT_NO_FLOATING_ANIM, BUCKLED_TRAIT) if(!length(buckled_mobs)) - RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, .proc/on_set_anchored) + RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, PROC_REF(on_set_anchored)) M.set_buckled(src) buckled_mobs |= M M.throw_alert(ALERT_BUCKLED, /atom/movable/screen/alert/buckled) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index e0e368813e2..24745461610 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -119,7 +119,7 @@ /obj/effect/anomaly/grav/Initialize(mapload, new_lifespan, drops_core) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -185,7 +185,7 @@ /obj/effect/anomaly/grav/high/Initialize(mapload, new_lifespan) . = ..() - INVOKE_ASYNC(src, .proc/setup_grav_field) + INVOKE_ASYNC(src, PROC_REF(setup_grav_field)) /obj/effect/anomaly/grav/high/proc/setup_grav_field() grav_field = new(src, 7, TRUE, rand(0, 3)) @@ -214,7 +214,7 @@ . = ..() src.explosive = explosive var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -320,7 +320,7 @@ /obj/effect/anomaly/bluespace/proc/blue_effect(mob/make_sparkle) make_sparkle.overlay_fullscreen("bluespace_flash", /atom/movable/screen/fullscreen/bluespace_sparkle, 1) - addtimer(CALLBACK(make_sparkle, /mob/.proc/clear_fullscreen, "bluespace_flash"), 2 SECONDS) + addtimer(CALLBACK(make_sparkle, TYPE_PROC_REF(/mob/, clear_fullscreen), "bluespace_flash"), 2 SECONDS) ///////////////////// @@ -344,7 +344,7 @@ T.atmos_spawn_air("o2=5;plasma=5;TEMP=1000") /obj/effect/anomaly/pyro/detonate() - INVOKE_ASYNC(src, .proc/makepyroslime) + INVOKE_ASYNC(src, PROC_REF(makepyroslime)) /obj/effect/anomaly/pyro/proc/makepyroslime() var/turf/open/T = get_turf(src) diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm index f7cb9c6723e..89eca6f8b75 100644 --- a/code/game/objects/effects/blessing.dm +++ b/code/game/objects/effects/blessing.dm @@ -16,7 +16,7 @@ I.alpha = 64 I.appearance_flags = RESET_ALPHA add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessed_aware, "blessing", I) - RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, .proc/block_cult_teleport) + RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, PROC_REF(block_cult_teleport)) /obj/effect/blessing/Destroy() UnregisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index bee0bc68dfb..7d4ce88fcb7 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -248,7 +248,7 @@ playsound(src, 'sound/items/poster_being_created.ogg', 100, TRUE) var/turf/user_drop_location = get_turf(user) //cache this so it just falls to the ground if they move. also no tk memes allowed. - if(!do_after(user, PLACE_SPEED, placed_poster, extra_checks = CALLBACK(placed_poster, /obj/structure/sign/poster.proc/snowflake_wall_turf_check, src))) + if(!do_after(user, PLACE_SPEED, placed_poster, extra_checks = CALLBACK(placed_poster, TYPE_PROC_REF(/obj/structure/sign/poster, snowflake_wall_turf_check), src))) to_chat(user, span_notice("The poster falls down!")) placed_poster.roll_and_drop(user_drop_location) return diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index cc4d8c5a650..2186add2803 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -26,7 +26,7 @@ attached_to = A var/turf/loc_turf = get_turf(A) if(!loc_turf) - RegisterSignal(attached_to, COMSIG_MOVABLE_MOVED, .proc/retry_attach, TRUE) + RegisterSignal(attached_to, COMSIG_MOVABLE_MOVED, PROC_REF(retry_attach), TRUE) else forceMove(loc_turf) diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index b5f011771ae..6fb9aa20188 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -44,7 +44,7 @@ if(T && is_station_level(T.z)) SSblackbox.record_feedback("tally", "station_mess_created", 1, name) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm index aaf7b382e3d..5084f9f75c3 100644 --- a/code/game/objects/effects/decals/cleanable/aliens.dm +++ b/code/game/objects/effects/decals/cleanable/aliens.dm @@ -29,7 +29,7 @@ /obj/effect/decal/cleanable/xenoblood/xgibs/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, .proc/on_pipe_eject) + RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, PROC_REF(on_pipe_eject)) /obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions, mapload=FALSE) SEND_SIGNAL(src, COMSIG_GIBS_STREAK, directions) @@ -46,7 +46,7 @@ return var/datum/move_loop/loop = SSmove_manager.move_to_dir(src, get_step(src, direction), delay = delay, timeout = range * delay, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/spread_movement_effects) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(spread_movement_effects)) /obj/effect/decal/cleanable/xenoblood/xgibs/proc/spread_movement_effects(datum/move_loop/has_target/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 3b86f9c2fa2..7d8a7f265df 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -114,7 +114,7 @@ /obj/effect/decal/cleanable/blood/gibs/Initialize(mapload, list/datum/disease/diseases) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, .proc/on_pipe_eject) + RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, PROC_REF(on_pipe_eject)) /obj/effect/decal/cleanable/blood/gibs/Destroy() LAZYNULL(streak_diseases) @@ -164,7 +164,7 @@ return var/datum/move_loop/loop = SSmove_manager.move_to(src, get_step(src, direction), delay = delay, timeout = range * delay, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/spread_movement_effects) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(spread_movement_effects)) /obj/effect/decal/cleanable/blood/gibs/proc/spread_movement_effects(datum/move_loop/has_target/source) SIGNAL_HANDLER @@ -359,9 +359,9 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) /obj/effect/decal/cleanable/blood/hitsplatter/proc/fly_towards(turf/target_turf, range) var/delay = 2 var/datum/move_loop/loop = SSmove_manager.move_towards(src, target_turf, delay, timeout = delay * range, priority = MOVEMENT_ABOVE_SPACE_PRIORITY, flags = MOVEMENT_LOOP_START_FAST) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/loop_done) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_done)) /obj/effect/decal/cleanable/blood/hitsplatter/proc/pre_move(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 5ade23af6cb..299e9cbbc37 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -410,13 +410,13 @@ burn_amount -= 1 var/obj/effect/hotspot/hotspot = new hotspot_type(get_turf(src)) - addtimer(CALLBACK(src, .proc/ignite_others), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(ignite_others)), 0.5 SECONDS) if(!burn_amount) qdel(src) return - RegisterSignal(hotspot, COMSIG_PARENT_QDELETING, .proc/burn_process) + RegisterSignal(hotspot, COMSIG_PARENT_QDELETING, PROC_REF(burn_process)) /** * Ignites other oil pools around itself. diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index 6cf0e2e0346..aaf15a9dc5c 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -15,7 +15,7 @@ /obj/effect/decal/cleanable/robot_debris/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, .proc/on_pipe_eject) + RegisterSignal(src, COMSIG_MOVABLE_PIPE_EJECTING, PROC_REF(on_pipe_eject)) /obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions, mapload=FALSE) var/direction = pick(directions) @@ -32,7 +32,7 @@ return var/datum/move_loop/loop = SSmove_manager.move_to_dir(src, get_step(src, direction), delay = delay, timeout = range * delay, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/spread_movement_effects) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(spread_movement_effects)) /obj/effect/decal/cleanable/robot_debris/proc/spread_movement_effects(datum/move_loop/has_target/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index 1a7a329e32f..8fb5d73807e 100644 --- a/code/game/objects/effects/effect_system/effect_system.dm +++ b/code/game/objects/effects/effect_system/effect_system.dm @@ -68,7 +68,7 @@ would spawn and follow the beaker, even if it is carried or thrown. var/step_delay = 5 var/datum/move_loop/loop = SSmove_manager.move(effect, direction, step_delay, timeout = step_delay * step_amt, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/decrement_total_effect) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(decrement_total_effect)) /datum/effect_system/proc/decrement_total_effect(datum/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm index e13010c4154..550c53c9c1a 100644 --- a/code/game/objects/effects/effect_system/effects_explosion.dm +++ b/code/game/objects/effects/effect_system/effects_explosion.dm @@ -12,7 +12,7 @@ var/step_amt = pick(25;1,50;2,100;3,200;4) var/datum/move_loop/loop = SSmove_manager.move(src, pick(GLOB.alldirs), 1, timeout = step_amt, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/end_particle) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(end_particle)) /obj/effect/particle_effect/expl_particles/proc/end_particle(datum/source) SIGNAL_HANDLER @@ -63,4 +63,4 @@ /datum/effect_system/explosion/smoke/start() ..() - addtimer(CALLBACK(src, .proc/create_smoke), 5) + addtimer(CALLBACK(src, PROC_REF(create_smoke)), 5) diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm index 7a09a422eb0..731f91e907c 100644 --- a/code/game/objects/effects/effect_system/effects_water.dm +++ b/code/game/objects/effects/effect_system/effects_water.dm @@ -39,8 +39,8 @@ /// Returns the created loop /obj/effect/particle_effect/water/extinguisher/proc/move_at(atom/target, delay, lifetime) var/datum/move_loop/loop = SSmove_manager.move_towards_legacy(src, target, delay, timeout = delay * lifetime, flags = MOVEMENT_LOOP_START_FAST, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_forcemove) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/movement_stopped) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_forcemove)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(movement_stopped)) return loop /obj/effect/particle_effect/water/extinguisher/proc/post_forcemove(datum/move_loop/source, success) @@ -64,8 +64,8 @@ // Stomach acid doesn't use legacy because it's not "targeted", and we instead want the circular sorta look /obj/effect/particle_effect/water/extinguisher/stomach_acid/move_at(atom/target, delay, lifetime) var/datum/move_loop/loop = SSmove_manager.move_towards(src, target, delay, timeout = delay * lifetime, flags = MOVEMENT_LOOP_START_FAST, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_forcemove) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/movement_stopped) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_forcemove)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(movement_stopped)) return loop ///////////////////////////////////////////// diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm index a642e2c09bf..b95926aa7be 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm @@ -17,7 +17,7 @@ var/lifetime = 10 SECONDS /// Makes the smoke react to changes on/of its turf. var/static/loc_connections = list( - COMSIG_TURF_CALCULATED_ADJACENT_ATMOS = .proc/react_to_atmos_adjacency_changes + COMSIG_TURF_CALCULATED_ADJACENT_ATMOS = PROC_REF(react_to_atmos_adjacency_changes) ) /obj/effect/particle_effect/fluid/smoke/Initialize(mapload, datum/fluid_group/group, ...) @@ -41,7 +41,7 @@ SSsmoke.stop_processing(src) if (spread_bucket) SSsmoke.cancel_spread(src) - INVOKE_ASYNC(src, .proc/fade_out) + INVOKE_ASYNC(src, PROC_REF(fade_out)) QDEL_IN(src, 1 SECONDS) /** @@ -64,7 +64,7 @@ var/time_to_transparency = round(((alpha - 160) / alpha) * frames) if(time_to_transparency >= 1) - addtimer(CALLBACK(src, /atom.proc/set_opacity, FALSE), time_to_transparency) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, set_opacity), FALSE), time_to_transparency) else set_opacity(FALSE) animate(src, time = frames, alpha = 0) @@ -196,7 +196,7 @@ /obj/effect/particle_effect/fluid/smoke/bad/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 344ab589f13..6f7fdf6ada8 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -17,9 +17,9 @@ if(arm_delay) armed = FALSE icon_state = "uglymine-inactive" - addtimer(CALLBACK(src, .proc/now_armed), arm_delay) + addtimer(CALLBACK(src, PROC_REF(now_armed)), arm_delay) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -197,7 +197,7 @@ playsound(src, 'sound/weapons/armbomb.ogg', 70, TRUE) to_chat(user, span_warning("You arm \the [src], causing it to shake! It will deploy in 3 seconds.")) active = TRUE - addtimer(CALLBACK(src, .proc/deploy_mine), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(deploy_mine)), 3 SECONDS) /// Deploys the mine and deletes itself /obj/item/minespawner/proc/deploy_mine() diff --git a/code/game/objects/effects/particle_holder.dm b/code/game/objects/effects/particle_holder.dm index ac2641c5cca..3758e808be0 100644 --- a/code/game/objects/effects/particle_holder.dm +++ b/code/game/objects/effects/particle_holder.dm @@ -18,8 +18,8 @@ stack_trace("particle holder was created with no loc!") return INITIALIZE_HINT_QDEL if(ismovable(loc)) - RegisterSignal(loc, COMSIG_MOVABLE_MOVED, .proc/on_move) - RegisterSignal(loc, COMSIG_PARENT_QDELETING, .proc/on_qdel) + RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(loc, COMSIG_PARENT_QDELETING, PROC_REF(on_qdel)) weak_attached = WEAKREF(loc) particles = new particle_path update_visual_contents(loc) diff --git a/code/game/objects/effects/phased_mob.dm b/code/game/objects/effects/phased_mob.dm index c26008f26b9..7a0317c4c77 100644 --- a/code/game/objects/effects/phased_mob.dm +++ b/code/game/objects/effects/phased_mob.dm @@ -46,7 +46,7 @@ to_chat(living_cheaterson, span_userdanger("This area has a heavy universal force occupying it, and you are scattered to the cosmos!")) if(ishuman(living_cheaterson)) shake_camera(living_cheaterson, 20, 1) - addtimer(CALLBACK(living_cheaterson, /mob/living/carbon.proc/vomit), 2 SECONDS) + addtimer(CALLBACK(living_cheaterson, TYPE_PROC_REF(/mob/living/carbon, vomit)), 2 SECONDS) jaunter.forceMove(find_safe_turf(z)) else jaunter.forceMove(eject_spot) diff --git a/code/game/objects/effects/powerup.dm b/code/game/objects/effects/powerup.dm index 3636cc53bf6..cd5091abccb 100644 --- a/code/game/objects/effects/powerup.dm +++ b/code/game/objects/effects/powerup.dm @@ -20,7 +20,7 @@ if(lifetime) QDEL_IN(src, lifetime) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/effects/spawners/xeno_egg_delivery.dm b/code/game/objects/effects/spawners/xeno_egg_delivery.dm index 395d1454e0d..2ba20bcb21b 100644 --- a/code/game/objects/effects/spawners/xeno_egg_delivery.dm +++ b/code/game/objects/effects/spawners/xeno_egg_delivery.dm @@ -15,4 +15,4 @@ 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)) diff --git a/code/game/objects/effects/spiderwebs.dm b/code/game/objects/effects/spiderwebs.dm index fb6cee00f94..b47d552ecee 100644 --- a/code/game/objects/effects/spiderwebs.dm +++ b/code/game/objects/effects/spiderwebs.dm @@ -157,7 +157,7 @@ forceMove(exit_vent) var/travel_time = round(get_dist(loc, exit_vent.loc) / 2) - addtimer(CALLBACK(src, .proc/do_vent_move, exit_vent, travel_time), travel_time) + addtimer(CALLBACK(src, PROC_REF(do_vent_move), exit_vent, travel_time), travel_time) /obj/structure/spider/spiderling/proc/do_vent_move(obj/machinery/atmospherics/components/unary/vent_pump/exit_vent, travel_time) if(QDELETED(exit_vent) || exit_vent.welded) @@ -167,7 +167,7 @@ if(prob(50)) audible_message(span_hear("You hear something scampering through the ventilation ducts.")) - addtimer(CALLBACK(src, .proc/finish_vent_move, exit_vent), travel_time) + addtimer(CALLBACK(src, PROC_REF(finish_vent_move), exit_vent), travel_time) /obj/structure/spider/spiderling/proc/finish_vent_move(obj/machinery/atmospherics/components/unary/vent_pump/exit_vent) if(QDELETED(exit_vent) || exit_vent.welded) @@ -195,7 +195,7 @@ visible_message("[src] scrambles into the ventilation ducts!", \ span_hear("You hear something scampering through the ventilation ducts.")) - addtimer(CALLBACK(src, .proc/vent_move, exit_vent), rand(20,60)) + addtimer(CALLBACK(src, PROC_REF(vent_move), exit_vent), rand(20,60)) //================= diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index fbd055ea6db..2a295c3eabd 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -10,7 +10,7 @@ /obj/effect/step_trigger/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -25,7 +25,7 @@ return if(!ismob(H) && mobs_only) return - INVOKE_ASYNC(src, .proc/Trigger, H) + INVOKE_ASYNC(src, PROC_REF(Trigger), H) /obj/effect/step_trigger/singularity_act() @@ -71,9 +71,9 @@ affecting[AM] = AM.dir var/datum/move_loop/loop = SSmove_manager.move(AM, direction, speed, tiles ? tiles * speed : INFINITY) - RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/post_move) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/set_to_normal) + RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(set_to_normal)) /obj/effect/step_trigger/thrower/proc/pre_move(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index a55f2c3ff53..93ffbb319c4 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -501,7 +501,7 @@ status = rcd_status delay = rcd_delay if (status == RCD_DECONSTRUCT) - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 1.1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_appearance)), 1.1 SECONDS) delay -= 11 icon_state = "rcd_end_reverse" else @@ -527,7 +527,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 e9ff48b214d..d5c3a1eebc9 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -291,7 +291,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e CRASH("item add_item_action got a type or instance of something that wasn't an action.") LAZYADD(actions, action) - RegisterSignal(action, COMSIG_PARENT_QDELETING, .proc/on_action_deleted) + RegisterSignal(action, COMSIG_PARENT_QDELETING, PROC_REF(on_action_deleted)) if(ismob(loc)) // We're being held or are equipped by someone while adding an action? // Then they should also probably be granted the action, given it's in a correct slot @@ -829,7 +829,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e if(HAS_TRAIT(src, TRAIT_NODROP)) return thrownby = WEAKREF(thrower) - callback = CALLBACK(src, .proc/after_throw, callback) //replace their callback with our own + callback = CALLBACK(src, PROC_REF(after_throw), callback) //replace their callback with our own . = ..(target, range, speed, thrower, spin, diagonals_first, callback, force, gentle, quickstart = quickstart) /obj/item/proc/after_throw(datum/callback/callback) @@ -999,7 +999,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e var/mob/living/L = usr if(usr.client.prefs.read_preference(/datum/preference/toggle/enable_tooltips)) var/timedelay = usr.client.prefs.read_preference(/datum/preference/numeric/tooltip_delay) / 100 - tip_timer = addtimer(CALLBACK(src, .proc/openTip, location, control, params, usr), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it. + tip_timer = addtimer(CALLBACK(src, PROC_REF(openTip), location, control, params, usr), timedelay, TIMER_STOPPABLE)//timer takes delay in deciseconds, but the pref is in milliseconds. dividing by 100 converts it. if(usr.client.prefs.read_preference(/datum/preference/toggle/item_outlines)) if(istype(L) && L.incapacitated()) apply_outline(COLOR_RED_GRAY) //if they're dead or handcuffed, let's show the outline as red to indicate that they can't interact with that right now @@ -1065,7 +1065,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e if(delay) // Create a callback with checks that would be called every tick by do_after. - var/datum/callback/tool_check = CALLBACK(src, .proc/tool_check_callback, user, amount, extra_checks) + var/datum/callback/tool_check = CALLBACK(src, PROC_REF(tool_check_callback), user, amount, extra_checks) if(ismob(target)) if(!do_mob(user, target, delay, extra_checks=tool_check)) @@ -1258,7 +1258,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e */ /obj/item/proc/on_accidental_consumption(mob/living/carbon/victim, mob/living/carbon/user, obj/item/source_item, discover_after = TRUE) if(get_sharpness() && force >= 5) //if we've got something sharp with a decent force (ie, not plastic) - INVOKE_ASYNC(victim, /mob.proc/emote, "scream") + INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") victim.visible_message(span_warning("[victim] looks like [victim.p_theyve()] just bit something they shouldn't have!"), \ span_boldwarning("OH GOD! Was that a crunch? That didn't feel good at all!!")) @@ -1400,7 +1400,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e items += list("[reskin_option]" = item_image) sort_list(items) - var/pick = show_radial_menu(M, src, items, custom_check = CALLBACK(src, .proc/check_reskin_menu, M), radius = 38, require_near = TRUE) + var/pick = show_radial_menu(M, src, items, custom_check = CALLBACK(src, PROC_REF(check_reskin_menu), M), radius = 38, require_near = TRUE) if(!pick) return if(!unique_reskin[pick]) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 3951a808e64..1929b6b38f8 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -444,7 +444,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) "SOUTH" = image(icon = 'icons/hud/radial.dmi', icon_state = "csouth"), "WEST" = image(icon = 'icons/hud/radial.dmi', icon_state = "cwest") ) - var/computerdirs = show_radial_menu(user, src, computer_dirs, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/computerdirs = show_radial_menu(user, src, computer_dirs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(computerdirs) @@ -533,11 +533,11 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) //SKYRAT EDIT END// ) - var/airlockcat = show_radial_menu(user, remote_anchor || src, solid_or_glass_choices, custom_check = CALLBACK(src, .proc/check_menu, user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) + var/airlockcat = show_radial_menu(user, remote_anchor || src, solid_or_glass_choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) switch(airlockcat) if("Solid") if(advanced_airlock_setting == 1) - var/airlockpaint = show_radial_menu(user, remote_anchor || src, solid_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) + var/airlockpaint = show_radial_menu(user, remote_anchor || src, solid_choices, radius = 42, custom_check = CALLBACK(src, PROC_REF(check_menu), user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) switch(airlockpaint) if("Standard") airlock_type = /obj/machinery/door/airlock @@ -604,7 +604,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) if("Glass") if(advanced_airlock_setting == 1) - var/airlockpaint = show_radial_menu(user, remote_anchor || src, glass_choices, radius = 42, custom_check = CALLBACK(src, .proc/check_menu, user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) + var/airlockpaint = show_radial_menu(user, remote_anchor || src, glass_choices, radius = 42, custom_check = CALLBACK(src, PROC_REF(check_menu), user, remote_anchor), require_near = remote_anchor ? FALSE : TRUE, tooltips = TRUE) switch(airlockpaint) if("Standard") airlock_type = /obj/machinery/door/airlock/glass @@ -672,7 +672,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) "Table" = image(icon = 'icons/hud/radial.dmi', icon_state = "table"), "Glass Table" = image(icon = 'icons/hud/radial.dmi', icon_state = "glass_table") ) - var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(choice) @@ -774,7 +774,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) choices += list( "Change Furnishing Type" = image(icon = 'icons/hud/radial.dmi', icon_state = "chair") ) - var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(choice) @@ -843,7 +843,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) buzz loudly!","[src] begins \ vibrating violently!") // 5 seconds to get rid of it - addtimer(CALLBACK(src, .proc/detonate_pulse_explode), 50) + addtimer(CALLBACK(src, PROC_REF(detonate_pulse_explode)), 50) /obj/item/construction/rcd/proc/detonate_pulse_explode() explosion(src, light_impact_range = 3, flame_range = 1, flash_range = 1) @@ -1186,7 +1186,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) /obj/item/construction/plumbing/equipped(mob/user, slot, initial) . = ..() if(slot & ITEM_SLOT_HANDS) - RegisterSignal(user, COMSIG_MOUSE_SCROLL_ON, .proc/mouse_wheeled) + RegisterSignal(user, COMSIG_MOUSE_SCROLL_ON, PROC_REF(mouse_wheeled)) else UnregisterSignal(user, COMSIG_MOUSE_SCROLL_ON) @@ -1210,7 +1210,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) var/image/duct_image = choices["fluid duct"] duct_image.color = current_color - 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(!choice || !check_menu(user)) return @@ -1319,7 +1319,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) ) playsound(loc, 'sound/effects/pop.ogg', 50, FALSE) - var/choice = show_radial_menu(user, src, options_menu, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/choice = show_radial_menu(user, src, options_menu, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return @@ -1341,7 +1341,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) GLOB.plumbing_layer_menu_options += list((layer_name) = image('icons/hud/radial.dmi', icon_state = "plumbing_layer[GLOB.plumbing_layers[layer_name]]")) playsound(loc, 'sound/effects/pop.ogg', 50, FALSE) - var/new_layer = show_radial_menu(user, src, GLOB.plumbing_layer_menu_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/new_layer = show_radial_menu(user, src, GLOB.plumbing_layer_menu_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!new_layer || !check_menu(user)) return @@ -1360,7 +1360,7 @@ GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) GLOB.plumbing_color_menu_options += list((color_name) = image('icons/hud/radial.dmi', icon_state = color_name)) playsound(loc, 'sound/effects/pop.ogg', 50, FALSE) - var/new_color = show_radial_menu(user, src, GLOB.plumbing_color_menu_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/new_color = show_radial_menu(user, src, GLOB.plumbing_color_menu_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!new_color || !check_menu(user)) return diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm index 76ea341aaae..9544e24c28e 100644 --- a/code/game/objects/items/RCL.dm +++ b/code/game/objects/items/RCL.dm @@ -26,7 +26,7 @@ /obj/item/rcl/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_HANDS) - AddComponent(/datum/component/two_handed, wield_callback = CALLBACK(src, .proc/on_wield), unwield_callback = CALLBACK(src, .proc/on_unwield)) + AddComponent(/datum/component/two_handed, wield_callback = CALLBACK(src, PROC_REF(on_wield)), unwield_callback = CALLBACK(src, PROC_REF(on_unwield))) /// triggered on wield of two handed item /obj/item/rcl/proc/on_wield(obj/item/source, mob/user) @@ -165,7 +165,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) @@ -250,7 +250,7 @@ /obj/item/rcl/proc/showWiringGui(mob/user) var/list/choices = wiringGuiGenerateChoices(user) - wiring_gui_menu = show_radial_menu_persistent(user, src , choices, select_proc = CALLBACK(src, .proc/wiringGuiReact, user), radius = 42) + wiring_gui_menu = show_radial_menu_persistent(user, src , choices, select_proc = CALLBACK(src, PROC_REF(wiringGuiReact), user), radius = 42) /obj/item/rcl/proc/wiringGuiUpdate(mob/user) if(!wiring_gui_menu) diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 99c65ed107e..b92bbc0a163 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -253,7 +253,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list( /obj/item/pipe_dispenser/equipped(mob/user, slot, initial) . = ..() if(slot & ITEM_SLOT_HANDS) - RegisterSignal(user, COMSIG_MOUSE_SCROLL_ON, .proc/mouse_wheeled) + RegisterSignal(user, COMSIG_MOUSE_SCROLL_ON, PROC_REF(mouse_wheeled)) else UnregisterSignal(user,COMSIG_MOUSE_SCROLL_ON) diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index 564a86257a3..9f00a8bdb1d 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -86,7 +86,7 @@ RSF var/cost = 0 //Warning, prepare for bodgecode while(islist(target))//While target is a list we continue the loop - var/picked = show_radial_menu(user, src, formRadial(target), custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE) + var/picked = show_radial_menu(user, src, formRadial(target), custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE) if(!check_menu(user) || picked == null) return for(var/emem in target)//Back through target agian diff --git a/code/game/objects/items/binoculars.dm b/code/game/objects/items/binoculars.dm index c2d37828d5e..a38a1d07740 100644 --- a/code/game/objects/items/binoculars.dm +++ b/code/game/objects/items/binoculars.dm @@ -14,15 +14,15 @@ /obj/item/binoculars/Initialize(mapload) . = ..() - AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12, wield_callback = CALLBACK(src, .proc/on_wield), unwield_callback = CALLBACK(src, .proc/on_unwield)) + AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12, wield_callback = CALLBACK(src, PROC_REF(on_wield)), unwield_callback = CALLBACK(src, PROC_REF(on_unwield))) /obj/item/binoculars/Destroy() listeningTo = null 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(span_notice("[user] holds [src] up to [user.p_their()] eyes."), span_notice("You hold [src] up to your eyes.")) inhand_icon_state = "binoculars_wielded" diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index 2eaa44d1b36..369c167698c 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -20,14 +20,14 @@ ADD_TRAIT(owner, TRAIT_XENO_HOST, ORGAN_TRAIT) ADD_TRAIT(owner, TRAIT_XENO_IMMUNE, ORGAN_TRAIT) owner.med_hud_set_status() - INVOKE_ASYNC(src, .proc/AddInfectionImages, owner) + INVOKE_ASYNC(src, PROC_REF(AddInfectionImages), owner) /obj/item/organ/internal/body_egg/Remove(mob/living/carbon/M, special = FALSE) if(owner) REMOVE_TRAIT(owner, TRAIT_XENO_HOST, ORGAN_TRAIT) REMOVE_TRAIT(owner, TRAIT_XENO_IMMUNE, ORGAN_TRAIT) owner.med_hud_set_status() - INVOKE_ASYNC(src, .proc/RemoveInfectionImages, owner) + INVOKE_ASYNC(src, PROC_REF(RemoveInfectionImages), owner) ..() /obj/item/organ/internal/body_egg/on_death(delta_time, times_fired) diff --git a/code/game/objects/items/boxcutter.dm b/code/game/objects/items/boxcutter.dm index 70b42ee8bae..aa649f2960d 100644 --- a/code/game/objects/items/boxcutter.dm +++ b/code/game/objects/items/boxcutter.dm @@ -38,7 +38,7 @@ attack_verb_simple_on = list("cut", "stab", "slash"), \ ) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/boxcutter/proc/on_transform(obj/item/source, mob/user, active) SIGNAL_HANDLER diff --git a/code/game/objects/items/broom.dm b/code/game/objects/items/broom.dm index 3ca34b281d8..eca274e41d5 100644 --- a/code/game/objects/items/broom.dm +++ b/code/game/objects/items/broom.dm @@ -20,7 +20,7 @@ /obj/item/pushbroom/Initialize(mapload) . = ..() - AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12, icon_wielded="[base_icon_state]1", wield_callback = CALLBACK(src, .proc/on_wield), unwield_callback = CALLBACK(src, .proc/on_unwield)) + AddComponent(/datum/component/two_handed, force_unwielded=8, force_wielded=12, icon_wielded="[base_icon_state]1", wield_callback = CALLBACK(src, PROC_REF(on_wield)), unwield_callback = CALLBACK(src, PROC_REF(on_unwield))) /obj/item/pushbroom/update_icon_state() icon_state = "[base_icon_state]0" @@ -35,7 +35,7 @@ */ /obj/item/pushbroom/proc/on_wield(obj/item/source, mob/user) to_chat(user, span_notice("You brace the [src] against the ground in a firm sweeping stance.")) - RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, .proc/sweep) + RegisterSignal(user, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(sweep)) /** * Handles unregistering the sweep proc when the broom is unwielded diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index d52cda06038..ac304b5f8fe 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -100,7 +100,7 @@ * * user The mob choosing a skin of the cardboard cutout */ /obj/item/cardboard_cutout/proc/change_appearance(obj/item/toy/crayon/crayon, mob/living/user) - var/new_appearance = show_radial_menu(user, src, possible_appearances, custom_check = CALLBACK(src, .proc/check_menu, user, crayon), radius = 36, require_near = TRUE) + var/new_appearance = show_radial_menu(user, src, possible_appearances, custom_check = CALLBACK(src, PROC_REF(check_menu), user, crayon), radius = 36, require_near = TRUE) if(!new_appearance) return FALSE if(!do_after(user, 1 SECONDS, src, timed_action_flags = IGNORE_HELD_ITEM)) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 13ae0a472ff..54fc0f57b1f 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -119,7 +119,7 @@ register_context() - RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, .proc/update_in_wallet) + RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_in_wallet)) if(prob(1)) ADD_TRAIT(src, TRAIT_TASTEFULLY_THICK_ID_CARD, ROUNDSTART_TRAIT) @@ -708,7 +708,7 @@ if(isliving(user)) var/mob/living/living_user = user living_user.adjust_jitter(10 SECONDS) - addtimer(CALLBACK(src, .proc/drop_card, user), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(drop_card), user), 10 SECONDS) . += span_notice("There's more information below, you can look again to take a closer look...") /obj/item/card/id/proc/drop_card(mob/user) @@ -906,8 +906,8 @@ /obj/item/card/id/advanced/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status) - RegisterSignal(src, COMSIG_ITEM_DROPPED, .proc/remove_intern_status) + RegisterSignal(src, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) + RegisterSignal(src, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) /obj/item/card/id/advanced/Destroy() UnregisterSignal(src, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) @@ -970,8 +970,8 @@ UnregisterSignal(old_loc, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) if(istype(source.loc, /obj/item/modular_computer/tablet)) - RegisterSignal(source.loc, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status) - RegisterSignal(source.loc, COMSIG_ITEM_DROPPED, .proc/remove_intern_status) + RegisterSignal(source.loc, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) + RegisterSignal(source.loc, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) /obj/item/card/id/advanced/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) . = ..() @@ -989,18 +989,18 @@ UnregisterSignal(slot_holder, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) if(istype(loc, /obj/item/storage/wallet)) - RegisterSignal(loc, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status) - RegisterSignal(loc, COMSIG_ITEM_DROPPED, .proc/remove_intern_status) + RegisterSignal(loc, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) + RegisterSignal(loc, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) if(istype(loc, /obj/item/computer_hardware/card_slot)) var/obj/item/computer_hardware/card_slot/slot = loc - RegisterSignal(loc, COMSIG_MOVABLE_MOVED, .proc/on_holding_card_slot_moved) + RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(on_holding_card_slot_moved)) if(istype(slot.holder, /obj/item/modular_computer/tablet)) var/obj/item/modular_computer/tablet/slot_holder = slot.holder - RegisterSignal(slot_holder, COMSIG_ITEM_EQUIPPED, .proc/update_intern_status) - RegisterSignal(slot_holder, COMSIG_ITEM_DROPPED, .proc/remove_intern_status) + RegisterSignal(slot_holder, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) + RegisterSignal(slot_holder, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) /obj/item/card/id/advanced/update_overlays() . = ..() @@ -1562,7 +1562,7 @@ var/fake_trim_name = "[trim.assignment] ([trim.trim_state])" trim_list[fake_trim_name] = trim_path - var/selected_trim_path = tgui_input_list(user, "Select trim to apply to your card.\nNote: This will not grant any trim accesses.", "Forge Trim", sort_list(trim_list, /proc/cmp_typepaths_asc)) + var/selected_trim_path = tgui_input_list(user, "Select trim to apply to your card.\nNote: This will not grant any trim accesses.", "Forge Trim", sort_list(trim_list, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(selected_trim_path) SSid_access.apply_trim_to_chameleon_card(src, trim_list[selected_trim_path]) diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 748a6c55593..d5a2409033d 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -58,7 +58,7 @@ to_chat(user, span_notice("Your name has been sent to your employers for approval.")) // Autoapproves after a certain time - response_timer_id = addtimer(CALLBACK(src, .proc/rename_station, new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) + response_timer_id = addtimer(CALLBACK(src, PROC_REF(rename_station), new_name, user.name, user.real_name, key_name(user)), approval_time, TIMER_STOPPABLE) to_chat(GLOB.admins, span_adminnotice("CUSTOM STATION RENAME:[ADMIN_LOOKUPFLW(user)] proposes to rename the [name_type] to [new_name] (will autoapprove in [DisplayTimeText(approval_time)]). [ADMIN_SMITE(user)] (REJECT) [ADMIN_CENTCOM_REPLY(user)]")) for(var/client/admin_client in GLOB.admins) if(admin_client.prefs.toggles & SOUND_ADMINHELP) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 5ea7fabf973..93ae6ca4fa0 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -195,7 +195,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!(slot & ITEM_SLOT_MASK)) UnregisterSignal(equipee, COMSIG_HUMAN_FORCESAY) return - RegisterSignal(equipee, COMSIG_HUMAN_FORCESAY, .proc/on_forcesay) + RegisterSignal(equipee, COMSIG_HUMAN_FORCESAY, PROC_REF(on_forcesay)) /obj/item/clothing/mask/cigarette/dropped(mob/dropee) . = ..() diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index c4a3a5bc9bd..c43e2f802e3 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -33,7 +33,7 @@ /obj/item/soap/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 80) - AddComponent(/datum/component/cleaner, cleanspeed, 0.1, pre_clean_callback=CALLBACK(src, .proc/should_clean), on_cleaned_callback=CALLBACK(src, .proc/decreaseUses)) //less scaling for soapies + AddComponent(/datum/component/cleaner, cleanspeed, 0.1, pre_clean_callback=CALLBACK(src, PROC_REF(should_clean)), on_cleaned_callback=CALLBACK(src, PROC_REF(decreaseUses))) //less scaling for soapies /obj/item/soap/examine(mob/user) . = ..() diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index c80cee27215..6af05853213 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -19,7 +19,7 @@ . = ..() init_network_id(NETWORK_DOOR_REMOTES) access_list = SSid_access.get_region_access_list(list(region_access)) - RegisterSignal(src, COMSIG_COMPONENT_NTNET_NAK, .proc/bad_signal) + RegisterSignal(src, COMSIG_COMPONENT_NTNET_NAK, PROC_REF(bad_signal)) /obj/item/door_remote/proc/bad_signal(datum/source, datum/netdata/data, error_code) SIGNAL_HANDLER diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index 847bbbc2805..366486c0966 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -106,7 +106,7 @@ add_overlay("flaps") add_overlay("hatch") add_overlay("legs_retracted") - addtimer(CALLBACK(src, .proc/startUp), 50) + addtimer(CALLBACK(src, PROC_REF(startUp)), 50) QDEL_IN(src, 8 MINUTES) //Self-destruct after 8 min ADD_TRAIT(SSeconomy, TRAIT_MARKET_CRASHING, REF(src)) @@ -202,7 +202,7 @@ if (account) // get_bank_account() may return FALSE account.transfer_money(B, amount, "?VIVA¿: !LA CRABBE¡") 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) @@ -238,7 +238,7 @@ /obj/effect/dumpeet_target/Initialize(mapload, user) . = ..() bogdanoff = user - addtimer(CALLBACK(src, .proc/startLaunch), 100) + addtimer(CALLBACK(src, PROC_REF(startLaunch)), 100) sound_to_playing_players('sound/items/dump_it.ogg', 20) deadchat_broadcast("Protocol CRAB-17 has been activated. A space-coin market has been launched at the station!", turf_target = get_turf(src), message_type=DEADCHAT_ANNOUNCEMENT) @@ -248,7 +248,7 @@ priority_announce("The spacecoin bubble has popped! Get to the credit deposit machine at [get_area(src)] and cash out before you lose all of your funds!", sender_override = "CRAB-17 Protocol") animate(DF, pixel_z = -8, time = 5, , easing = LINEAR_EASING) playsound(src, 'sound/weapons/mortar_whistle.ogg', 70, TRUE, 6) - addtimer(CALLBACK(src, .proc/endLaunch), 5, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation + addtimer(CALLBACK(src, PROC_REF(endLaunch)), 5, TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation diff --git a/code/game/objects/items/debug_items.dm b/code/game/objects/items/debug_items.dm index 10b9a40bff5..337de840f70 100644 --- a/code/game/objects/items/debug_items.dm +++ b/code/game/objects/items/debug_items.dm @@ -72,7 +72,7 @@ "Rolling Pin" = image(icon = 'icons/obj/kitchen.dmi', icon_state = "rolling_pin"), "Wire Brush" = image(icon = 'icons/obj/tools.dmi', icon_state = "wirebrush"), ) - var/tool_result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/tool_result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(tool_result) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 30683e0cae2..5c9281263c1 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -51,7 +51,7 @@ . = ..() paddles = new paddle_type(src) update_power() - RegisterSignal(paddles, COMSIG_DEFIBRILLATOR_SUCCESS, .proc/on_defib_success) + RegisterSignal(paddles, COMSIG_DEFIBRILLATOR_SUCCESS, PROC_REF(on_defib_success)) /obj/item/defibrillator/loaded/Initialize(mapload) //starts with hicap . = ..() @@ -111,7 +111,7 @@ update_power() /obj/item/defibrillator/ui_action_click() - INVOKE_ASYNC(src, .proc/toggle_paddles) + INVOKE_ASYNC(src, PROC_REF(toggle_paddles)) //ATTACK HAND IGNORING PARENT RETURN VALUE /obj/item/defibrillator/attack_hand(mob/user, list/modifiers) @@ -256,7 +256,7 @@ return FALSE /obj/item/defibrillator/proc/cooldowncheck() - addtimer(CALLBACK(src, .proc/finish_charging), cooldown_duration) + addtimer(CALLBACK(src, PROC_REF(finish_charging)), cooldown_duration) /obj/item/defibrillator/proc/finish_charging() if(cell) @@ -357,7 +357,7 @@ var/busy = FALSE var/obj/item/defibrillator/defib var/req_defib = TRUE // Whether or not the paddles require a defibrilator object - var/recharge_time = 6 SECONDS // Only applies to defibs that do not require a defibrilator. See: .proc/do_success + var/recharge_time = 6 SECONDS // Only applies to defibs that do not require a defibrilator. See: do_success() var/combat = FALSE //If it penetrates armor and gives additional functionality /obj/item/shockpaddles/Initialize(mapload) @@ -373,7 +373,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(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) . = ..() @@ -402,7 +402,7 @@ return cooldown = TRUE update_appearance() - addtimer(CALLBACK(src, .proc/finish_recharge), time) + addtimer(CALLBACK(src, PROC_REF(finish_recharge)), time) /obj/item/shockpaddles/proc/finish_recharge() var/turf/current_turf = get_turf(src) @@ -547,7 +547,7 @@ span_warning("You overcharge the paddles and begin to place them onto [H]'s chest...")) busy = TRUE update_appearance() - if(do_after(user, 1.5 SECONDS, H, extra_checks = CALLBACK(src, .proc/is_wielded))) + if(do_after(user, 1.5 SECONDS, H, extra_checks = CALLBACK(src, PROC_REF(is_wielded)))) user.visible_message(span_notice("[user] places [src] on [H]'s chest."), span_warning("You place [src] on [H]'s chest and begin to charge them.")) var/turf/T = get_turf(defib) @@ -556,7 +556,7 @@ T.audible_message(span_warning("\The [defib] lets out an urgent beep and lets out a steadily rising hum...")) else user.audible_message(span_warning("[src] let out an urgent beep.")) - if(do_after(user, 1.5 SECONDS, H, extra_checks = CALLBACK(src, .proc/is_wielded))) //Takes longer due to overcharging + if(do_after(user, 1.5 SECONDS, H, extra_checks = CALLBACK(src, PROC_REF(is_wielded)))) //Takes longer due to overcharging if(!H) do_cancel() return @@ -587,11 +587,11 @@ user.visible_message(span_warning("[user] begins to place [src] on [H]'s chest."), span_warning("You begin to place [src] on [H]'s chest...")) busy = TRUE update_appearance() - if(do_after(user, 3 SECONDS, H, extra_checks = CALLBACK(src, .proc/is_wielded))) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process + if(do_after(user, 3 SECONDS, H, extra_checks = CALLBACK(src, PROC_REF(is_wielded)))) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process user.visible_message(span_notice("[user] places [src] on [H]'s chest."), span_warning("You place [src] on [H]'s chest.")) playsound(src, 'sound/machines/defib_charge.ogg', 75, FALSE) var/obj/item/organ/internal/heart = H.getorgan(/obj/item/organ/internal/heart) - if(do_after(user, 2 SECONDS, H, extra_checks = CALLBACK(src, .proc/is_wielded))) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total + if(do_after(user, 2 SECONDS, H, extra_checks = CALLBACK(src, PROC_REF(is_wielded)))) //placed on chest and short delay to shock for dramatic effect, revive time is 5sec total if((!combat && !req_defib) || (req_defib && !defib.combat)) for(var/obj/item/clothing/C in H.get_equipped_items()) if((C.body_parts_covered & CHEST) && (C.clothing_flags & THICKMATERIAL)) //check to see if something is obscuring their chest. diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index 8b26698471b..cf59cd214ab 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -16,7 +16,7 @@ add_fingerprint(user) to_chat(user, span_notice("You pet [src]. You swear it looks up at you.")) owner = user - RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/owner_deleted) + RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(owner_deleted)) /obj/item/toy/plush/carpplushie/dehy_carp/plop(obj/item/toy/plush/Daddy) return FALSE @@ -32,7 +32,7 @@ icon = 'icons/mob/simple/carp.dmi' flick("carp_swell", src) //Wait for animation to end - addtimer(CALLBACK(src, .proc/spawn_carp), 0.6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(spawn_carp)), 0.6 SECONDS) /obj/item/toy/plush/carpplushie/dehy_carp/suicide_act(mob/living/carbon/human/user) user.visible_message(span_suicide("[user] starts eating [src]. It looks like [user.p_theyre()] trying to commit suicide!")) @@ -51,7 +51,7 @@ swelling = TRUE icon = 'icons/mob/simple/carp.dmi' flick("carp_swell", src) - addtimer(CALLBACK(src, .proc/spawn_carp), 0.6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(spawn_carp)), 0.6 SECONDS) return BRUTELOSS /obj/item/toy/plush/carpplushie/dehy_carp/proc/spawn_carp() diff --git a/code/game/objects/items/devices/anomaly_neutralizer.dm b/code/game/objects/items/devices/anomaly_neutralizer.dm index 279a6a15fe0..2a339f74645 100644 --- a/code/game/objects/items/devices/anomaly_neutralizer.dm +++ b/code/game/objects/items/devices/anomaly_neutralizer.dm @@ -18,14 +18,14 @@ AddComponent(/datum/component/effect_remover, \ success_feedback = "You neutralize %THEEFFECT with %THEWEAPON, frying its circuitry in the process.", \ tip_text = "Neutralize anomaly", \ - on_clear_callback = CALLBACK(src, .proc/on_anomaly_neutralized), \ + on_clear_callback = CALLBACK(src, PROC_REF(on_anomaly_neutralized)), \ effects_we_clear = list(/obj/effect/anomaly)) // Can also be used to delete drained heretic influences, to stop fools from losing arms. AddComponent(/datum/component/effect_remover, \ success_feedback = "You close %THEEFFECT with %THEWEAPON, frying its circuitry in the process.", \ tip_text = "Close rift", \ - on_clear_callback = CALLBACK(src, .proc/on_use), \ + on_clear_callback = CALLBACK(src, PROC_REF(on_use)), \ effects_we_clear = list(/obj/effect/visible_heretic_influence)) /** diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 7f86343d234..51bae2182ba 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -255,7 +255,7 @@ to_chat(usr, span_warning("Something's wrong with that camera! You can't get a feed.")) return current = camera - addtimer(CALLBACK(src, .proc/view_camera, usr, camera), 0.6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(view_camera), usr, camera), 0.6 SECONDS) return else usr.unset_machine() diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm index 552bbbd77f6..099bf91e7bf 100644 --- a/code/game/objects/items/devices/desynchronizer.dm +++ b/code/game/objects/items/devices/desynchronizer.dm @@ -50,7 +50,7 @@ user.forceMove(sync_holder) last_use = world.time icon_state = "desynchronizer-on" - resync_timer = addtimer(CALLBACK(src, .proc/resync), duration , TIMER_STOPPABLE) + resync_timer = addtimer(CALLBACK(src, PROC_REF(resync)), duration , TIMER_STOPPABLE) /obj/item/desynchronizer/proc/resync() new /obj/effect/temp_visual/desynchronizer(sync_holder.drop_location()) diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm index a080fa4e08a..94d1d783c9b 100644 --- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -47,7 +47,7 @@ maptext = MAPTEXT(circuits) icon_state = "[initial(icon_state)]_recharging" var/recharge_time = min(600, circuit_cost * 5) //40W of cost for one fabrication = 20 seconds of recharge time; this is to prevent spamming - addtimer(CALLBACK(src, .proc/recharge), recharge_time) + addtimer(CALLBACK(src, PROC_REF(recharge)), recharge_time) return TRUE //The actual circuit magic itself is done on a per-object basis /obj/item/electroadaptive_pseudocircuit/afterattack(atom/target, mob/living/user, proximity) diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index 87cbebce7e6..06840047f88 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -19,7 +19,7 @@ /obj/item/geiger_counter/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(src, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) /obj/item/geiger_counter/examine(mob/user) . = ..() @@ -77,23 +77,23 @@ return user.visible_message(span_notice("[user] scans [target] with [src]."), span_notice("You scan [target]'s radiation levels with [src]...")) - addtimer(CALLBACK(src, .proc/scan, target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents + addtimer(CALLBACK(src, PROC_REF(scan), target, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents /obj/item/geiger_counter/equipped(mob/user, slot, initial) . = ..() - RegisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) /obj/item/geiger_counter/dropped(mob/user, silent = FALSE) . = ..() - UnregisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + UnregisterSignal(user, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) /obj/item/geiger_counter/proc/on_pre_potential_irradiation(datum/source, datum/radiation_pulse_information/pulse_information, insulation_to_target) SIGNAL_HANDLER last_perceived_radiation_danger = get_perceived_radiation_danger(pulse_information, insulation_to_target) - addtimer(CALLBACK(src, .proc/reset_perceived_danger), TIME_WITHOUT_RADIATION_BEFORE_RESET, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(reset_perceived_danger)), TIME_WITHOUT_RADIATION_BEFORE_RESET, TIMER_UNIQUE | TIMER_OVERRIDE) if (scanning) update_appearance(UPDATE_ICON) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index aa33e49ec71..6508538b758 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -26,7 +26,7 @@ /obj/item/megaphone/equipped(mob/M, slot) . = ..() if ((slot & ITEM_SLOT_HANDS) && !HAS_TRAIT(M, TRAIT_SIGN_LANG)) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) else UnregisterSignal(M, COMSIG_MOB_SAY) diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm index 34895911f35..b23e4a32526 100644 --- a/code/game/objects/items/devices/pressureplates.dm +++ b/code/game/objects/items/devices/pressureplates.dm @@ -35,9 +35,9 @@ if(undertile_pressureplate) AddElement(/datum/element/undertile, tile_overlay = tile_overlay, use_anchor = TRUE) - RegisterSignal(src, COMSIG_OBJ_HIDE, .proc/ToggleActive) + RegisterSignal(src, COMSIG_OBJ_HIDE, PROC_REF(ToggleActive)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -53,7 +53,7 @@ else if(!trigger_item) return can_trigger = FALSE - addtimer(CALLBACK(src, .proc/trigger), trigger_delay) + addtimer(CALLBACK(src, PROC_REF(trigger)), trigger_delay) /obj/item/pressure_plate/proc/trigger() can_trigger = TRUE diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index fe522c3da5b..dc39e7dbecd 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -24,7 +24,7 @@ var/area/current_area = get_area(src) if(!current_area) return - RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, .proc/AreaPowerCheck) + RegisterSignal(current_area, COMSIG_AREA_POWER_CHANGE, PROC_REF(AreaPowerCheck)) GLOB.intercoms_list += src /obj/item/radio/intercom/Destroy() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 501a94fb601..b5bfb86f38d 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -229,7 +229,7 @@ spans = list(talking_movable.speech_span) if(!language) language = talking_movable.get_selected_language() - INVOKE_ASYNC(src, .proc/talk_into_impl, talking_movable, message, channel, spans.Copy(), language, message_mods) + INVOKE_ASYNC(src, PROC_REF(talk_into_impl), talking_movable, message, channel, spans.Copy(), language, message_mods) return ITALICS | REDUCE_RANGE /obj/item/radio/proc/talk_into_impl(atom/movable/talking_movable, message, channel, list/spans, datum/language/language, list/message_mods) @@ -297,7 +297,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) @@ -457,7 +457,7 @@ for (var/ch_name in channels) channels[ch_name] = 0 set_on(FALSE) - addtimer(CALLBACK(src, .proc/end_emp_effect, curremp), 200) + addtimer(CALLBACK(src, PROC_REF(end_emp_effect), curremp), 200) /obj/item/radio/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] starts bouncing [src] off [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm index 9ee1ca98d0d..4b0a3b092cb 100644 --- a/code/game/objects/items/devices/reverse_bear_trap.dm +++ b/code/game/objects/items/devices/reverse_bear_trap.dm @@ -51,7 +51,7 @@ soundloop.stop() soundloop2.stop() to_chat(loc, span_userdanger("*ding*")) - addtimer(CALLBACK(src, .proc/snap), 0.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(snap)), 0.2 SECONDS) COOLDOWN_RESET(src, kill_countdown) // reset the countdown in case it wasn't finished /obj/item/reverse_bear_trap/attack_hand(mob/user, list/modifiers) diff --git a/code/game/objects/items/devices/scanners/gas_analyzer.dm b/code/game/objects/items/devices/scanners/gas_analyzer.dm index 72cdd88cd5e..4cf3730bcda 100644 --- a/code/game/objects/items/devices/scanners/gas_analyzer.dm +++ b/code/game/objects/items/devices/scanners/gas_analyzer.dm @@ -24,7 +24,7 @@ /obj/item/analyzer/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TOOL_ATOM_ACTED_PRIMARY(tool_behaviour), .proc/on_analyze) + RegisterSignal(src, COMSIG_TOOL_ATOM_ACTED_PRIMARY(tool_behaviour), PROC_REF(on_analyze)) /obj/item/analyzer/examine(mob/user) . = ..() diff --git a/code/game/objects/items/devices/scanners/sequence_scanner.dm b/code/game/objects/items/devices/scanners/sequence_scanner.dm index a7c0aa3c199..1824ddcb086 100644 --- a/code/game/objects/items/devices/scanners/sequence_scanner.dm +++ b/code/game/objects/items/devices/scanners/sequence_scanner.dm @@ -100,7 +100,7 @@ ready = FALSE icon_state = "[icon_state]_recharging" - addtimer(CALLBACK(src, .proc/recharge), cooldown, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(recharge)), cooldown, TIMER_UNIQUE) /obj/item/sequence_scanner/proc/recharge() icon_state = initial(icon_state) diff --git a/code/game/objects/items/devices/spyglasses.dm b/code/game/objects/items/devices/spyglasses.dm index 83f7bef775d..fc0fcd841af 100644 --- a/code/game/objects/items/devices/spyglasses.dm +++ b/code/game/objects/items/devices/spyglasses.dm @@ -14,7 +14,7 @@ return cool_guy.setup_popup("spypopup", 3, 3, 2, "S.P.Y") linked_bug.cam_screen.display_to(user) - RegisterSignal(cool_guy, COMSIG_POPUP_CLEARED, .proc/on_screen_clear) + RegisterSignal(cool_guy, COMSIG_POPUP_CLEARED, PROC_REF(on_screen_clear)) linked_bug.update_view() @@ -60,7 +60,7 @@ /obj/item/clothing/accessory/spy_bug/Initialize(mapload) . = ..() - tracker = new /datum/movement_detector(src, CALLBACK(src, .proc/update_view)) + tracker = new /datum/movement_detector(src, CALLBACK(src, PROC_REF(update_view))) cam_screen = new cam_screen.generate_view("spypopup_map") diff --git a/code/game/objects/items/devices/swapper.dm b/code/game/objects/items/devices/swapper.dm index 556d88ea47a..a25877705f6 100644 --- a/code/game/objects/items/devices/swapper.dm +++ b/code/game/objects/items/devices/swapper.dm @@ -61,7 +61,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 50c32732a24..d00abaa6319 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -98,7 +98,7 @@ effective or pretty fucking useless. addtimer(VARSET_CALLBACK(src, used, FALSE), cooldown) addtimer(VARSET_CALLBACK(src, icon_state, "health"), cooldown) to_chat(user, span_warning("Successfully irradiated [M].")) - addtimer(CALLBACK(src, .proc/radiation_aftereffect, M, intensity), (wavelength+(intensity*4))*5) + addtimer(CALLBACK(src, PROC_REF(radiation_aftereffect), M, intensity), (wavelength+(intensity*4))*5) return to_chat(user, span_warning("The radioactive microlaser is still recharging.")) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 8d5477aafb9..a6377074cdb 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -99,7 +99,7 @@ if(toggle) toggle = FALSE toggle_valve() - addtimer(CALLBACK(src, .proc/toggle_off), 5) //To stop a signal being spammed from a proxy sensor constantly going off or whatever + addtimer(CALLBACK(src, PROC_REF(toggle_off)), 5) //To stop a signal being spammed from a proxy sensor constantly going off or whatever /obj/item/transfer_valve/proc/toggle_off() toggle = TRUE @@ -212,7 +212,7 @@ stack_trace("TTV gas merging failed.") for(var/i in 1 to 6) - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 20 + (i - 1) * 10) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_appearance)), 20 + (i - 1) * 10) else if(valve_open && tank_one && tank_two) split_gases() diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index d291b58abcd..37ac96a5af8 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -308,7 +308,7 @@ var/turf/selected_turf = get_turf(src) selected_turf.visible_message(span_userdanger("[src] flares briefly.")) - addtimer(CALLBACK(src, .proc/effect, user, .), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS) COOLDOWN_START(src, roll_cd, 2.5 SECONDS) /obj/item/dice/d20/fate/equipped(mob/user, slot) diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index cb505e0c593..799adaa90d9 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -44,8 +44,8 @@ force_wielded = two_hand_force, \ wieldsound = 'sound/weapons/saberon.ogg', \ unwieldsound = 'sound/weapons/saberoff.ogg', \ - wield_callback = CALLBACK(src, .proc/on_wield), \ - unwield_callback = CALLBACK(src, .proc/on_unwield), \ + wield_callback = CALLBACK(src, PROC_REF(on_wield)), \ + unwield_callback = CALLBACK(src, PROC_REF(on_unwield)), \ ) /// Triggered on wield of two handed item @@ -134,10 +134,10 @@ impale(user) return if(prob(50)) - INVOKE_ASYNC(src, .proc/jedi_spin, user) + INVOKE_ASYNC(src, PROC_REF(jedi_spin), user) /obj/item/dualsaber/proc/jedi_spin(mob/living/user) - dance_rotate(user, CALLBACK(user, /mob.proc/dance_flip)) + dance_rotate(user, CALLBACK(user, TYPE_PROC_REF(/mob, dance_flip))) /obj/item/dualsaber/proc/impale(mob/living/user) to_chat(user, span_warning("You twirl around a bit before losing your balance and impaling yourself on [src].")) @@ -176,7 +176,7 @@ playsound(loc, hitsound, get_clamped_volume(), TRUE, -1) add_fingerprint(user) // Light your candles while spinning around the room - INVOKE_ASYNC(src, .proc/jedi_spin, user) + INVOKE_ASYNC(src, PROC_REF(jedi_spin), user) /obj/item/dualsaber/green possible_colors = list("green") diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index f0adca708cd..40e57613fb1 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -64,7 +64,7 @@ say(answer) on_cooldown = TRUE - addtimer(CALLBACK(src, .proc/clear_cooldown), cooldown_time) + addtimer(CALLBACK(src, PROC_REF(clear_cooldown)), cooldown_time) shaking = FALSE diff --git a/code/game/objects/items/emags.dm b/code/game/objects/items/emags.dm index 5cdaca0f9e9..6a1a5659529 100644 --- a/code/game/objects/items/emags.dm +++ b/code/game/objects/items/emags.dm @@ -106,7 +106,7 @@ /obj/item/card/emag/doorjack/proc/use_charge(mob/user) charges -- to_chat(user, span_notice("You use [src]. It now has [charges] charge[charges == 1 ? "" : "s"] remaining.")) - charge_timers.Add(addtimer(CALLBACK(src, .proc/recharge), charge_time, TIMER_STOPPABLE)) + charge_timers.Add(addtimer(CALLBACK(src, PROC_REF(recharge)), charge_time, TIMER_STOPPABLE)) /obj/item/card/emag/doorjack/proc/recharge(mob/user) charges = min(charges+1, max_charges) diff --git a/code/game/objects/items/etherealdiscoball.dm b/code/game/objects/items/etherealdiscoball.dm index 1c38c16db40..4f1f0b0277f 100644 --- a/code/game/objects/items/etherealdiscoball.dm +++ b/code/game/objects/items/etherealdiscoball.dm @@ -59,7 +59,7 @@ set_light(range, power, current_color) add_atom_colour("#[current_color]", FIXED_COLOUR_PRIORITY) update_appearance() - TimerID = addtimer(CALLBACK(src, .proc/DiscoFever), 5, TIMER_STOPPABLE) //Call ourselves every 0.5 seconds to change colors + TimerID = addtimer(CALLBACK(src, PROC_REF(DiscoFever)), 5, TIMER_STOPPABLE) //Call ourselves every 0.5 seconds to change colors /obj/structure/etherealball/update_icon_state() icon_state = "ethdisco_head_[TurnedOn]" diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 0f26d2753e7..bf9740c4c9d 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -223,7 +223,7 @@ var/datum/move_loop/loop = SSmove_manager.move(buckled_object, movementdirection, 1, timeout = 9, flags = MOVEMENT_LOOP_START_FAST, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) //This means the chair slowing down is dependant on the extinguisher existing, which is weird //Couldn't figure out a better way though - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/manage_chair_speed) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(manage_chair_speed)) /obj/item/extinguisher/proc/manage_chair_speed(datum/move_loop/move/source) SIGNAL_HANDLER diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 76949dd239d..d8862ef74b7 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -243,7 +243,7 @@ if(create_with_tank) ptank = new /obj/item/tank/internals/plasma/full(src) update_appearance() - RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_refill) + RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_refill)) /obj/item/flamethrower/full create_full = TRUE diff --git a/code/game/objects/items/food/bread.dm b/code/game/objects/items/food/bread.dm index 45ada3380a1..901ddda3e4a 100644 --- a/code/game/objects/items/food/bread.dm +++ b/code/game/objects/items/food/bread.dm @@ -298,8 +298,8 @@ hitsound = 'sound/weapons/rapierhit.ogg' fake_swordplay = TRUE - RegisterSignal(src, COMSIG_ITEM_EQUIPPED, .proc/on_sword_equipped) - RegisterSignal(src, COMSIG_ITEM_DROPPED, .proc/on_sword_dropped) + RegisterSignal(src, COMSIG_ITEM_EQUIPPED, PROC_REF(on_sword_equipped)) + RegisterSignal(src, COMSIG_ITEM_DROPPED, PROC_REF(on_sword_dropped)) /obj/item/food/baguette/proc/end_swordplay(mob/user) UnregisterSignal(src, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) diff --git a/code/game/objects/items/food/cheese.dm b/code/game/objects/items/food/cheese.dm index 3084f4e9c25..9557656d22e 100644 --- a/code/game/objects/items/food/cheese.dm +++ b/code/game/objects/items/food/cheese.dm @@ -13,7 +13,7 @@ /obj/item/food/cheese/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_RAT_INTERACT, .proc/on_rat_eat) + RegisterSignal(src, COMSIG_RAT_INTERACT, PROC_REF(on_rat_eat)) /obj/item/food/cheese/proc/on_rat_eat(datum/source, mob/living/simple_animal/hostile/regalrat/king) SIGNAL_HANDLER diff --git a/code/game/objects/items/food/deepfried.dm b/code/game/objects/items/food/deepfried.dm index 52d75d4878f..491a77ac94a 100644 --- a/code/game/objects/items/food/deepfried.dm +++ b/code/game/objects/items/food/deepfried.dm @@ -7,7 +7,7 @@ /obj/item/food/deepfryholder/MakeEdible() . = ..() - AddComponent(/datum/component/edible, on_consume = CALLBACK(src, .proc/On_Consume)) + AddComponent(/datum/component/edible, on_consume = CALLBACK(src, PROC_REF(On_Consume))) /obj/item/food/deepfryholder/Initialize(mapload, obj/item/fried) if(!fried) diff --git a/code/game/objects/items/food/donuts.dm b/code/game/objects/items/food/donuts.dm index 1e90edd3fd3..b18a39cf6a5 100644 --- a/code/game/objects/items/food/donuts.dm +++ b/code/game/objects/items/food/donuts.dm @@ -25,7 +25,7 @@ ///Override for checkliked callback /obj/item/food/donut/MakeEdible() . = ..() - AddComponent(/datum/component/edible, check_liked = CALLBACK(src, .proc/check_liked)) + AddComponent(/datum/component/edible, check_liked = CALLBACK(src, PROC_REF(check_liked))) /obj/item/food/donut/proc/decorate_donut() if(is_decorated || !decorated_icon) diff --git a/code/game/objects/items/food/frozen.dm b/code/game/objects/items/food/frozen.dm index f74e7a16d01..dbbe39f4924 100644 --- a/code/game/objects/items/food/frozen.dm +++ b/code/game/objects/items/food/frozen.dm @@ -240,7 +240,7 @@ /obj/item/food/popsicle/MakeEdible() . = ..() - AddComponent(/datum/component/edible, after_eat = CALLBACK(src, .proc/after_bite)) + AddComponent(/datum/component/edible, after_eat = CALLBACK(src, PROC_REF(after_bite))) /obj/item/food/popsicle/update_overlays() . = ..() diff --git a/code/game/objects/items/food/meatslab.dm b/code/game/objects/items/food/meatslab.dm index 1b4fcdcbdc2..dc8646286ab 100644 --- a/code/game/objects/items/food/meatslab.dm +++ b/code/game/objects/items/food/meatslab.dm @@ -391,7 +391,7 @@ /obj/item/food/meat/steak/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, .proc/on_microwave_cooked) + RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, PROC_REF(on_microwave_cooked)) /obj/item/food/meat/steak/proc/on_microwave_cooked(datum/source, atom/source_item, cooking_efficiency = 1) SIGNAL_HANDLER @@ -604,7 +604,7 @@ /obj/item/food/meat/cutlet/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, .proc/on_microwave_cooked) + RegisterSignal(src, COMSIG_ITEM_MICROWAVE_COOKED, PROC_REF(on_microwave_cooked)) ///This proc handles setting up the correct meat name for the cutlet, this should definitely be changed with the food rework. /obj/item/food/meat/cutlet/proc/on_microwave_cooked(datum/source, atom/source_item, cooking_efficiency) diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index f2b0cfcef65..689ff3e48bb 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -169,7 +169,7 @@ /obj/item/food/badrecipe/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_GRILL_PROCESS, .proc/OnGrill) + RegisterSignal(src, COMSIG_ITEM_GRILL_PROCESS, PROC_REF(OnGrill)) /obj/item/food/badrecipe/moldy name = "moldy mess" @@ -468,7 +468,7 @@ /obj/item/food/bubblegum/bubblegum/MakeEdible() . = ..() - AddComponent(/datum/component/edible, on_consume = CALLBACK(src, .proc/OnConsume)) + AddComponent(/datum/component/edible, on_consume = CALLBACK(src, PROC_REF(OnConsume))) /obj/item/food/bubblegum/bubblegum/proc/OnConsume(mob/living/eater, mob/living/feeder) if(iscarbon(eater)) @@ -680,7 +680,7 @@ ///Override for checkliked callback /obj/item/food/rationpack/MakeEdible() . = ..() - AddComponent(/datum/component/edible, check_liked = CALLBACK(src, .proc/check_liked)) + AddComponent(/datum/component/edible, check_liked = CALLBACK(src, PROC_REF(check_liked))) /obj/item/food/rationpack/proc/check_liked(fraction, mob/mob) //Nobody likes rationpacks. Nobody. return FOOD_DISLIKED diff --git a/code/game/objects/items/food/monkeycube.dm b/code/game/objects/items/food/monkeycube.dm index adec90f9203..8d533fec50d 100644 --- a/code/game/objects/items/food/monkeycube.dm +++ b/code/game/objects/items/food/monkeycube.dm @@ -37,7 +37,7 @@ return SHAME playsound(user, 'sound/items/eatfood.ogg', rand(10, 50), TRUE) user.temporarilyRemoveItemFromInventory(src) //removes from hands, keeps in M - addtimer(CALLBACK(src, .proc/finish_suicide, user), 15) //you've eaten it, you can run now + addtimer(CALLBACK(src, PROC_REF(finish_suicide), user), 15) //you've eaten it, you can run now return MANUAL_SUICIDE /obj/item/food/monkeycube/proc/finish_suicide(mob/living/user) ///internal proc called by a monkeycube's suicide_act using a timer and callback. takes as argument the mob/living who activated the suicide diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm index 1a8c0c385fc..7a8fc02ad45 100644 --- a/code/game/objects/items/food/snacks.dm +++ b/code/game/objects/items/food/snacks.dm @@ -31,7 +31,7 @@ /obj/item/food/candy/bronx/MakeEdible() . = ..() - AddComponent(/datum/component/edible, after_eat = CALLBACK(src, .proc/after_eat)) + AddComponent(/datum/component/edible, after_eat = CALLBACK(src, PROC_REF(after_eat))) /obj/item/food/candy/bronx/proc/after_eat(mob/living/eater) if(ishuman(eater)) diff --git a/code/game/objects/items/granters/magic/_spell_granter.dm b/code/game/objects/items/granters/magic/_spell_granter.dm index 4f695e4d3af..e7d8f4f8b0f 100644 --- a/code/game/objects/items/granters/magic/_spell_granter.dm +++ b/code/game/objects/items/granters/magic/_spell_granter.dm @@ -2,7 +2,7 @@ /obj/item/book/granter/action/spell/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, .proc/on_magic_charge) + RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, PROC_REF(on_magic_charge)) /** * Signal proc for [COMSIG_ITEM_MAGICALLY_CHARGED] diff --git a/code/game/objects/items/grenades/_grenade.dm b/code/game/objects/items/grenades/_grenade.dm index 3e10b6eceaf..7f73f5b82e1 100644 --- a/code/game/objects/items/grenades/_grenade.dm +++ b/code/game/objects/items/grenades/_grenade.dm @@ -133,7 +133,7 @@ active = TRUE icon_state = initial(icon_state) + "_active" SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride) - addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride) + addtimer(CALLBACK(src, PROC_REF(detonate)), isnull(delayoverride)? det_time : delayoverride) /** * detonate (formerly prime) refers to when the grenade actually delivers its payload (whether or not a boom/bang/detonation is involved) diff --git a/code/game/objects/items/grenades/antigravity.dm b/code/game/objects/items/grenades/antigravity.dm index 11100390c80..9b83d4f6028 100644 --- a/code/game/objects/items/grenades/antigravity.dm +++ b/code/game/objects/items/grenades/antigravity.dm @@ -16,6 +16,6 @@ for(var/turf/lanced_turf in view(range, src)) lanced_turf.AddElement(/datum/element/forced_gravity, forced_value) - addtimer(CALLBACK(lanced_turf, /datum/.proc/_RemoveElement, list(/datum/element/forced_gravity, forced_value)), duration) + addtimer(CALLBACK(lanced_turf, TYPE_PROC_REF(/datum/, _RemoveElement), list(/datum/element/forced_gravity, forced_value)), duration) qdel(src) diff --git a/code/game/objects/items/grenades/atmos_grenades.dm b/code/game/objects/items/grenades/atmos_grenades.dm index 42e60b72f96..4a22de46778 100644 --- a/code/game/objects/items/grenades/atmos_grenades.dm +++ b/code/game/objects/items/grenades/atmos_grenades.dm @@ -21,7 +21,7 @@ SEND_SIGNAL(src, COMSIG_GRENADE_ARMED, det_time, delayoverride) if(user) SEND_SIGNAL(src, COMSIG_MOB_GRENADE_ARMED, user, src, det_time, delayoverride) - addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride) + addtimer(CALLBACK(src, PROC_REF(detonate)), isnull(delayoverride)? det_time : delayoverride) /obj/item/grenade/gas_crystal/healium_crystal name = "Healium crystal" diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index a24bd1d8bd4..c2738bb5b05 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -227,7 +227,7 @@ if(landminemode) landminemode.activate() return - addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride) + addtimer(CALLBACK(src, PROC_REF(detonate)), isnull(delayoverride)? det_time : delayoverride) /obj/item/grenade/chem_grenade/detonate(mob/living/lanced_by) if(stage != GRENADE_READY) @@ -382,7 +382,7 @@ chem_splash(get_turf(src), reagents, affected_area, list(reactants), ignition_temp, threatscale) var/turf/detonated_turf = get_turf(src) - addtimer(CALLBACK(src, .proc/detonate), det_time) + addtimer(CALLBACK(src, PROC_REF(detonate)), det_time) log_game("A grenade detonated at [AREACOORD(detonated_turf)]") diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm index 18e4ce2d6b3..73692eb41f1 100644 --- a/code/game/objects/items/grenades/clusterbuster.dm +++ b/code/game/objects/items/grenades/clusterbuster.dm @@ -66,7 +66,7 @@ var/steps = rand(1, 4) for(var/step in 1 to steps) step_away(src, loc) - addtimer(CALLBACK(src, .proc/detonate), rand(RANDOM_DETONATE_MIN_TIME, RANDOM_DETONATE_MAX_TIME)) + addtimer(CALLBACK(src, PROC_REF(detonate)), rand(RANDOM_DETONATE_MIN_TIME, RANDOM_DETONATE_MAX_TIME)) /obj/item/grenade/clusterbuster/segment/detonate(mob/living/lanced_by) new payload_spawner(drop_location(), payload, rand(min_spawned, max_spawned)) diff --git a/code/game/objects/items/grenades/festive.dm b/code/game/objects/items/grenades/festive.dm index ceed70ecb04..99c39759bbb 100644 --- a/code/game/objects/items/grenades/festive.dm +++ b/code/game/objects/items/grenades/festive.dm @@ -107,7 +107,7 @@ playsound(src, 'sound/effects/fuse.ogg', volume, TRUE) active = TRUE icon_state = initial(icon_state) + "_active" - addtimer(CALLBACK(src, .proc/detonate), isnull(delayoverride)? det_time : delayoverride) + addtimer(CALLBACK(src, PROC_REF(detonate)), isnull(delayoverride)? det_time : delayoverride) /obj/item/grenade/firecracker/detonate(mob/living/lanced_by) . = ..() diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index 69604c85f32..f7509ec6012 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -119,7 +119,7 @@ target.add_overlay(plastic_overlay) to_chat(user, span_notice("You plant the bomb. Timer counting down from [det_time].")) - addtimer(CALLBACK(src, .proc/detonate), det_time*10) + addtimer(CALLBACK(src, PROC_REF(detonate)), det_time*10) /obj/item/grenade/c4/proc/shout_syndicate_crap(mob/player) if(!player) diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index fe997b72eb4..83981592dc6 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -20,7 +20,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 @@ -39,7 +39,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) @@ -48,10 +48,10 @@ if(owner == sucker) // big mood to_chat(owner, span_danger("Wait a second... you just looked at your own [src.name]!")) - addtimer(CALLBACK(src, .proc/selfGottem, owner), 10) + addtimer(CALLBACK(src, PROC_REF(selfGottem), owner), 10) else to_chat(sucker, span_danger("Wait a second... was that a-")) - addtimer(CALLBACK(src, .proc/GOTTEM, owner, sucker), 6) + addtimer(CALLBACK(src, PROC_REF(GOTTEM), owner, sucker), 6) /// Stage 3A: We face our own failures /obj/item/hand_item/circlegame/proc/selfGottem(mob/living/owner) @@ -506,7 +506,7 @@ if(2) other_msg = "stammers softly for a moment before choking on something!" self_msg = "You feel your tongue disappear down your throat as you fight to remember how to make words!" - addtimer(CALLBACK(living_target, /atom/movable.proc/say, pick("Uhhh...", "O-oh, uhm...", "I- uhhhhh??", "You too!!", "What?")), rand(0.5 SECONDS, 1.5 SECONDS)) + addtimer(CALLBACK(living_target, TYPE_PROC_REF(/atom/movable, say), pick("Uhhh...", "O-oh, uhm...", "I- uhhhhh??", "You too!!", "What?")), rand(0.5 SECONDS, 1.5 SECONDS)) living_target.adjust_stutter(rand(10 SECONDS, 30 SECONDS)) 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 438603f8817..4be56bdd1cf 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -382,7 +382,7 @@ . = ..() update_appearance() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/spring_trap, + COMSIG_ATOM_ENTERED = PROC_REF(spring_trap), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -435,7 +435,7 @@ if(C.body_position == STANDING_UP) def_zone = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) if(!C.legcuffed && C.num_legs >= 2) //beartrap can't cuff your leg if there's already a beartrap or legcuffs, or you don't have two legs. - INVOKE_ASYNC(C, /mob/living/carbon.proc/equip_to_slot, src, ITEM_SLOT_LEGCUFFED) + INVOKE_ASYNC(C, TYPE_PROC_REF(/mob/living/carbon, equip_to_slot), src, ITEM_SLOT_LEGCUFFED) SSblackbox.record_feedback("tally", "handcuffs", 1, type) else if(snap && isanimal(L)) var/mob/living/simple_animal/SA = L @@ -469,7 +469,7 @@ /obj/item/restraints/legcuffs/beartrap/energy/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/dissipate), 100) + addtimer(CALLBACK(src, PROC_REF(dissipate)), 100) /** * Handles energy snares disappearing diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 5e100611c0e..cd1043c5e41 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -32,7 +32,7 @@ . = ..() START_PROCESSING(SSprocessing, src) SSpoints_of_interest.make_point_of_interest(src) - RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, .proc/move_gracefully) + RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, PROC_REF(move_gracefully)) update_appearance() /obj/item/his_grace/Destroy() @@ -57,7 +57,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 18147539b69..695bdd7f279 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -27,7 +27,7 @@ success_feedback = "You disrupt the magic of %THEEFFECT with %THEWEAPON.", \ success_forcesay = "BEGONE FOUL MAGIKS!!", \ tip_text = "Clear rune", \ - on_clear_callback = CALLBACK(src, .proc/on_cult_rune_removed), \ + on_clear_callback = CALLBACK(src, PROC_REF(on_cult_rune_removed)), \ effects_we_clear = list(/obj/effect/rune, /obj/effect/heretic_rune)) AddElement(/datum/element/bane, /mob/living/simple_animal/revenant, 0, 25, FALSE) @@ -37,7 +37,7 @@ if(!initial(nullrod_type.chaplain_spawnable)) continue rods[nullrod_type] = initial(nullrod_type.menu_description) - AddComponent(/datum/component/subtype_picker, rods, CALLBACK(src, .proc/on_holy_weapon_picked)) + AddComponent(/datum/component/subtype_picker, rods, CALLBACK(src, PROC_REF(on_holy_weapon_picked))) /obj/item/nullrod/proc/on_holy_weapon_picked(obj/item/nullrod/holy_weapon_type) GLOB.holy_weapon_type = holy_weapon_type diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm index 4a58ba2a3e9..86058a823be 100644 --- a/code/game/objects/items/hot_potato.dm +++ b/code/game/objects/items/hot_potato.dm @@ -142,7 +142,7 @@ ADD_TRAIT(src, TRAIT_NODROP, HOT_POTATO_TRAIT) name = "primed [name]" activation_time = timer + world.time - detonation_timerid = addtimer(CALLBACK(src, .proc/detonate), delay, TIMER_STOPPABLE) + detonation_timerid = addtimer(CALLBACK(src, PROC_REF(detonate)), delay, TIMER_STOPPABLE) START_PROCESSING(SSfastprocess, src) if(user) log_bomber(user, "has primed a", src, "for detonation (Timer:[delay],Explosive:[detonate_explosion],Range:[detonate_dev_range]/[detonate_heavy_range]/[detonate_light_range]/[detonate_fire_range])") diff --git a/code/game/objects/items/hourglass.dm b/code/game/objects/items/hourglass.dm index 8ea8198b580..fe13c3d6ac9 100644 --- a/code/game/objects/items/hourglass.dm +++ b/code/game/objects/items/hourglass.dm @@ -35,7 +35,7 @@ /obj/item/hourglass/proc/start() finish_time = world.time + time - timing_id = addtimer(CALLBACK(src, .proc/finish), time, TIMER_STOPPABLE) + timing_id = addtimer(CALLBACK(src, PROC_REF(finish)), time, TIMER_STOPPABLE) countdown.start() timing_animation() diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm index 8075b72c38b..a8df6115a3e 100644 --- a/code/game/objects/items/implants/implant.dm +++ b/code/game/objects/items/implants/implant.dm @@ -24,7 +24,7 @@ SEND_SIGNAL(src, COMSIG_IMPLANT_ACTIVATED) /obj/item/implant/ui_action_click() - INVOKE_ASYNC(src, .proc/activate, "action_button") + INVOKE_ASYNC(src, PROC_REF(activate), "action_button") /obj/item/implant/item_action_slot_check(slot, mob/user) return user == imp_in diff --git a/code/game/objects/items/implants/implant_chem.dm b/code/game/objects/items/implants/implant_chem.dm index 2171ad12ef0..1883028f6c1 100644 --- a/code/game/objects/items/implants/implant_chem.dm +++ b/code/game/objects/items/implants/implant_chem.dm @@ -32,7 +32,7 @@ /obj/item/implant/chem/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE) . = ..() if(.) - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /obj/item/implant/chem/removed(mob/target, silent = FALSE, special = FALSE) . = ..() diff --git a/code/game/objects/items/implants/implant_clown.dm b/code/game/objects/items/implants/implant_clown.dm index a94f3e75098..cc5b52781b0 100644 --- a/code/game/objects/items/implants/implant_clown.dm +++ b/code/game/objects/items/implants/implant_clown.dm @@ -13,7 +13,7 @@ /obj/item/implant/sad_trombone/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE) . = ..() if(.) - RegisterSignal(target, COMSIG_MOB_EMOTED("deathgasp"), .proc/on_deathgasp) + RegisterSignal(target, COMSIG_MOB_EMOTED("deathgasp"), PROC_REF(on_deathgasp)) /obj/item/implant/sad_trombone/removed(mob/target, silent = FALSE, special = FALSE) . = ..() diff --git a/code/game/objects/items/implants/implant_deathrattle.dm b/code/game/objects/items/implants/implant_deathrattle.dm index f22c6d0b973..90e75cf66a1 100644 --- a/code/game/objects/items/implants/implant_deathrattle.dm +++ b/code/game/objects/items/implants/implant_deathrattle.dm @@ -20,9 +20,9 @@ /datum/deathrattle_group/proc/register(obj/item/implant/deathrattle/implant) if(implant in implants) return - RegisterSignal(implant, COMSIG_IMPLANT_IMPLANTED, .proc/on_implant_implantation) - RegisterSignal(implant, COMSIG_IMPLANT_REMOVED, .proc/on_implant_removal) - RegisterSignal(implant, COMSIG_PARENT_QDELETING, .proc/on_implant_destruction) + RegisterSignal(implant, COMSIG_IMPLANT_IMPLANTED, PROC_REF(on_implant_implantation)) + RegisterSignal(implant, COMSIG_IMPLANT_REMOVED, PROC_REF(on_implant_removal)) + RegisterSignal(implant, COMSIG_PARENT_QDELETING, PROC_REF(on_implant_destruction)) implants += implant @@ -32,7 +32,7 @@ /datum/deathrattle_group/proc/on_implant_implantation(obj/item/implant/implant, mob/living/target, mob/user, silent = FALSE, force = FALSE) SIGNAL_HANDLER - RegisterSignal(target, COMSIG_MOB_STATCHANGE, .proc/on_user_statchange) + RegisterSignal(target, COMSIG_MOB_STATCHANGE, PROC_REF(on_user_statchange)) /datum/deathrattle_group/proc/on_implant_removal(obj/item/implant/implant, mob/living/source, silent = FALSE, special = 0) SIGNAL_HANDLER diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm index 28832f57e79..c854beeac6f 100644 --- a/code/game/objects/items/implants/implant_explosive.dm +++ b/code/game/objects/items/implants/implant_explosive.dm @@ -18,7 +18,7 @@ // and the process of activating destroys the body, so let the other // signal handlers at least finish. Also, the "delayed explosion" // uses sleeps, which is bad for signal handlers to do. - INVOKE_ASYNC(src, .proc/activate, "death") + INVOKE_ASYNC(src, PROC_REF(activate), "death") /obj/item/implant/explosive/get_data() var/dat = {"Implant Specifications:
@@ -74,7 +74,7 @@ . = ..() if(.) - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /obj/item/implant/explosive/removed(mob/target, silent = FALSE, special = FALSE) . = ..() diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm index c6075880249..d823f358a98 100644 --- a/code/game/objects/items/implants/implant_stealth.dm +++ b/code/game/objects/items/implants/implant_stealth.dm @@ -39,7 +39,7 @@ /obj/structure/closet/cardboard/agent/proc/reveal() alpha = 255 - addtimer(CALLBACK(src, .proc/go_invisible), 10, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(go_invisible)), 10, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/structure/closet/cardboard/agent/Bump(atom/A) . = ..() diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index e28ae7705ce..161983e4977 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -78,10 +78,10 @@ ready_implants-- if(!replenishing && auto_replenish) replenishing = TRUE - addtimer(CALLBACK(src,.proc/replenish),replenish_cooldown) + addtimer(CALLBACK(src, PROC_REF(replenish)),replenish_cooldown) if(injection_cooldown > 0) ready = FALSE - addtimer(CALLBACK(src,.proc/set_ready),injection_cooldown) + addtimer(CALLBACK(src, PROC_REF(set_ready)),injection_cooldown) else playsound(get_turf(src), 'sound/machines/buzz-sigh.ogg', 25, TRUE) update_appearance() diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm index 706279b3d45..4d90c8381d0 100644 --- a/code/game/objects/items/implants/implantuplink.dm +++ b/code/game/objects/items/implants/implantuplink.dm @@ -16,7 +16,7 @@ if(!uplink_flag) uplink_flag = src.uplink_flag src.uplink_handler = uplink_handler - RegisterSignal(src, COMSIG_COMPONENT_REMOVING, .proc/_component_removal) + RegisterSignal(src, COMSIG_COMPONENT_REMOVING, PROC_REF(_component_removal)) /obj/item/implant/uplink/implant(mob/living/carbon/target, mob/user, silent, force) . = ..() diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index 30ba7f05ec7..126a1415ab5 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -53,7 +53,7 @@ /obj/item/mail/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling) + RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) AddElement(/datum/element/item_scaling, 0.75, 1) if(isnull(department_colors)) department_colors = list( diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index adf04432c39..41fc3f9523d 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -309,7 +309,7 @@ clumsy_check = FALSE, \ attack_verb_continuous_on = list("smacks", "strikes", "cracks", "beats"), \ attack_verb_simple_on = list("smack", "strike", "crack", "beat")) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/baton/telescopic/suicide_act(mob/living/user) var/mob/living/carbon/human/human_user = user @@ -414,7 +414,7 @@ log_mapping("[src] at [AREACOORD(src)] had an invalid preload_cell_type: [preload_cell_type].") else cell = new preload_cell_type(src) - RegisterSignal(src, COMSIG_PARENT_ATTACKBY, .proc/convert) + RegisterSignal(src, COMSIG_PARENT_ATTACKBY, PROC_REF(convert)) update_appearance() /obj/item/melee/baton/security/get_cell() @@ -568,7 +568,7 @@ target.set_stutter_if_lower(16 SECONDS) SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK) - addtimer(CALLBACK(src, .proc/apply_stun_effect_end, target), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(apply_stun_effect_end), target), 2 SECONDS) /// After the initial stun period, we check to see if the target needs to have the stun applied. /obj/item/melee/baton/security/proc/apply_stun_effect_end(mob/living/target) @@ -609,7 +609,7 @@ scramble_mode() for(var/loops in 1 to rand(6, 12)) scramble_time = rand(5, 15) / (1 SECONDS) - addtimer(CALLBACK(src, .proc/scramble_mode), scramble_time*loops * (1 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(scramble_mode)), scramble_time*loops * (1 SECONDS)) /obj/item/melee/baton/security/proc/scramble_mode() if (!cell || cell.charge < cell_hit_cost) diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 1adf13faa36..39a0e57782b 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -65,7 +65,7 @@ w_class_on = active_w_class, \ attack_verb_continuous_on = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts"), \ attack_verb_simple_on = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/energy/suicide_act(mob/living/user) if(!blade_active) @@ -163,7 +163,7 @@ throw_speed_on = throw_speed, \ sharpness_on = sharpness, \ w_class_on = active_w_class) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/energy/axe/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] swings [src] towards [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 7abb2bd4ccc..867c137c3b2 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -132,8 +132,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) @@ -335,8 +335,8 @@ AddComponent(/datum/component/transforming, \ hitsound_on = hitsound, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_PRE_TRANSFORM, .proc/attempt_transform) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_PRE_TRANSFORM, PROC_REF(attempt_transform)) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_PRE_TRANSFORM]. diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index 13a1e2f7ed7..58029cbbbc1 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -23,10 +23,10 @@ /obj/item/mop/Initialize(mapload) . = ..() - AddComponent(/datum/component/cleaner, mopspeed, pre_clean_callback=CALLBACK(src, .proc/should_clean), on_cleaned_callback=CALLBACK(src, .proc/apply_reagents)) + AddComponent(/datum/component/cleaner, mopspeed, pre_clean_callback=CALLBACK(src, PROC_REF(should_clean)), on_cleaned_callback=CALLBACK(src, PROC_REF(apply_reagents))) create_reagents(max_reagent_volume) GLOB.janitor_devices += src - AddComponent(/datum/component/liquids_interaction, /obj/item/mop/.proc/attack_on_liquids_turf) //SKYRAT EDIT ADDITION - Liquids + AddComponent(/datum/component/liquids_interaction, TYPE_PROC_REF(/obj/item/mop, attack_on_liquids_turf)) //SKYRAT EDIT ADDITION - Liquids /obj/item/mop/Destroy(force) GLOB.janitor_devices -= src diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm index 2ab2efbb6f4..f83dae18c8b 100644 --- a/code/game/objects/items/paint.dm +++ b/code/game/objects/items/paint.dm @@ -66,7 +66,7 @@ "white" = image(icon = src.icon, icon_state = "paint_white"), "yellow" = image(icon = src.icon, icon_state = "paint_yellow") ) - var/picked_color = show_radial_menu(user, src, possible_colors, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 38, require_near = TRUE) + var/picked_color = show_radial_menu(user, src, possible_colors, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 38, require_near = TRUE) switch(picked_color) if("black") paint_color = COLOR_ALMOST_BLACK diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index b07b199afb9..8fbcd202dd8 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -609,7 +609,7 @@ /obj/item/toy/plush/goatplushie/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_TURF_INDUSTRIAL_LIFT_ENTER = .proc/splat, + COMSIG_TURF_INDUSTRIAL_LIFT_ENTER = PROC_REF(splat), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm index 6b3e3496140..20f5064bd89 100644 --- a/code/game/objects/items/puzzle_pieces.dm +++ b/code/game/objects/items/puzzle_pieces.dm @@ -102,12 +102,12 @@ /obj/machinery/door/puzzle/light/Initialize(mapload) . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_LIGHT_MECHANISM_COMPLETED, .proc/check_mechanism) + RegisterSignal(SSdcs, COMSIG_GLOB_LIGHT_MECHANISM_COMPLETED, PROC_REF(check_mechanism)) /obj/machinery/door/puzzle/light/proc/check_mechanism(datum/source, try_id) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/try_puzzle_open, try_id) + INVOKE_ASYNC(src, PROC_REF(try_puzzle_open), try_id) //************************* //***Box Pushing Puzzles*** diff --git a/code/game/objects/items/robot/items/food.dm b/code/game/objects/items/robot/items/food.dm index 8eb70b99f74..be834fa0f73 100644 --- a/code/game/objects/items/robot/items/food.dm +++ b/code/game/objects/items/robot/items/food.dm @@ -33,7 +33,7 @@ ///Queues another lollipop to be fabricated if there is enough room for one /obj/item/borg/lollipop/proc/check_amount() if(!charging && candy < candymax) - addtimer(CALLBACK(src, .proc/charge_lollipops), charge_delay) + addtimer(CALLBACK(src, PROC_REF(charge_lollipops)), charge_delay) charging = TRUE ///Increases the amount of lollipops diff --git a/code/game/objects/items/robot/items/storage.dm b/code/game/objects/items/robot/items/storage.dm index 4fa426c40c3..93ef7562b2a 100644 --- a/code/game/objects/items/robot/items/storage.dm +++ b/code/game/objects/items/robot/items/storage.dm @@ -9,7 +9,7 @@ var/list/storable = list() /obj/item/borg/apparatus/Initialize(mapload) - RegisterSignal(loc.loc, COMSIG_BORG_SAFE_DECONSTRUCT, .proc/safedecon) + RegisterSignal(loc.loc, COMSIG_BORG_SAFE_DECONSTRUCT, PROC_REF(safedecon)) return ..() /obj/item/borg/apparatus/Destroy() @@ -66,7 +66,7 @@ var/obj/item/item = atom item.forceMove(src) stored = item - RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, .proc/on_stored_updated_icon) + RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_stored_updated_icon)) update_appearance() return else @@ -100,7 +100,7 @@ /obj/item/borg/apparatus/beaker/Initialize(mapload) add_glass() - RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, .proc/on_stored_updated_icon) + RegisterSignal(stored, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_stored_updated_icon)) update_appearance() return ..() @@ -175,7 +175,7 @@ return if (!stored || force) - glass.AddComponent(/datum/component/reagent_refiller, power_draw_callback = CALLBACK(bro, /mob/living/silicon/robot.proc/draw_power)) + glass.AddComponent(/datum/component/reagent_refiller, power_draw_callback = CALLBACK(bro, TYPE_PROC_REF(/mob/living/silicon/robot, draw_power))) /obj/item/borg/apparatus/beaker/service/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) if (!istype(arrived, /obj/item/reagent_containers/cup/glass)) diff --git a/code/game/objects/items/robot/items/tools.dm b/code/game/objects/items/robot/items/tools.dm index 24859d70cc5..d33efc5a652 100644 --- a/code/game/objects/items/robot/items/tools.dm +++ b/code/game/objects/items/robot/items/tools.dm @@ -60,7 +60,7 @@ icon_state = "shield0" START_PROCESSING(SSfastprocess, src) host = loc - RegisterSignal(host, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(host, COMSIG_LIVING_DEATH, PROC_REF(on_death)) return ..() /obj/item/borg/projectile_dampen/proc/on_death(datum/source, gibbed) @@ -96,8 +96,8 @@ QDEL_NULL(dampening_field) var/mob/living/silicon/robot/owner = get_host() dampening_field = new(owner, field_radius, TRUE, src) - RegisterSignal(dampening_field, COMSIG_DAMPENER_CAPTURE, .proc/dampen_projectile) - RegisterSignal(dampening_field, COMSIG_DAMPENER_RELEASE, .proc/restore_projectile) + RegisterSignal(dampening_field, COMSIG_DAMPENER_CAPTURE, PROC_REF(dampen_projectile)) + RegisterSignal(dampening_field, COMSIG_DAMPENER_RELEASE, PROC_REF(restore_projectile)) owner?.model.allow_riding = FALSE active = TRUE diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 0c57ca7d3b5..ab426430017 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -473,7 +473,7 @@ defib_instance = D name = defib_instance.name defib_instance.moveToNullspace() - RegisterSignal(defib_instance, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED), .proc/on_defib_instance_qdel_or_moved) + RegisterSignal(defib_instance, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED), PROC_REF(on_defib_instance_qdel_or_moved)) /obj/item/borg/upgrade/defib/backpack/proc/on_defib_instance_qdel_or_moved(obj/item/defibrillator/D) SIGNAL_HANDLER diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 44d81c5aa58..cd5a69beefe 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -179,7 +179,7 @@ flick("flashshield_flash", src) inhand_icon_state = "flashshield_flash" owner?.update_held_items() - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.5 SECONDS, (TIMER_UNIQUE|TIMER_OVERRIDE)) //.5 second delay so the inhands sprite finishes its anim since inhands don't support flick(). + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.5 SECONDS, (TIMER_UNIQUE|TIMER_OVERRIDE)) //.5 second delay so the inhands sprite finishes its anim since inhands don't support flick(). /obj/item/shield/riot/flash/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/assembly/flash/handheld)) @@ -254,7 +254,7 @@ throw_speed_on = active_throw_speed, \ hitsound_on = hitsound, \ clumsy_check = !can_clumsy_use) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/shield/energy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return FALSE @@ -302,7 +302,7 @@ w_class_on = WEIGHT_CLASS_BULKY, \ attack_verb_continuous_on = list("smacks", "strikes", "cracks", "beats"), \ attack_verb_simple_on = list("smack", "strike", "crack", "beat")) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(extended) diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm index 6b35a33f296..ff07b3accae 100644 --- a/code/game/objects/items/singularityhammer.dm +++ b/code/game/objects/items/singularityhammer.dm @@ -63,7 +63,7 @@ playsound(user, 'sound/weapons/marauder.ogg', 50, TRUE) var/turf/target = get_turf(A) vortex(target,user) - addtimer(CALLBACK(src, .proc/recharge), 100) + addtimer(CALLBACK(src, PROC_REF(recharge)), 100) /obj/item/mjollnir name = "Mjolnir" diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index af146234f23..001e1aae325 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( if(T && is_station_level(T.z)) SSblackbox.record_feedback("tally", "station_mess_created", 1, name) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index a67054911ac..235d2e4d7df 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -99,7 +99,7 @@ if(item_stack == src) continue if(can_merge(item_stack)) - INVOKE_ASYNC(src, .proc/merge_without_del, item_stack) + INVOKE_ASYNC(src, PROC_REF(merge_without_del), item_stack) if(is_zero_amount(delete_if_zero = FALSE)) return INITIALIZE_HINT_QDEL @@ -116,7 +116,7 @@ update_weight() update_appearance() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_movable_entered_occupied_turf, + COMSIG_ATOM_ENTERED = PROC_REF(on_movable_entered_occupied_turf), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -321,7 +321,7 @@ user = builder, anchor = builder, choices = options, - custom_check = CALLBACK(src, .proc/radial_check, builder), + custom_check = CALLBACK(src, PROC_REF(radial_check), builder), radius = radial_radius, tooltips = TRUE, ) @@ -636,7 +636,7 @@ return if(!arrived.throwing && can_merge(arrived)) - INVOKE_ASYNC(src, .proc/merge, arrived) + INVOKE_ASYNC(src, PROC_REF(merge), arrived) /obj/item/stack/hitby(atom/movable/hitting, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum) if(can_merge(hitting, inhand = TRUE)) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index d5890b190fb..94824104ad2 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -93,7 +93,7 @@ return OXYLOSS /obj/item/storage/backpack/santabag/proc/regenerate_presents() - addtimer(CALLBACK(src, .proc/regenerate_presents), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(regenerate_presents)), 30 SECONDS) var/mob/user = get(loc, /mob) if(!istype(user)) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 232f5517ff5..d5fe495169a 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -128,7 +128,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() @@ -376,7 +376,7 @@ var/delay = rand(2,4) var/datum/move_loop/loop = SSmove_manager.move_rand(tray_item, list(NORTH,SOUTH,EAST,WEST), delay, timeout = rand(1, 2) * delay, flags = MOVEMENT_LOOP_START_FAST) //This does mean scattering is tied to the tray. Not sure how better to handle it - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/change_speed) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(change_speed)) /obj/item/storage/bag/tray/proc/change_speed(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index a7c8839b54f..e03b9f4e438 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", var/image/bible_image = image(icon = 'icons/obj/storage/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/food_boxes.dm b/code/game/objects/items/storage/boxes/food_boxes.dm index 004b5cb6871..510cee7c20e 100644 --- a/code/game/objects/items/storage/boxes/food_boxes.dm +++ b/code/game/objects/items/storage/boxes/food_boxes.dm @@ -95,7 +95,7 @@ /obj/item/storage/box/papersack/attackby(obj/item/attacking_item, mob/user, params) if(istype(attacking_item, /obj/item/pen)) - var/choice = show_radial_menu(user, src , papersack_designs, custom_check = CALLBACK(src, .proc/check_menu, user, attacking_item), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src , papersack_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user, attacking_item), radius = 36, require_near = TRUE) if(!choice || choice == design_choice) return FALSE design_choice = choice diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 12f1573f78b..ecb15a3f0bb 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -17,8 +17,8 @@ /obj/item/tank/jetpack/Initialize(mapload) . = ..() - get_mover = CALLBACK(src, .proc/get_user) - check_on_move = CALLBACK(src, .proc/allow_thrust, 0.01) + get_mover = CALLBACK(src, PROC_REF(get_user)) + check_on_move = CALLBACK(src, PROC_REF(allow_thrust), 0.01) refresh_jetpack() /obj/item/tank/jetpack/Destroy() diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index 0208f359727..391be310aa6 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -98,7 +98,7 @@ // This is separate from the reaction recorder. // In this case we are only listening to determine if the tank is overpressurized but not destroyed. - RegisterSignal(air_contents, COMSIG_GASMIX_MERGED, .proc/merging_information) + RegisterSignal(air_contents, COMSIG_GASMIX_MERGED, PROC_REF(merging_information)) START_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 71568930df1..f159f7ee861 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -22,7 +22,7 @@ . = ..() create_reagents(volume, OPENCONTAINER) noz = make_noz() - RegisterSignal(noz, COMSIG_MOVABLE_MOVED, .proc/noz_move) + RegisterSignal(noz, COMSIG_MOVABLE_MOVED, PROC_REF(noz_move)) /obj/item/watertank/Destroy() QDEL_NULL(noz) @@ -47,7 +47,7 @@ if(QDELETED(noz)) noz = make_noz() - RegisterSignal(noz, COMSIG_MOVABLE_MOVED, .proc/noz_move) + RegisterSignal(noz, COMSIG_MOVABLE_MOVED, PROC_REF(noz_move)) if(noz in src) //Detach the nozzle into the user's hands if(!user.put_in_hands(noz)) @@ -315,8 +315,8 @@ playsound(src,'sound/items/syringeproj.ogg',40,TRUE) var/delay = 2 var/datum/move_loop/loop = SSmove_manager.move_towards(resin, target, delay, timeout = delay * 5, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/resin_stop_check) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, .proc/resin_landed) + RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(resin_stop_check)) + RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(resin_landed)) return if(nozzle_mode == RESIN_FOAM) @@ -331,7 +331,7 @@ var/obj/effect/particle_effect/fluid/foam/metal/resin/foam = new (get_turf(target)) foam.group.target_size = 0 metal_synthesis_cooldown++ - addtimer(CALLBACK(src, .proc/reduce_metal_synth_cooldown), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reduce_metal_synth_cooldown)), 10 SECONDS) else balloon_alert(user, "still being synthesized!") return diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm index 638365235cb..4d5ca410fcc 100644 --- a/code/game/objects/items/tcg/tcg.dm +++ b/code/game/objects/items/tcg/tcg.dm @@ -75,7 +75,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) "Tap" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_tap"), "Flip" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_flip"), ) - var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(choice) @@ -215,7 +215,7 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) "Pickup" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_pickup"), "Flip" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_flip"), ) - var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(choice) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 2354f395d6b..6274b437fae 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -205,7 +205,7 @@ if (about_to_replace_location) UnregisterSignal(about_to_replace_location, COMSIG_TELEPORTER_NEW_TARGET) - RegisterSignal(teleport_location, COMSIG_TELEPORTER_NEW_TARGET, .proc/on_teleporter_new_target) + RegisterSignal(teleport_location, COMSIG_TELEPORTER_NEW_TARGET, PROC_REF(on_teleporter_new_target)) last_portal_location = WEAKREF(teleport_location) @@ -256,8 +256,8 @@ var/obj/effect/portal/portal1 = created[1] var/obj/effect/portal/portal2 = created[2] - RegisterSignal(portal1, COMSIG_PARENT_QDELETING, .proc/on_portal_destroy) - RegisterSignal(portal2, COMSIG_PARENT_QDELETING, .proc/on_portal_destroy) + RegisterSignal(portal1, COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy)) + RegisterSignal(portal2, COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy)) try_move_adjacent(portal1, user.dir) active_portal_pairs[portal1] = portal2 diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index a32e7b72ffe..d6d95263bfc 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -61,7 +61,7 @@ core = ncore icon_state = "core_container_loaded" to_chat(user, span_warning("Container is sealing...")) - addtimer(CALLBACK(src, .proc/seal), 50) + addtimer(CALLBACK(src, PROC_REF(seal)), 50) return TRUE /obj/item/nuke_core_container/proc/seal() @@ -239,7 +239,7 @@ T.icon_state = "supermatter_tongs" icon_state = "core_container_loaded" to_chat(user, span_warning("Container is sealing...")) - addtimer(CALLBACK(src, .proc/seal), 50) + addtimer(CALLBACK(src, PROC_REF(seal)), 50) return TRUE /obj/item/nuke_core_container/supermatter/seal() diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index b1301c5fa30..720946e9c5f 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -103,7 +103,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index e067c93de29..01300df0512 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -105,7 +105,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm index e3de6ae518e..f969d1e00f7 100644 --- a/code/game/objects/items/tools/wrench.dm +++ b/code/game/objects/items/tools/wrench.dm @@ -101,7 +101,7 @@ hitsound_on = hitsound, \ w_class_on = WEIGHT_CLASS_NORMAL, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. diff --git a/code/game/objects/items/toy_mechs.dm b/code/game/objects/items/toy_mechs.dm index 0240843c3a1..ce3ce4600c7 100644 --- a/code/game/objects/items/toy_mechs.dm +++ b/code/game/objects/items/toy_mechs.dm @@ -179,7 +179,7 @@ to_chat(user, span_notice("You offer battle to [target.name]!")) to_chat(target, span_notice("[user.name] wants to battle with [user.p_their()] [name]! Attack them with a toy mech to initiate combat.")) wants_to_battle = TRUE - addtimer(CALLBACK(src, .proc/withdraw_offer, user), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(withdraw_offer), user), 6 SECONDS) return ..() diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7b2c31e826e..9da38cc390d 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -260,7 +260,7 @@ user.visible_message(span_suicide("[user] consumes [src]! It looks like [user.p_theyre()] trying to commit suicide!")) playsound(user, 'sound/items/eatfood.ogg', 50, TRUE) user.adjust_nutrition(50) // mmmm delicious - addtimer(CALLBACK(src, .proc/manual_suicide, user), (3SECONDS)) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), (3SECONDS)) return MANUAL_SUICIDE /** @@ -401,7 +401,7 @@ throw_speed_on = throw_speed, \ hitsound_on = hitsound, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) AddElement(/datum/element/update_icon_updates_onmob) var/static/list/tool_behaviors = list( @@ -537,7 +537,7 @@ update_appearance() playsound(src, 'sound/effects/pope_entry.ogg', 100) Rumble() - addtimer(CALLBACK(src, .proc/stopRumble), 600) + addtimer(CALLBACK(src, PROC_REF(stopRumble)), 600) else to_chat(user, span_warning("[src] is already active!")) @@ -638,7 +638,7 @@ /obj/item/toy/snappop/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -660,7 +660,7 @@ /obj/effect/decal/cleanable/ash/snappop_phoenix/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/respawn), respawn_time) + addtimer(CALLBACK(src, PROC_REF(respawn)), respawn_time) /obj/effect/decal/cleanable/ash/snappop_phoenix/proc/respawn() new /obj/item/toy/snappop/phoenix(get_turf(src)) @@ -689,7 +689,7 @@ activation_message(user) playsound(loc, 'sound/machines/click.ogg', 20, TRUE) - INVOKE_ASYNC(src, .proc/do_toy_talk, user) + INVOKE_ASYNC(src, PROC_REF(do_toy_talk), user) cooldown = TRUE addtimer(VARSET_CALLBACK(src, cooldown, FALSE), recharge_time) @@ -854,7 +854,7 @@ if(!M.stat && !isAI(M)) // Checks to make sure whoever's getting shaken is alive/not the AI // Short delay to match up with the explosion sound // Shakes player camera 2 squares for 1 second. - addtimer(CALLBACK(GLOBAL_PROC, .proc/shake_camera, M, 2, 1), 0.8 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(shake_camera), M, 2, 1), 0.8 SECONDS) else to_chat(user, span_alert("Nothing happens.")) @@ -1259,7 +1259,7 @@ if(cooldown <= world.time) cooldown = (world.time + 300) user.visible_message(span_notice("[user] adjusts the dial on [src].")) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/items/radiostatic.ogg', 50, FALSE), 0.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/items/radiostatic.ogg', 50, FALSE), 0.5 SECONDS) else to_chat(user, span_warning("The dial on [src] jams up")) return @@ -1274,7 +1274,7 @@ /obj/item/toy/braintoy/attack_self(mob/user) if(cooldown <= world.time) cooldown = (world.time + 10) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/effects/blobattack.ogg', 50, FALSE), 0.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/effects/blobattack.ogg', 50, FALSE), 0.5 SECONDS) /* * Eldritch Toys diff --git a/code/game/objects/items/v8_engine.dm b/code/game/objects/items/v8_engine.dm index e4a6da57117..6575e05c5a2 100644 --- a/code/game/objects/items/v8_engine.dm +++ b/code/game/objects/items/v8_engine.dm @@ -30,7 +30,7 @@ /obj/item/v8_engine/examine_more(mob/user) . = ..() - INVOKE_ASYNC(src, .proc/start_learning_recipe, user) + INVOKE_ASYNC(src, PROC_REF(start_learning_recipe), user) /obj/item/v8_engine/proc/start_learning_recipe(mob/user) if(!user.mind) @@ -69,7 +69,7 @@ /obj/item/house_edge/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, force_unwielded = 12, force_wielded = 22, attacksound = active_hitsound) - RegisterSignal(src, list(COMSIG_ITEM_DROPPED, COMSIG_MOVABLE_PRE_THROW, COMSIG_ITEM_ATTACK_SELF), .proc/reset_charges) + RegisterSignal(src, list(COMSIG_ITEM_DROPPED, COMSIG_MOVABLE_PRE_THROW, COMSIG_ITEM_ATTACK_SELF), PROC_REF(reset_charges)) /obj/item/house_edge/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() diff --git a/code/game/objects/items/virgin_mary.dm b/code/game/objects/items/virgin_mary.dm index 6ac206549e0..291ddbb2207 100644 --- a/code/game/objects/items/virgin_mary.dm +++ b/code/game/objects/items/virgin_mary.dm @@ -48,7 +48,7 @@ /obj/item/virgin_mary/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] starts saying their Hail Mary's at a terrifying pace! It looks like [user.p_theyre()] trying to enter the afterlife!")) user.say("Hail Mary, full of grace, the Lord is with thee. Blessed are thou amongst women, and blessed is the fruit of thy womb, Jesus. Holy Mary, mother of God, pray for us sinners, now and at the hour of our death. Amen. ", forced = /obj/item/virgin_mary) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 75) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 75) addtimer(CALLBACK(user, /atom/movable/proc/say, "O my Mother, preserve me this day from mortal sin..."), 50) return MANUAL_SUICIDE diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 61eac01a174..5308cbb7c2c 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -475,7 +475,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 clumsy_check = FALSE, \ attack_verb_continuous_on = list("smacks", "strikes", "cracks", "beats"), \ attack_verb_simple_on = list("smack", "strike", "crack", "beat")) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) ADD_TRAIT(src, TRAIT_BLIND_TOOL, ITEM_BLIND_TRAIT) /* @@ -788,7 +788,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 playsound(src, 'sound/items/baseballhit.ogg', 100, TRUE) user.do_attack_animation(target, used_item = src) ADD_TRAIT(user, TRAIT_IMMOBILIZED, type) - addtimer(CALLBACK(src, .proc/launch_back, target, user, return_to_sender, datum_throw_speed), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(launch_back), target, user, return_to_sender, datum_throw_speed), 0.5 SECONDS) return TRUE /obj/item/melee/baseball_bat/proc/launch_back(atom/movable/target, mob/living/user, turf/target_turf, datum_throw_speed) @@ -797,7 +797,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 target.mouse_opacity = initial(target.mouse_opacity) target.add_filter("baseball_launch", 3, motion_blur_filter(1, 3)) target.throwforce *= 2 - target.throw_at(target_turf, get_dist(target, target_turf), datum_throw_speed + 1, user, callback = CALLBACK(src, .proc/on_hit, target)) + target.throw_at(target_turf, get_dist(target, target_turf), datum_throw_speed + 1, user, callback = CALLBACK(src, PROC_REF(on_hit), target)) thrown_datums[target] = target.throwing /obj/item/melee/baseball_bat/proc/on_hit(atom/movable/target) @@ -976,8 +976,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 /obj/item/highfrequencyblade/Initialize(mapload) . = ..() AddComponent(/datum/component/two_handed, \ - wield_callback = CALLBACK(src, .proc/on_wield), \ - unwield_callback = CALLBACK(src, .proc/on_unwield), \ + wield_callback = CALLBACK(src, PROC_REF(on_wield)), \ + unwield_callback = CALLBACK(src, PROC_REF(on_unwield)), \ ) AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_HANDS) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index e3e13672e70..aedb9cd1f52 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -183,7 +183,7 @@ if(machine) unset_machine() machine = O - RegisterSignal(O, COMSIG_PARENT_QDELETING, .proc/unset_machine) + RegisterSignal(O, COMSIG_PARENT_QDELETING, PROC_REF(unset_machine)) if(istype(O)) O.obj_flags |= IN_USE @@ -307,7 +307,7 @@ items += list("[reskin_option]" = item_image) sort_list(items) - var/pick = show_radial_menu(M, src, items, custom_check = CALLBACK(src, .proc/check_reskin_menu, M), radius = 38, require_near = TRUE) + var/pick = show_radial_menu(M, src, items, custom_check = CALLBACK(src, PROC_REF(check_reskin_menu), M), radius = 38, require_near = TRUE) if(!pick) return if(!unique_reskin[pick]) diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index be71d5e72db..8c4596e007a 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -214,7 +214,7 @@ check_weed = new(check_turf) //set the new one's parent node to our parent node check_weed.parent_node = parent_node - check_weed.RegisterSignal(parent_node, COMSIG_PARENT_QDELETING, .proc/after_parent_destroyed) + check_weed.RegisterSignal(parent_node, COMSIG_PARENT_QDELETING, PROC_REF(after_parent_destroyed)) /** * Called when the parent node is destroyed @@ -222,7 +222,7 @@ /obj/structure/alien/weeds/proc/after_parent_destroyed() if(!find_new_parent()) var/random_time = rand(2 SECONDS, 8 SECONDS) - addtimer(CALLBACK(src, .proc/do_qdel), random_time) + addtimer(CALLBACK(src, PROC_REF(do_qdel)), random_time) /** * Called when trying to find a new parent after our previous parent died @@ -236,7 +236,7 @@ if(new_parent == previous_node) continue parent_node = new_parent - RegisterSignal(parent_node, COMSIG_PARENT_QDELETING, .proc/after_parent_destroyed) + RegisterSignal(parent_node, COMSIG_PARENT_QDELETING, PROC_REF(after_parent_destroyed)) return parent_node return FALSE @@ -348,7 +348,7 @@ if(status == GROWING || status == GROWN) child = new(src) if(status == GROWING) - addtimer(CALLBACK(src, .proc/Grow), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) + addtimer(CALLBACK(src, PROC_REF(Grow)), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME)) proximity_monitor = new(src, status == GROWN ? 1 : 0) if(status == BURST) atom_integrity = integrity_failure * max_integrity @@ -408,7 +408,7 @@ status = BURSTING proximity_monitor.set_range(0) flick("egg_opening", src) - addtimer(CALLBACK(src, .proc/finish_bursting, kill), 15) + addtimer(CALLBACK(src, PROC_REF(finish_bursting), kill), 15) /obj/structure/alien/egg/proc/finish_bursting(kill = TRUE) status = BURST diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 4f37b0b09ef..6a12d75c337 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -525,7 +525,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/chair/stool/bar, 0) Mob.pixel_y += 2 .=..() if(iscarbon(Mob)) - INVOKE_ASYNC(src, .proc/snap_check, Mob) + INVOKE_ASYNC(src, PROC_REF(snap_check), Mob) /obj/structure/chair/plastic/post_unbuckle_mob(mob/living/Mob) Mob.pixel_y -= 2 diff --git a/code/game/objects/structures/bonfire.dm b/code/game/objects/structures/bonfire.dm index 5df8311a900..1048e8b731f 100644 --- a/code/game/objects/structures/bonfire.dm +++ b/code/game/objects/structures/bonfire.dm @@ -34,7 +34,7 @@ /obj/structure/bonfire/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/structures/cannons/cannon.dm b/code/game/objects/structures/cannons/cannon.dm index 5883b5cbe73..12fa04dbe0b 100644 --- a/code/game/objects/structures/cannons/cannon.dm +++ b/code/game/objects/structures/cannons/cannon.dm @@ -77,7 +77,7 @@ visible_message(ignition_message) user.log_message("fired a cannon", LOG_ATTACK) log_game("[key_name(user)] fired a cannon in [AREACOORD(src)]") - addtimer(CALLBACK(src, .proc/fire), fire_delay) + addtimer(CALLBACK(src, PROC_REF(fire)), fire_delay) charge_ignited = TRUE return diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index b4489b53027..9929ea51cf0 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -80,8 +80,8 @@ update_appearance() populate_contents_immediate() var/static/list/loc_connections = list( - COMSIG_CARBON_DISARM_COLLIDE = .proc/locker_carbon, - COMSIG_ATOM_MAGICALLY_UNLOCKED = .proc/on_magic_unlock, + COMSIG_CARBON_DISARM_COLLIDE = PROC_REF(locker_carbon), + COMSIG_ATOM_MAGICALLY_UNLOCKED = PROC_REF(on_magic_unlock), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -198,7 +198,7 @@ animate(door_obj, transform = door_transform, icon_state = door_state, layer = door_layer, time = world.tick_lag, flags = ANIMATION_END_NOW) else animate(transform = door_transform, icon_state = door_state, layer = door_layer, time = world.tick_lag) - addtimer(CALLBACK(src, .proc/end_door_animation), door_anim_time, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_CLIENT_TIME) + addtimer(CALLBACK(src, PROC_REF(end_door_animation)), door_anim_time, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_CLIENT_TIME) /// Ends the door animation and removes the animated overlay /obj/structure/closet/proc/end_door_animation() @@ -767,6 +767,6 @@ SIGNAL_HANDLER locked = FALSE - INVOKE_ASYNC(src, .proc/open) + INVOKE_ASYNC(src, PROC_REF(open)) #undef LOCKER_FULL diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 1c3f843b956..6ae90af2ea7 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -34,7 +34,7 @@ var/oldloc = loc step(src, direction) if(oldloc != loc) - addtimer(CALLBACK(src, .proc/ResetMoveDelay), CONFIG_GET(number/movedelay/walk_delay) * move_speed_multiplier) + addtimer(CALLBACK(src, PROC_REF(ResetMoveDelay)), CONFIG_GET(number/movedelay/walk_delay) * move_speed_multiplier) else move_delay = FALSE @@ -80,7 +80,7 @@ // We use this list to update plane values on parent z change, which is why we need the timer too // I'm sorry :( LAZYADD(update_on_z, alert_image) - addtimer(CALLBACK(src, .proc/forget_alert_image, alert_image), 0.8 SECONDS) + addtimer(CALLBACK(src, PROC_REF(forget_alert_image), alert_image), 0.8 SECONDS) /atom/proc/forget_alert_image(image/alert_image) LAZYREMOVE(update_on_z, alert_image) diff --git a/code/game/objects/structures/crates_lockers/closets/infinite.dm b/code/game/objects/structures/crates_lockers/closets/infinite.dm index dfe68c868c4..9afab3ddd20 100644 --- a/code/game/objects/structures/crates_lockers/closets/infinite.dm +++ b/code/game/objects/structures/crates_lockers/closets/infinite.dm @@ -26,7 +26,7 @@ /obj/structure/closet/infinite/open(mob/living/user, force = FALSE) . = ..() if(. && auto_close_time) - addtimer(CALLBACK(src, .proc/close_on_my_own), auto_close_time, TIMER_OVERRIDE | TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(close_on_my_own)), auto_close_time, TIMER_OVERRIDE | TIMER_UNIQUE) /obj/structure/closet/infinite/proc/close_on_my_own() if(close()) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 29e11e3eb17..e9895898b5e 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -119,7 +119,7 @@ var/crate_path = pick_weight(possible_crates) var/obj/structure/closet/crate = new crate_path(loc) - crate.RegisterSignal(crate, COMSIG_CLOSET_POPULATE_CONTENTS, /obj/structure/closet/.proc/populate_with_random_maint_loot) + crate.RegisterSignal(crate, COMSIG_CLOSET_POPULATE_CONTENTS, TYPE_PROC_REF(/obj/structure/closet/, populate_with_random_maint_loot)) if (prob(50)) crate.opened = TRUE crate.update_appearance() diff --git a/code/game/objects/structures/crates_lockers/crates/bins.dm b/code/game/objects/structures/crates_lockers/crates/bins.dm index 1b7ebb89c93..867ede6d88d 100644 --- a/code/game/objects/structures/crates_lockers/crates/bins.dm +++ b/code/game/objects/structures/crates_lockers/crates/bins.dm @@ -38,7 +38,7 @@ /obj/structure/closet/crate/bin/proc/do_animate() playsound(loc, open_sound, 15, TRUE, -3) flick("animate_largebins", src) - addtimer(CALLBACK(src, .proc/do_close), 13) + addtimer(CALLBACK(src, PROC_REF(do_close)), 13) /obj/structure/closet/crate/bin/proc/do_close() playsound(loc, close_sound, 15, TRUE, -3) diff --git a/code/game/objects/structures/deployable_turret.dm b/code/game/objects/structures/deployable_turret.dm index 5faed760fab..908db32ab4b 100644 --- a/code/game/objects/structures/deployable_turret.dm +++ b/code/game/objects/structures/deployable_turret.dm @@ -185,7 +185,7 @@ /obj/machinery/deployable_turret/proc/volley(mob/user) target_turf = get_turf(target) for(var/i in 1 to number_of_shots) - addtimer(CALLBACK(src, /obj/machinery/deployable_turret/.proc/fire_helper, user), i*rate_of_fire) + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/machinery/deployable_turret/, fire_helper), user), i*rate_of_fire) /obj/machinery/deployable_turret/proc/fire_helper(mob/user) if(user.incapacitated() || !(user in buckled_mobs)) diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm index 9237fc72fb5..a00f1df8053 100644 --- a/code/game/objects/structures/divine.dm +++ b/code/game/objects/structures/divine.dm @@ -42,7 +42,7 @@ to_chat(user, span_notice("The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.")) user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood,20) update_appearance() - addtimer(CALLBACK(src, /atom/.proc/update_appearance), time_between_uses) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_appearance)), time_between_uses) /obj/structure/healingfountain/update_icon_state() diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 61d587fc1d7..25fc09c7612 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -190,7 +190,7 @@ /obj/structure/falsewall/uranium/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ATOM_PROPAGATE_RAD_PULSE, .proc/radiate) + RegisterSignal(src, COMSIG_ATOM_PROPAGATE_RAD_PULSE, PROC_REF(radiate)) /obj/structure/falsewall/uranium/attackby(obj/item/W, mob/user, params) radiate() diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 76cbeb1e344..e7f1f5490da 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -270,7 +270,7 @@ GLOBAL_LIST_EMPTY(flora_uprooting_tools_typepaths) desc = harvested_desc harvested = TRUE if(!delete_on_harvest && regrowth_time_high > 0) - 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/proc/after_harvest(user) if(delete_on_harvest) diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index 86596d6b9ef..ed7bc565ff0 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -88,7 +88,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)) @@ -101,7 +101,7 @@ current_action = GUILLOTINE_BLADE_IDLE 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 = GUILLOTINE_BLADE_IDLE else @@ -114,7 +114,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 @@ -157,7 +157,7 @@ for(var/mob/M in viewers(src, 7)) var/mob/living/carbon/human/C = M if (ishuman(M)) - addtimer(CALLBACK(C, /mob/.proc/emote, "clap"), delay_offset * 0.3) + addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/, emote), "clap"), delay_offset * 0.3) delay_offset++ else H.apply_damage(15 * blade_sharpness, BRUTE, head) diff --git a/code/game/objects/structures/guncase.dm b/code/game/objects/structures/guncase.dm index d052963f6ca..ed800fb42bc 100644 --- a/code/game/objects/structures/guncase.dm +++ b/code/game/objects/structures/guncase.dm @@ -82,7 +82,7 @@ item_image.copy_overlays(thing) items += list("[thing.name] ([i])" = item_image) - var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!pick) return diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm index d7a2be2fa6b..5859f7b3aac 100644 --- a/code/game/objects/structures/hivebot.dm +++ b/code/game/objects/structures/hivebot.dm @@ -15,7 +15,7 @@ smoke.start() visible_message(span_boldannounce("[src] warps in!")) playsound(src.loc, 'sound/effects/empulse.ogg', 25, TRUE) - addtimer(CALLBACK(src, .proc/warpbots), rand(10, 600)) + addtimer(CALLBACK(src, PROC_REF(warpbots)), rand(10, 600)) /obj/structure/hivebot_beacon/proc/warpbots() icon_state = "def_radar" diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 05dd1eb73b8..bf7742b95b0 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -200,7 +200,7 @@ var/mob/living/M = user M.electrocute_act(15,"Energy Barrier") shockcd = TRUE - addtimer(CALLBACK(src, .proc/cooldown), 5) + addtimer(CALLBACK(src, PROC_REF(cooldown)), 5) /obj/structure/holosign/barrier/cyborg/hacked/Bumped(atom/movable/AM) if(shockcd) @@ -212,4 +212,4 @@ var/mob/living/M = AM M.electrocute_act(15,"Energy Barrier") shockcd = TRUE - addtimer(CALLBACK(src, .proc/cooldown), 5) + addtimer(CALLBACK(src, PROC_REF(cooldown)), 5) diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index ba269b35698..d72199af0d6 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -118,7 +118,7 @@ GLOBAL_LIST_INIT(ore_probability, list( playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE) visible_message(span_boldannounce("[src] begins to collapse, cutting it off from this world!")) animate(src, transform = matrix().Scale(0, 1), alpha = 50, time = 5 SECONDS) - addtimer(CALLBACK(src, .proc/collapse), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(collapse)), 5 SECONDS) /** * Handles portal deletion diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 461031d8cbd..5c412ccdd7c 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -255,7 +255,7 @@ var/pick = items[1] if(length(items) > 1) items = sort_list(items) - pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 38, require_near = TRUE) + pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 38, require_near = TRUE) if(!pick) return diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index b24df6bfea2..15247ecc7d9 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -95,7 +95,7 @@ balloon_alert(user, "can't go any further [going_up ? "up" : "down"]") return if(travel_time) - INVOKE_ASYNC(src, .proc/start_travelling, user, going_up) + INVOKE_ASYNC(src, PROC_REF(start_travelling), user, going_up) else travel(user, going_up) add_fingerprint(user) @@ -148,7 +148,7 @@ var/datum/callback/check_menu if(!is_ghost) - check_menu = CALLBACK(src, .proc/check_menu, user) + check_menu = CALLBACK(src, PROC_REF(check_menu), user) var/result = show_radial_menu(user, src, tool_list, custom_check = check_menu, require_near = !is_ghost, tooltips = TRUE) var/going_up @@ -163,7 +163,7 @@ if(is_ghost || !travel_time) travel(user, going_up, is_ghost) else - INVOKE_ASYNC(src, .proc/start_travelling, user, going_up) + INVOKE_ASYNC(src, PROC_REF(start_travelling), user, going_up) /obj/structure/ladder/proc/check_menu(mob/user, is_ghost) if(user.incapacitated() || (!user.Adjacent(src))) diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index 16593ecaa8e..f408ddbd636 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -34,7 +34,7 @@ create_reagents(max_volume, DRAINABLE) reagents.add_reagent(reagent_id, max_volume) - RegisterSignal(src, list(COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT), .proc/start_chemming) + RegisterSignal(src, list(COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT), PROC_REF(start_chemming)) if(erupting_state) icon_state = erupting_state diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index e3c0928bc73..ef93f6c7169 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(tendrils, list()) visible_message(span_boldannounce("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")) balloon_alert_to_viewers("interact to grab loot before collapse!", vision_distance = 7) playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, FALSE, 50, TRUE, TRUE) - addtimer(CALLBACK(src, .proc/collapse), 50) + addtimer(CALLBACK(src, PROC_REF(collapse)), 50) /obj/effect/collapse/examine(mob/user) var/list/examine_messages = ..() diff --git a/code/game/objects/structures/life_candle.dm b/code/game/objects/structures/life_candle.dm index 2ce45d8f018..3b2777a2b7f 100644 --- a/code/game/objects/structures/life_candle.dm +++ b/code/game/objects/structures/life_candle.dm @@ -72,7 +72,7 @@ for(var/m in linked_minds) var/datum/mind/mind = m if(!mind.current || (mind.current && mind.current.stat == DEAD)) - addtimer(CALLBACK(src, .proc/respawn, mind), respawn_time, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(respawn), mind), respawn_time, TIMER_UNIQUE) /obj/structure/life_candle/proc/respawn(datum/mind/mind) var/turf/T = get_turf(src) diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm index 6372cc6bcfd..fad2fc5a7f1 100644 --- a/code/game/objects/structures/maintenance.dm +++ b/code/game/objects/structures/maintenance.dm @@ -147,7 +147,7 @@ at the cost of risking a vicious bite.**/ "Change Color" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_recolor"), "Create Artefact" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_create") ) - var/altar_result = show_radial_menu(user, src, altar_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/altar_result = show_radial_menu(user, src, altar_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) switch(altar_result) if("Change Color") var/chosen_color = input(user, "", "Choose Color", pants_color) as color|null @@ -190,7 +190,7 @@ at the cost of risking a vicious bite.**/ update_icon() visible_message(span_warning("[src] starts creating something...")) playsound(src, 'sound/magic/pantsaltar.ogg', 60) - addtimer(CALLBACK(src, .proc/pants_stagetwo), ALTAR_TIME) + addtimer(CALLBACK(src, PROC_REF(pants_stagetwo)), ALTAR_TIME) /// Continues the creation, making every mob nearby nauseous. /obj/structure/destructible/cult/pants_altar/proc/pants_stagetwo() @@ -200,16 +200,16 @@ at the cost of risking a vicious bite.**/ for(var/mob/living/viewing_mob in viewers(7, src)) viewing_mob.blur_eyes(10) viewing_mob.adjust_confusion(10 SECONDS) - addtimer(CALLBACK(src, .proc/pants_stagethree), ALTAR_TIME) + addtimer(CALLBACK(src, PROC_REF(pants_stagethree)), ALTAR_TIME) /// Continues the creation, making every mob nearby dizzy /obj/structure/destructible/cult/pants_altar/proc/pants_stagethree() status = ALTAR_STAGETHREE update_icon() visible_message(span_warning("You start feeling horrible...")) - // for(var/mob/living/viewing_mob in viewers(7, src)) // SKYRAT EDIT REMOVAL TEMPORARY - // viewing_mob.set_dizzy_if_lower(20 SECONDS) // SKYRAT EDIT REMOVAL TEMPORARY - addtimer(CALLBACK(src, .proc/pants_create), ALTAR_TIME) + for(var/mob/living/viewing_mob in viewers(7, src)) + viewing_mob.set_dizzy_if_lower(20 SECONDS) + addtimer(CALLBACK(src, PROC_REF(pants_create)), ALTAR_TIME) /// Finishes the creation, creating the item itself, setting the cooldowns and flashing every mob nearby. /obj/structure/destructible/cult/pants_altar/proc/pants_create() @@ -221,7 +221,7 @@ at the cost of risking a vicious bite.**/ var/obj/item/clothing/under/pants/slacks/altar/pants = new(get_turf(src)) pants.add_atom_colour(pants_color, ADMIN_COLOUR_PRIORITY) COOLDOWN_START(src, use_cooldown, use_cooldown_duration) - addtimer(CALLBACK(src, /atom.proc/update_icon), 1 MINUTES + 0.1 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 MINUTES + 0.1 SECONDS) update_icon() /obj/structure/destructible/cult/pants_altar/proc/check_menu(mob/user) @@ -264,7 +264,7 @@ at the cost of risking a vicious bite.**/ if(prob(75)) vent_active = FALSE var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/blow_steam, + COMSIG_ATOM_EXIT = PROC_REF(blow_steam), ) AddElement(/datum/element/connect_loc, loc_connections) update_icon_state() diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 75a6ca243eb..9b176120928 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -107,7 +107,7 @@ isSwitchingStates = FALSE if(close_delay != -1) - addtimer(CALLBACK(src, .proc/Close), close_delay) + addtimer(CALLBACK(src, PROC_REF(Close)), close_delay) /obj/structure/mineral_door/proc/Close() if(isSwitchingStates || !door_opened) diff --git a/code/game/objects/structures/mystery_box.dm b/code/game/objects/structures/mystery_box.dm index ebebdcdc055..2f4a3544823 100644 --- a/code/game/objects/structures/mystery_box.dm +++ b/code/game/objects/structures/mystery_box.dm @@ -150,12 +150,12 @@ GLOBAL_LIST_INIT(mystery_box_extended, list( /obj/structure/mystery_box/proc/present_weapon() visible_message(span_notice("[src] presents [presented_item]!"), vision_distance = COMBAT_MESSAGE_RANGE) box_state = MYSTERY_BOX_PRESENTING - box_expire_timer = addtimer(CALLBACK(src, .proc/start_expire_offer), MBOX_DURATION_PRESENTING, TIMER_STOPPABLE) + box_expire_timer = addtimer(CALLBACK(src, PROC_REF(start_expire_offer)), MBOX_DURATION_PRESENTING, TIMER_STOPPABLE) /// The prize is still claimable, but the animation will show it start to recede back into the box /obj/structure/mystery_box/proc/start_expire_offer() presented_item.expire_animation() - box_close_timer = addtimer(CALLBACK(src, .proc/close_box), MBOX_DURATION_EXPIRING, TIMER_STOPPABLE) + box_close_timer = addtimer(CALLBACK(src, PROC_REF(close_box)), MBOX_DURATION_EXPIRING, TIMER_STOPPABLE) /// The box is closed, whether because the prize fully expired, or it was claimed. Start resetting all of the state stuff /obj/structure/mystery_box/proc/close_box() @@ -167,7 +167,7 @@ GLOBAL_LIST_INIT(mystery_box_extended, list( playsound(src, crate_close_sound, 100) box_close_timer = null box_expire_timer = null - addtimer(CALLBACK(src, .proc/ready_again), MBOX_DURATION_STANDBY) + addtimer(CALLBACK(src, PROC_REF(ready_again)), MBOX_DURATION_STANDBY) /// The cooldown between activations has finished, shake to show that /obj/structure/mystery_box/proc/ready_again() @@ -260,9 +260,9 @@ GLOBAL_LIST_INIT(mystery_box_extended, list( change_delay += change_delay_delta change_counter += change_delay selected_path = pick(parent_box.valid_types) - addtimer(CALLBACK(src, .proc/update_random_icon, selected_path), change_counter) + addtimer(CALLBACK(src, PROC_REF(update_random_icon), selected_path), change_counter) - addtimer(CALLBACK(src, .proc/present_item), MBOX_DURATION_CHOOSING) + addtimer(CALLBACK(src, PROC_REF(present_item)), MBOX_DURATION_CHOOSING) /// animate() isn't up to the task for queueing up icon changes, so this is the proc we call with timers to update our icon /obj/mystery_box_item/proc/update_random_icon(new_item_type) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index b8ffc15c096..d692b9af1ee 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -42,7 +42,7 @@ var/action = anchored ? "unscrews [src] from" : "screws [src] to" var/uraction = anchored ? "unscrew [src] from" : "screw [src] to" user.visible_message(span_warning("[user] [action] the floor."), span_notice("You start to [uraction] the floor..."), span_hear("You hear rustling noises.")) - if(!W.use_tool(src, user, 100, volume=100, extra_checks = CALLBACK(src, .proc/check_anchored_state, anchored))) + if(!W.use_tool(src, user, 100, volume=100, extra_checks = CALLBACK(src, PROC_REF(check_anchored_state), anchored))) return TRUE set_anchored(!anchored) update_atmos_behaviour() diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index c8e4cc31d8e..37167611439 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -28,7 +28,7 @@ if(density && flags_1 & ON_BORDER_1) // blocks normal movement from and to the direction it's facing. var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -74,7 +74,7 @@ if(flags_1&NODECONSTRUCT_1) return to_chat(user, span_notice("You begin to [anchored ? "unfasten the railing from":"fasten the railing to"] the floor...")) - if(I.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, .proc/check_anchored, anchored))) + if(I.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_anchored), anchored))) set_anchored(!anchored) to_chat(user, span_notice("You [anchored ? "fasten the railing to":"unfasten the railing from"] the floor.")) return TRUE diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 113a2771afe..36cf270349a 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -89,7 +89,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) soundloop = new(src, FALSE) AddComponent(/datum/component/plumbing/simple_demand, extend_pipe_to_edge = TRUE) 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) @@ -227,10 +227,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/shower, (-16)) // 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 && actually_on && current_temperature != SHOWER_FREEZING) - addtimer(CALLBACK(src, .proc/make_mist), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(make_mist)), 5 SECONDS) if(mist && !(actually_on && current_temperature != SHOWER_FREEZING)) - addtimer(CALLBACK(src, .proc/clear_mist), 25 SECONDS) + addtimer(CALLBACK(src, PROC_REF(clear_mist)), 25 SECONDS) /obj/machinery/shower/proc/make_mist() var/obj/effect/mist/mist = locate() in loc diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm index 7a29bb7efa3..4a0aac25ca4 100644 --- a/code/game/objects/structures/stairs.dm +++ b/code/game/objects/structures/stairs.dm @@ -46,7 +46,7 @@ update_surrounding() var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -80,7 +80,7 @@ if(!isobserver(leaving) && isTerminator() && direction == dir) leaving.set_currently_z_moving(CURRENTLY_Z_ASCENDING) - INVOKE_ASYNC(src, .proc/stair_ascend, leaving) + INVOKE_ASYNC(src, PROC_REF(stair_ascend), leaving) leaving.Bump(src) return COMPONENT_ATOM_BLOCK_EXIT @@ -122,7 +122,7 @@ if(listeningTo) UnregisterSignal(listeningTo, COMSIG_TURF_MULTIZ_NEW) var/turf/open/openspace/T = get_step_multiz(get_turf(src), UP) - RegisterSignal(T, COMSIG_TURF_MULTIZ_NEW, .proc/on_multiz_new) + RegisterSignal(T, COMSIG_TURF_MULTIZ_NEW, PROC_REF(on_multiz_new)) listeningTo = T /obj/structure/stairs/proc/force_open_above() diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 5a754cd1ba2..775a5a60053 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -44,7 +44,7 @@ AddElement(/datum/element/climbable) var/static/list/loc_connections = list( - COMSIG_CARBON_DISARM_COLLIDE = .proc/table_carbon, + COMSIG_CARBON_DISARM_COLLIDE = PROC_REF(table_carbon), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -356,7 +356,7 @@ /obj/structure/table/rolling/AfterPutItemOnTable(obj/item/I, mob/living/user) . = ..() attached_items += I - RegisterSignal(I, COMSIG_MOVABLE_MOVED, .proc/RemoveItemFromTable) //Listen for the pickup event, unregister on pick-up so we aren't moved + RegisterSignal(I, COMSIG_MOVABLE_MOVED, PROC_REF(RemoveItemFromTable)) //Listen for the pickup event, unregister on pick-up so we aren't moved /obj/structure/table/rolling/proc/RemoveItemFromTable(datum/source, newloc, dir) SIGNAL_HANDLER @@ -396,7 +396,7 @@ /obj/structure/table/glass/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -408,7 +408,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) @@ -702,8 +702,8 @@ if(computer) computer.table = src break - RegisterSignal(loc, COMSIG_ATOM_ENTERED, .proc/mark_patient) - RegisterSignal(loc, COMSIG_ATOM_EXITED, .proc/unmark_patient) + RegisterSignal(loc, COMSIG_ATOM_ENTERED, PROC_REF(mark_patient)) + RegisterSignal(loc, COMSIG_ATOM_EXITED, PROC_REF(unmark_patient)) /obj/structure/table/optable/Destroy() if(computer && computer.table == src) @@ -723,7 +723,7 @@ SIGNAL_HANDLER if(!istype(potential_patient)) return - RegisterSignal(potential_patient, COMSIG_LIVING_SET_BODY_POSITION, .proc/recheck_patient) + RegisterSignal(potential_patient, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(recheck_patient)) recheck_patient(potential_patient) // In case the mob is already lying down before they entered. /// Unmark the potential patient. diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm index fee1e485a00..d04b27b360f 100644 --- a/code/game/objects/structures/training_machine.dm +++ b/code/game/objects/structures/training_machine.dm @@ -133,7 +133,7 @@ attached_item.forceMove(src) attached_item.vis_flags |= VIS_INHERIT_ID | VIS_INHERIT_PLANE vis_contents += attached_item - RegisterSignal(attached_item, COMSIG_PARENT_QDELETING, .proc/on_attached_delete) + RegisterSignal(attached_item, COMSIG_PARENT_QDELETING, PROC_REF(on_attached_delete)) handle_density() /** diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 951e1acbee2..87b821d1104 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -108,7 +108,7 @@ if(open_status == STATION_TUBE_CLOSED) icon_state = "opening_[base_icon]" open_status = STATION_TUBE_OPENING - addtimer(CALLBACK(src, .proc/finish_animation), OPEN_DURATION) + addtimer(CALLBACK(src, PROC_REF(finish_animation)), OPEN_DURATION) /obj/structure/transit_tube/station/proc/finish_animation() switch(open_status) @@ -131,7 +131,7 @@ if(open_status == STATION_TUBE_OPEN) icon_state = "closing_[base_icon]" open_status = STATION_TUBE_CLOSING - addtimer(CALLBACK(src, .proc/finish_animation), CLOSE_DURATION) + addtimer(CALLBACK(src, PROC_REF(finish_animation)), CLOSE_DURATION) /obj/structure/transit_tube/station/proc/launch_pod() if(launch_cooldown >= world.time) @@ -153,7 +153,7 @@ /obj/structure/transit_tube/station/pod_stopped(obj/structure/transit_tube_pod/pod, from_dir) pod_moving = TRUE - addtimer(CALLBACK(src, .proc/start_stopped, pod), 5) + addtimer(CALLBACK(src, PROC_REF(start_stopped), pod), 5) /obj/structure/transit_tube/station/proc/start_stopped(obj/structure/transit_tube_pod/pod) if(QDELETED(pod)) @@ -162,7 +162,7 @@ pod.setDir(tube_dirs[1]) //turning the pod around for next launch. launch_cooldown = world.time + cooldown_delay open_animation() - addtimer(CALLBACK(src, .proc/finish_stopped, pod), OPEN_DURATION + 2) + addtimer(CALLBACK(src, PROC_REF(finish_stopped), pod), OPEN_DURATION + 2) /obj/structure/transit_tube/station/proc/finish_stopped(obj/structure/transit_tube_pod/pod) pod_moving = FALSE diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index 8f73c76d48a..d99d3aecc40 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -16,7 +16,7 @@ /obj/structure/c_transit_tube/Initialize(mapload) . = ..() - AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, .proc/AfterRotation)) + AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, PROC_REF(AfterRotation))) /obj/structure/c_transit_tube/proc/can_wrench_in_loc(mob/user) var/turf/source_turf = get_turf(loc) @@ -45,7 +45,7 @@ return to_chat(user, span_notice("You start attaching the [name]...")) add_fingerprint(user) - if(I.use_tool(src, user, 2 SECONDS, volume=50, extra_checks=CALLBACK(src, .proc/can_wrench_in_loc, user))) + if(I.use_tool(src, user, 2 SECONDS, volume=50, extra_checks=CALLBACK(src, PROC_REF(can_wrench_in_loc), user))) to_chat(user, span_notice("You attach the [name].")) var/obj/structure/transit_tube/R = new build_type(loc, dir) transfer_fingerprints_to(R) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index f8b1fe46586..7d8808dc3de 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -98,9 +98,9 @@ current_tube = tube var/datum/move_loop/engine = SSmove_manager.force_move_dir(src, dir, 0, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) - RegisterSignal(engine, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/before_pipe_transfer) - RegisterSignal(engine, COMSIG_MOVELOOP_POSTPROCESS, .proc/after_pipe_transfer) - RegisterSignal(engine, COMSIG_PARENT_QDELETING, .proc/engine_finish) + RegisterSignal(engine, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(before_pipe_transfer)) + RegisterSignal(engine, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(after_pipe_transfer)) + RegisterSignal(engine, COMSIG_PARENT_QDELETING, PROC_REF(engine_finish)) calibrate_engine(engine) /obj/structure/transit_tube_pod/proc/before_pipe_transfer(datum/move_loop/move/source) diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index a8a38991ee9..67b452ed3a8 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -26,7 +26,7 @@ spark_system.attach(src) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered + COMSIG_ATOM_ENTERED = PROC_REF(on_entered) ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 3852bc3267f..a5a75d7b7df 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -36,7 +36,7 @@ air_update_turf(TRUE, TRUE) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 997c5b8fbe1..b9604a82e10 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -55,12 +55,12 @@ explosion_block = EXPLOSION_BLOCK_PROC flags_1 |= ALLOW_DARK_PAINTS_1 - RegisterSignal(src, COMSIG_OBJ_PAINTED, .proc/on_painted) + RegisterSignal(src, COMSIG_OBJ_PAINTED, PROC_REF(on_painted)) AddElement(/datum/element/atmos_sensitive, mapload) - AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM, AfterRotation = CALLBACK(src,.proc/AfterRotation)) + AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM, AfterRotation = CALLBACK(src, PROC_REF(AfterRotation))) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) if (flags_1 & ON_BORDER_1) @@ -206,23 +206,23 @@ switch(state) if(WINDOW_SCREWED_TO_FRAME) to_chat(user, span_notice("You begin to unscrew the window from the frame...")) - if(tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) state = WINDOW_IN_FRAME to_chat(user, span_notice("You unfasten the window from the frame.")) if(WINDOW_IN_FRAME) to_chat(user, span_notice("You begin to screw the window to the frame...")) - if(tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) state = WINDOW_SCREWED_TO_FRAME to_chat(user, span_notice("You fasten the window to the frame.")) if(WINDOW_OUT_OF_FRAME) if(anchored) to_chat(user, span_notice("You begin to unscrew the frame from the floor...")) - if(tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) set_anchored(FALSE) to_chat(user, span_notice("You unfasten the frame from the floor.")) else to_chat(user, span_notice("You begin to screw the frame to the floor...")) - if(tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) set_anchored(TRUE) to_chat(user, span_notice("You fasten the frame to the floor.")) return TOOL_ACT_TOOLTYPE_SUCCESS @@ -234,7 +234,7 @@ return FALSE to_chat(user, span_notice("You begin to disassemble [src]...")) - if(!tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(!tool.use_tool(src, user, decon_speed, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) return TOOL_ACT_TOOLTYPE_SUCCESS var/obj/item/stack/sheet/G = new glass_type(user.loc, glass_amount) if (!QDELETED(G)) @@ -251,12 +251,12 @@ switch(state) if(WINDOW_IN_FRAME) to_chat(user, span_notice("You begin to lever the window out of the frame...")) - if(tool.use_tool(src, user, 10 SECONDS, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(tool.use_tool(src, user, 10 SECONDS, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) state = WINDOW_OUT_OF_FRAME to_chat(user, span_notice("You pry the window out of the frame.")) if(WINDOW_OUT_OF_FRAME) to_chat(user, span_notice("You begin to lever the window back into the frame...")) - if(tool.use_tool(src, user, 5 SECONDS, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(tool.use_tool(src, user, 5 SECONDS, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) state = WINDOW_SCREWED_TO_FRAME to_chat(user, span_notice("You pry the window back into the frame.")) @@ -463,7 +463,7 @@ if(tool.use_tool(src, user, 15 SECONDS, volume = 100)) to_chat(user, span_notice("The security screws are glowing white hot and look ready to be removed.")) state = RWINDOW_BOLTS_HEATED - addtimer(CALLBACK(src, .proc/cool_bolts), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(cool_bolts)), 30 SECONDS) else if (tool.tool_behaviour) to_chat(user, span_warning("The security screws need to be heated first!")) @@ -520,7 +520,7 @@ if((flags_1 & NODECONSTRUCT_1) || (state != WINDOW_OUT_OF_FRAME)) return FALSE to_chat(user, span_notice("You begin to lever the window back into the frame...")) - if(tool.use_tool(src, user, 10 SECONDS, volume = 75, extra_checks = CALLBACK(src, .proc/check_state_and_anchored, state, anchored))) + if(tool.use_tool(src, user, 10 SECONDS, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_state_and_anchored), state, anchored))) state = RWINDOW_SECURE to_chat(user, span_notice("You pry the window back into the frame.")) return TOOL_ACT_TOOLTYPE_SUCCESS diff --git a/code/game/say.dm b/code/game/say.dm index 522ecf132a4..e18b7d20a57 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -45,8 +45,8 @@ GLOBAL_LIST_INIT(freqtospan, list( * Attempts to / checks if our movable can speak the passed message. * CAN include feedback messages about why someone can or can't speak * - * Used in [proc/say] and other methods of speech (radios) after a movable has inputted some message. - * If you just want to check if the movable is able to speak in character, use [proc/can_speak] instead. + * Used in [proc/say] and other methods of speech (radios)) after a movable has inputted some message. + * If you just want to check if the movable is able to speak in character, use [proc/can_speak] instead.) */ /atom/movable/proc/try_speak(message, ignore_spam = FALSE, forced = FALSE) return TRUE diff --git a/code/game/turfs/closed/minerals.dm b/code/game/turfs/closed/minerals.dm index 0f96254beb6..6748c97d054 100644 --- a/code/game/turfs/closed/minerals.dm +++ b/code/game/turfs/closed/minerals.dm @@ -59,7 +59,7 @@ var/obj/item/held_item = bumping.get_active_held_item() // !held_item exists to be nice to snow. the other bit is for pickaxes obviously if(!held_item || held_item.tool_behaviour == TOOL_MINING) - INVOKE_ASYNC(bumping, /mob.proc/ClickOn, src) + INVOKE_ASYNC(bumping, TYPE_PROC_REF(/mob, ClickOn), src) /turf/closed/mineral/proc/Spread_Vein() var/spreadChance = initial(mineralType.spreadChance) @@ -151,7 +151,7 @@ if(defer_change) // TODO: make the defer change var a var for any changeturf flag flags = CHANGETURF_DEFER_CHANGE var/turf/open/mined = ScrapeAway(null, flags) - addtimer(CALLBACK(src, .proc/AfterChange, flags, old_type), 1, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(AfterChange), flags, old_type), 1, TIMER_UNIQUE) playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction mined.update_visuals() @@ -736,7 +736,7 @@ if(defer_change) // TODO: make the defer change var a var for any changeturf flag flags = CHANGETURF_DEFER_CHANGE var/turf/open/mined = ScrapeAway(null, flags) - addtimer(CALLBACK(src, .proc/AfterChange, flags, old_type), 1, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(AfterChange), flags, old_type), 1, TIMER_UNIQUE) mined.update_visuals() /turf/closed/mineral/gibtonite/volcanic @@ -794,7 +794,7 @@ if(defer_change) // TODO: make the defer change var a var for any changeturf flag flags = CHANGETURF_DEFER_CHANGE var/turf/open/mined = ScrapeAway(null, flags) - addtimer(CALLBACK(src, .proc/AfterChange, flags, old_type), 1, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(AfterChange), flags, old_type), 1, TIMER_UNIQUE) playsound(src, 'sound/effects/break_stone.ogg', 50, TRUE) //beautiful destruction mined.update_visuals() H.mind?.adjust_experience(/datum/skill/mining, 100) //yay! diff --git a/code/game/turfs/closed/wall/mineral_walls.dm b/code/game/turfs/closed/wall/mineral_walls.dm index 02e4e2d5646..9c66d299f8e 100644 --- a/code/game/turfs/closed/wall/mineral_walls.dm +++ b/code/game/turfs/closed/wall/mineral_walls.dm @@ -100,7 +100,7 @@ /turf/closed/wall/mineral/uranium/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ATOM_PROPAGATE_RAD_PULSE, .proc/radiate) + RegisterSignal(src, COMSIG_ATOM_PROPAGATE_RAD_PULSE, PROC_REF(radiate)) /turf/closed/wall/mineral/uranium/proc/radiate() SIGNAL_HANDLER diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index bc1f275ae9f..89ce7c7f4fe 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -154,7 +154,7 @@ /turf/open/floor/proc/crush() break_tile() -/turf/open/floor/ChangeTurf(path, new_baseturf, flags) +/turf/open/floor/ChangeTurf(path, new_baseturfs, flags) if(!isfloorturf(src)) return ..() //fucking turfs switch the fucking src of the fucking running procs if(!ispath(path, /turf/open/floor)) diff --git a/code/game/turfs/open/floor/light_floor.dm b/code/game/turfs/open/floor/light_floor.dm index d1378c32707..bed7ef6de45 100644 --- a/code/game/turfs/open/floor/light_floor.dm +++ b/code/game/turfs/open/floor/light_floor.dm @@ -106,7 +106,7 @@ icon_state = "light_off" return ..() -/turf/open/floor/light/ChangeTurf(path, new_baseturf, flags) +/turf/open/floor/light/ChangeTurf(path, new_baseturfs, flags) set_light(0) return ..() @@ -123,7 +123,7 @@ return if(!can_modify_colour) return FALSE - var/choice = show_radial_menu(user,src, lighttile_designs, custom_check = CALLBACK(src, .proc/check_menu, user, I), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user,src, lighttile_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user, I), radius = 36, require_near = TRUE) if(!choice) return FALSE currentcolor = choice diff --git a/code/game/turfs/open/floor/reinf_floor.dm b/code/game/turfs/open/floor/reinf_floor.dm index bd44a50059e..15c40aaca8a 100644 --- a/code/game/turfs/open/floor/reinf_floor.dm +++ b/code/game/turfs/open/floor/reinf_floor.dm @@ -215,7 +215,7 @@ be_removed() return ..() -/turf/open/floor/engine/cult/ChangeTurf(path, new_baseturf, flags) +/turf/open/floor/engine/cult/ChangeTurf(path, new_baseturfs, flags) if(path != type) be_removed() return ..() diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index bcb89206af7..f24d5d8fb52 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -18,7 +18,7 @@ /turf/open/openspace/Initialize(mapload) // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker . = ..() - RegisterSignal(src, COMSIG_ATOM_INITIALIZED_ON, .proc/on_atom_created) + RegisterSignal(src, COMSIG_ATOM_INITIALIZED_ON, PROC_REF(on_atom_created)) var/area/our_area = loc if(istype(our_area, /area/space)) force_no_gravity = TRUE @@ -57,7 +57,7 @@ SIGNAL_HANDLER if(ismovable(created_atom)) //Drop it only when it's finished initializing, not before. - addtimer(CALLBACK(src, .proc/zfall_if_on_turf, created_atom), 0 SECONDS) + addtimer(CALLBACK(src, PROC_REF(zfall_if_on_turf), created_atom), 0 SECONDS) /turf/open/openspace/proc/zfall_if_on_turf(atom/movable/movable) if(QDELETED(movable) || movable.loc != src) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index c308b3e1ecd..f741b56de5d 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -85,7 +85,7 @@ GLOBAL_LIST_EMPTY(station_turfs) var/pathing_pass_method = TURF_PATHING_PASS_DENSITY /turf/vv_edit_var(var_name, new_value) - var/static/list/banned_edits = list(NAMEOF(src, x), NAMEOF(src, y), NAMEOF(src, z)) + var/static/list/banned_edits = list(NAMEOF_STATIC(src, x), NAMEOF_STATIC(src, y), NAMEOF_STATIC(src, z)) if(var_name in banned_edits) return FALSE . = ..() diff --git a/code/game/world.dm b/code/game/world.dm index 0a4470c5d32..2f0bd5e5080 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -104,11 +104,11 @@ GLOBAL_VAR(restart_counter) CONFIG_SET(number/round_end_countdown, 0) var/datum/callback/cb #ifdef UNIT_TESTS - cb = CALLBACK(GLOBAL_PROC, /proc/RunUnitTests) + cb = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(RunUnitTests)) #else cb = VARSET_CALLBACK(SSticker, force_ending, TRUE) #endif - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/_addtimer, cb, 10 SECONDS)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), cb, 10 SECONDS)) /world/proc/SetupLogs() @@ -314,7 +314,7 @@ GLOBAL_VAR(restart_counter) AUXTOOLS_FULL_SHUTDOWN(AUXLUA) var/debug_server = world.GetConfig("env", "AUXTOOLS_DEBUG_DLL") if (debug_server) - call(debug_server, "auxtools_shutdown")() + LIBCALL(debug_server, "auxtools_shutdown")() . = ..() /* SKYRAT EDIT CHANGE - MOVED TO MODULAR @@ -410,7 +410,7 @@ GLOBAL_VAR(restart_counter) else CRASH("Unsupported platform: [system_type]") - var/init_result = call(library, "init")() + var/init_result = LIBCALL(library, "init")() if (init_result != "0") CRASH("Error initializing byond-tracy: [init_result]") diff --git a/code/modules/NTNet/netdata.dm b/code/modules/NTNet/netdata.dm index 3ba782ff96e..04224033356 100644 --- a/code/modules/NTNet/netdata.dm +++ b/code/modules/NTNet/netdata.dm @@ -14,7 +14,7 @@ server_id = conn.hardware_id server_network = conn.network.network_id src.port = port - RegisterSignal(conn, COMSIG_COMPONENT_NTNET_PORT_DESTROYED, .proc/_server_disconnected) + RegisterSignal(conn, COMSIG_COMPONENT_NTNET_PORT_DESTROYED, PROC_REF(_server_disconnected)) ..() /datum/netlink/proc/_server_disconnected(datum/component/com) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index f04ec4a104f..6ee40c7dac1 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -113,7 +113,7 @@ return GLOB.stickybanadminexemptions[ckey] = world.time stoplag() // sleep a byond tick - GLOB.stickbanadminexemptiontimerid = addtimer(CALLBACK(GLOBAL_PROC, /proc/restore_stickybans), 5 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE) + GLOB.stickbanadminexemptiontimerid = addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(restore_stickybans)), 5 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE) return var/list/ban = ..() //default pager ban stuff diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 54a3e83e58d..aff688f022c 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -240,7 +240,7 @@ GLOBAL_PROTECT(admin_verbs_debug) /client/proc/debug_spell_requirements, /client/proc/debug_hallucination_weighted_list_per_type, ) -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) /// SKYRAT EDIT BEGIN - Player Rank Manager - ORIGINAL: GLOBAL_LIST_INIT(admin_verbs_permissions, list(/client/proc/edit_admin_permissions)) GLOBAL_LIST_INIT(admin_verbs_permissions, list( @@ -773,7 +773,7 @@ GLOBAL_PROTECT(admin_verbs_poll) if(!istype(T)) to_chat(src, span_notice("You can only give a disease to a mob of type /mob/living."), confidential = TRUE) return - var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in sort_list(SSdisease.diseases, /proc/cmp_typepaths_asc) + var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in sort_list(SSdisease.diseases, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!D) return T.ForceContractDisease(new D, FALSE, TRUE) diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index f1e87ba29a3..042e27f76d5 100644 --- a/code/modules/admin/antag_panel.dm +++ b/code/modules/admin/antag_panel.dm @@ -113,7 +113,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 d5ef8ac20a0..a76a3e4d9c4 100644 --- a/code/modules/admin/check_antagonists.dm +++ b/code/modules/admin/check_antagonists.dm @@ -67,7 +67,7 @@ all_antagonists -= X sections += T.antag_listing_entry() - sortTim(all_antagonists, /proc/cmp_antag_category) + sortTim(all_antagonists, GLOBAL_PROC_REF(cmp_antag_category)) var/current_category var/list/current_section = list() diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm index 79640e37d41..7a7fb3130b7 100644 --- a/code/modules/admin/create_object.dm +++ b/code/modules/admin/create_object.dm @@ -19,7 +19,7 @@ /obj/item, /obj/item/clothing, /obj/item/stack, /obj/item, /obj/item/reagent_containers, /obj/item/gun) - var/path = input("Select the path of the object you wish to create.", "Path", /obj) in sort_list(create_object_forms, /proc/cmp_typepaths_asc) + var/path = input("Select the path of the object you wish to create.", "Path", /obj) in sort_list(create_object_forms, GLOBAL_PROC_REF(cmp_typepaths_asc)) var/html_form = create_object_forms[path] if (!html_form) diff --git a/code/modules/admin/greyscale_modify_menu.dm b/code/modules/admin/greyscale_modify_menu.dm index 6283869905b..9d87009ffee 100644 --- a/code/modules/admin/greyscale_modify_menu.dm +++ b/code/modules/admin/greyscale_modify_menu.dm @@ -38,7 +38,7 @@ /datum/greyscale_modify_menu/New(atom/target, client/user, list/allowed_configs, datum/callback/apply_callback, starting_icon_state="", starting_config, starting_colors) src.target = target src.user = user - src.apply_callback = apply_callback || CALLBACK(src, .proc/DefaultApply) + src.apply_callback = apply_callback || CALLBACK(src, PROC_REF(DefaultApply)) icon_state = starting_icon_state SetupConfigOwner() @@ -58,7 +58,7 @@ ReadColorsFromString(starting_colors || target?.greyscale_colors) if(target) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/ui_close) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(ui_close)) refresh_preview() @@ -237,12 +237,12 @@ This is highly likely to cause massive amounts of lag as every object in the gam if(config) UnregisterSignal(config, COMSIG_GREYSCALE_CONFIG_REFRESHED) config = new_config - RegisterSignal(config, COMSIG_GREYSCALE_CONFIG_REFRESHED, .proc/queue_refresh) + RegisterSignal(config, COMSIG_GREYSCALE_CONFIG_REFRESHED, PROC_REF(queue_refresh)) /datum/greyscale_modify_menu/proc/queue_refresh() SIGNAL_HANDLER refreshing = TRUE - addtimer(CALLBACK(src, .proc/refresh_preview), 1 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(refresh_preview)), 1 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) /datum/greyscale_modify_menu/proc/refresh_preview() for(var/i in length(split_colors) + 1 to config.expected_colors) diff --git a/code/modules/admin/smites/berforate.dm b/code/modules/admin/smites/berforate.dm index a2bcd8747fc..3d05afd519d 100644 --- a/code/modules/admin/smites/berforate.dm +++ b/code/modules/admin/smites/berforate.dm @@ -46,7 +46,7 @@ var/shots_this_limb = 0 for (var/_iter_turf in shuffle(open_adj_turfs)) var/turf/iter_turf = _iter_turf - addtimer(CALLBACK(GLOBAL_PROC, .proc/firing_squad, dude, iter_turf, limb.body_zone, wound_bonuses[wound_bonus_rep], damage), delay_counter) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(firing_squad), dude, iter_turf, limb.body_zone, wound_bonuses[wound_bonus_rep], damage), delay_counter) delay_counter += delay_per_shot shots_this_limb += 1 if (shots_this_limb > shots_per_limb_per_rep) diff --git a/code/modules/admin/smites/bread.dm b/code/modules/admin/smites/bread.dm index ae33bdb566a..f66214d37b4 100644 --- a/code/modules/admin/smites/bread.dm +++ b/code/modules/admin/smites/bread.dm @@ -9,6 +9,6 @@ var/mutable_appearance/bread_appearance = mutable_appearance('icons/obj/food/burgerbread.dmi', "bread") var/mutable_appearance/transform_scanline = mutable_appearance('icons/effects/effects.dmi', "transform_effect") target.transformation_animation(bread_appearance,time = BREADIFY_TIME, transform_overlay=transform_scanline) - addtimer(CALLBACK(GLOBAL_PROC, .proc/breadify, target), BREADIFY_TIME) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(breadify), target), BREADIFY_TIME) #undef BREADIFY_TIME diff --git a/code/modules/admin/smites/nugget.dm b/code/modules/admin/smites/nugget.dm index 4d3ed826a7b..4525f674f2c 100644 --- a/code/modules/admin/smites/nugget.dm +++ b/code/modules/admin/smites/nugget.dm @@ -15,7 +15,7 @@ var/obj/item/bodypart/limb = _limb if (limb.body_part == HEAD || limb.body_part == CHEST) continue - addtimer(CALLBACK(limb, /obj/item/bodypart/.proc/dismember), timer) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, carbon_target, 'sound/effects/cartoon_pop.ogg', 70), timer) - addtimer(CALLBACK(carbon_target, /mob/living/.proc/spin, 4, 1), timer - 0.4 SECONDS) + addtimer(CALLBACK(limb, TYPE_PROC_REF(/obj/item/bodypart/, dismember)), timer) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), carbon_target, 'sound/effects/cartoon_pop.ogg', 70), timer) + addtimer(CALLBACK(carbon_target, TYPE_PROC_REF(/mob/living/, spin), 4, 1), timer - 0.4 SECONDS) timer += 2 SECONDS diff --git a/code/modules/admin/smites/puzzgrid.dm b/code/modules/admin/smites/puzzgrid.dm index 80b7f795ba9..d2f2a197899 100644 --- a/code/modules/admin/smites/puzzgrid.dm +++ b/code/modules/admin/smites/puzzgrid.dm @@ -68,8 +68,8 @@ /datum/component/puzzgrid, \ puzzgrid = puzzgrid, \ timer = timer, \ - on_victory_callback = CALLBACK(src, .proc/on_victory), \ - on_fail_callback = CALLBACK(src, gib_on_loss ? .proc/loss_gib : .proc/loss_restart), \ + on_victory_callback = CALLBACK(src, PROC_REF(on_victory)), \ + on_fail_callback = CALLBACK(src, gib_on_loss ? PROC_REF(loss_gib) : PROC_REF(loss_restart)), \ ) /obj/structure/puzzgrid_effect/proc/on_victory() @@ -111,7 +111,7 @@ visible_message(span_danger("The fiendishly hard puzzle shapeshifts into a different, equally as challenging puzzle!")) // Defer until after the fail proc finishes, since that will qdel the component. - addtimer(CALLBACK(src, .proc/add_puzzgrid_component, puzzgrid), 0) + addtimer(CALLBACK(src, PROC_REF(add_puzzgrid_component), puzzgrid), 0) /obj/structure/puzzgrid_effect/proc/remove_traits() REMOVE_TRAIT(victim, TRAIT_HANDS_BLOCKED, "[type]") diff --git a/code/modules/admin/tag.dm b/code/modules/admin/tag.dm index 15ac2d96d2c..432894e3b3f 100644 --- a/code/modules/admin/tag.dm +++ b/code/modules/admin/tag.dm @@ -10,7 +10,7 @@ return LAZYADD(tagged_datums, target_datum) - RegisterSignal(target_datum, COMSIG_PARENT_QDELETING, .proc/handle_tagged_del, override = TRUE) + RegisterSignal(target_datum, COMSIG_PARENT_QDELETING, PROC_REF(handle_tagged_del), override = TRUE) to_chat(owner, span_notice("[target_datum] has been tagged.")) /// Get ahead of the curve with deleting diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 2945bd33bb2..b255167ad73 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -645,7 +645,7 @@ L.Unconscious(100) sleep(0.5 SECONDS) L.forceMove(pick(GLOB.tdome1)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 1)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 1)") @@ -671,7 +671,7 @@ L.Unconscious(100) sleep(0.5 SECONDS) L.forceMove(pick(GLOB.tdome2)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Team 2)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Team 2)") @@ -694,7 +694,7 @@ L.Unconscious(100) sleep(0.5 SECONDS) L.forceMove(pick(GLOB.tdomeadmin)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Admin.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Admin.)") @@ -725,7 +725,7 @@ L.Unconscious(100) sleep(0.5 SECONDS) L.forceMove(pick(GLOB.tdomeobserve)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), L, span_adminnotice("You have been sent to the Thunderdome.")), 5 SECONDS) log_admin("[key_name(usr)] has sent [key_name(L)] to the thunderdome. (Observer.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(L)] to the thunderdome. (Observer.)") diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index 2b95e966de1..29d1d13e0a7 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -493,7 +493,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null options |= SDQL2_OPTION_SEQUENTIAL /datum/sdql2_query/proc/ARun() - INVOKE_ASYNC(src, .proc/Run) + INVOKE_ASYNC(src, PROC_REF(Run)) /datum/sdql2_query/proc/Run() if(SDQL2_IS_RUNNING) diff --git a/code/modules/admin/verbs/admin.dm b/code/modules/admin/verbs/admin.dm index b6c5583d43f..eabc306684e 100644 --- a/code/modules/admin/verbs/admin.dm +++ b/code/modules/admin/verbs/admin.dm @@ -64,7 +64,7 @@ var/list/msg = list() msg += "Playtime ReportPlaytime:
" src << browse(msg.Join(), "window=Player_playtime_check") diff --git a/code/modules/admin/verbs/adminevents.dm b/code/modules/admin/verbs/adminevents.dm index 42ecdd18b17..d91e009dd78 100644 --- a/code/modules/admin/verbs/adminevents.dm +++ b/code/modules/admin/verbs/adminevents.dm @@ -287,7 +287,7 @@ if(!holder) return - var/weather_type = input("Choose a weather", "Weather") as null|anything in sort_list(subtypesof(/datum/weather), /proc/cmp_typepaths_asc) + var/weather_type = input("Choose a weather", "Weather") as null|anything in sort_list(subtypesof(/datum/weather), GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!weather_type) return @@ -316,7 +316,7 @@ var/mob/living/marked_mob = holder.marked_datum - var/list/all_mob_actions = sort_list(subtypesof(/datum/action/cooldown/mob_cooldown), /proc/cmp_typepaths_asc) + var/list/all_mob_actions = sort_list(subtypesof(/datum/action/cooldown/mob_cooldown), GLOBAL_PROC_REF(cmp_typepaths_asc)) var/ability_type = tgui_input_list(usr, "Choose an ability", "Ability", all_mob_actions) diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 29425ca0e7d..5f33ba452bf 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -251,7 +251,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) ticket_interactions = list() player_interactions = list() - addtimer(CALLBACK(src, .proc/add_to_ping_ss, 2 MINUTES)) //SKYRAT EDIT ADDITION - Ticket Ping | this is not responsible for the notification itself, but only for adding the ticket to the list of those to notify. + addtimer(CALLBACK(src, PROC_REF(add_to_ping_ss), 2 MINUTES)) //SKYRAT EDIT ADDITION - Ticket Ping | this is not responsible for the notification itself, but only for adding the ticket to the list of those to notify. if(is_bwoink) AddInteraction("[key_name_admin(usr)] PM'd [LinkedReplyName()]", player_message = "[key_name_admin(usr, include_name = FALSE)] PM'd [LinkedReplyName()]") message_admins("Ticket [TicketHref("#[id]")] created") diff --git a/code/modules/admin/verbs/ai_triumvirate.dm b/code/modules/admin/verbs/ai_triumvirate.dm index 1cc7c01a8a0..ca7ebfe7cc4 100644 --- a/code/modules/admin/verbs/ai_triumvirate.dm +++ b/code/modules/admin/verbs/ai_triumvirate.dm @@ -11,7 +11,7 @@ GLOBAL_DATUM(triple_ai_controller, /datum/triple_ai_controller) /datum/triple_ai_controller/New() . = ..() - RegisterSignal(SSjob, COMSIG_OCCUPATIONS_DIVIDED, .proc/on_occupations_divided) + RegisterSignal(SSjob, COMSIG_OCCUPATIONS_DIVIDED, PROC_REF(on_occupations_divided)) /datum/triple_ai_controller/proc/on_occupations_divided(datum/source) SIGNAL_HANDLER diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 6bd9bdac2b8..b001099d283 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -7,7 +7,7 @@ if(!SSticker) return - var/datum/cinematic/choice = tgui_input_list(usr, "Chose a cinematic to play to everyone in the server.", "Choose Cinematic", sort_list(subtypesof(/datum/cinematic), /proc/cmp_typepaths_asc)) + var/datum/cinematic/choice = tgui_input_list(usr, "Chose a cinematic to play to everyone in the server.", "Choose Cinematic", sort_list(subtypesof(/datum/cinematic), GLOBAL_PROC_REF(cmp_typepaths_asc))) if(!choice || !ispath(choice, /datum/cinematic)) return diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index c485faccd79..4dbe39e2d7e 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -34,7 +34,7 @@ tgui_alert(usr,"Wait until the game starts") return log_admin("[key_name(src)] has robotized [M.key].") - INVOKE_ASYNC(M, /mob.proc/Robotize) + INVOKE_ASYNC(M, TYPE_PROC_REF(/mob, Robotize)) /client/proc/poll_type_to_del(search_string) var/list/types = get_fancy_list_of_atom_types() @@ -749,7 +749,7 @@ var/list/queries = list() for(var/i in 1 to val) var/datum/db_query/query = SSdbcore.NewQuery("NULL") - INVOKE_ASYNC(query, /datum/db_query.proc/Execute) + INVOKE_ASYNC(query, TYPE_PROC_REF(/datum/db_query, Execute)) queries += query for(var/datum/db_query/query as anything in queries) @@ -838,9 +838,9 @@ set desc = "Shows tracked profiling info from code lines that support it" var/sortlist = list( - "Avg time" = /proc/cmp_profile_avg_time_dsc, - "Total Time" = /proc/cmp_profile_time_dsc, - "Call Count" = /proc/cmp_profile_count_dsc + "Avg time" = GLOBAL_PROC_REF(cmp_profile_avg_time_dsc), + "Total Time" = GLOBAL_PROC_REF(cmp_profile_time_dsc), + "Call Count" = GLOBAL_PROC_REF(cmp_profile_count_dsc) ) var/sort = input(src, "Sort type?", "Sort Type", "Avg time") as null|anything in sortlist if (!sort) @@ -898,7 +898,7 @@ var/list/sorted = list() for (var/source in per_source) sorted += list(list("source" = source, "count" = per_source[source])) - sorted = sortTim(sorted, .proc/cmp_timer_data) + sorted = sortTim(sorted, GLOBAL_PROC_REF(cmp_timer_data)) // Now that everything is sorted, compile them into an HTML output var/output = "" diff --git a/code/modules/admin/verbs/ert.dm b/code/modules/admin/verbs/ert.dm index b7c9b19b866..dd51113f92e 100644 --- a/code/modules/admin/verbs/ert.dm +++ b/code/modules/admin/verbs/ert.dm @@ -77,9 +77,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/hiddenprints.dm b/code/modules/admin/verbs/hiddenprints.dm index 500792cc42a..f5332d890ae 100644 --- a/code/modules/admin/verbs/hiddenprints.dm +++ b/code/modules/admin/verbs/hiddenprints.dm @@ -14,7 +14,7 @@ if(!length(hiddenprints)) hiddenprints = list("Nobody has touched this yet!") - hiddenprints = sort_list(hiddenprints, /proc/cmp_hiddenprint_lasttime_dsc) + hiddenprints = sort_list(hiddenprints, GLOBAL_PROC_REF(cmp_hiddenprint_lasttime_dsc)) for(var/record in hiddenprints) interface += "
  • [record]

    • " diff --git a/code/modules/admin/verbs/highlander_datum.dm b/code/modules/admin/verbs/highlander_datum.dm index e7e19746e01..bd0a60a848d 100644 --- a/code/modules/admin/verbs/highlander_datum.dm +++ b/code/modules/admin/verbs/highlander_datum.dm @@ -9,7 +9,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller) /datum/highlander_controller/New() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/new_highlander) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(new_highlander)) sound_to_playing_players('sound/misc/highlander.ogg') send_to_playing_players(span_boldannounce("THERE CAN BE ONLY ONE")) for(var/obj/item/disk/nuclear/nuke_disk as anything in SSpoints_of_interest.real_nuclear_disks) @@ -36,7 +36,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller) robot.gib() continue robot.make_scottish() - addtimer(CALLBACK(SSshuttle.emergency, /obj/docking_port/mobile/emergency.proc/request, null, 1), 50) + addtimer(CALLBACK(SSshuttle.emergency, TYPE_PROC_REF(/obj/docking_port/mobile/emergency, request), null, 1), 50) /datum/highlander_controller/Destroy(force, ...) . = ..() @@ -88,7 +88,7 @@ GLOBAL_DATUM(highlander_controller, /datum/highlander_controller) send_to_playing_players(span_userdanger("Bagpipes begin to blare. You feel Scottish pride coming over you.")) message_admins(span_adminnotice("[key_name_admin(usr)] used (delayed) THERE CAN BE ONLY ONE!")) log_admin("[key_name(usr)] used delayed THERE CAN BE ONLY ONE.") - addtimer(CALLBACK(src, .proc/only_one, TRUE), 42 SECONDS) + addtimer(CALLBACK(src, PROC_REF(only_one), TRUE), 42 SECONDS) /mob/living/proc/make_scottish() return diff --git a/code/modules/admin/verbs/individual_logging.dm b/code/modules/admin/verbs/individual_logging.dm index 4928089a35d..d9df055ba1b 100644 --- a/code/modules/admin/verbs/individual_logging.dm +++ b/code/modules/admin/verbs/individual_logging.dm @@ -60,7 +60,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/lua/_wrappers.dm b/code/modules/admin/verbs/lua/_wrappers.dm index d025db3ca0c..d21a0aca99c 100644 --- a/code/modules/admin/verbs/lua/_wrappers.dm +++ b/code/modules/admin/verbs/lua/_wrappers.dm @@ -14,7 +14,7 @@ if(isdatum(ret)) SSlua.gc_guard = ret var/datum/ret_datum = ret - ret_datum.RegisterSignal(ret_datum, COMSIG_PARENT_QDELETING, /datum.proc/lua_reference_cleanup, override = TRUE) + ret_datum.RegisterSignal(ret_datum, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum, lua_reference_cleanup), override = TRUE) return ret /proc/wrap_lua_global_proc_call(proc_name, list/arguments) @@ -29,7 +29,7 @@ if(isdatum(ret)) SSlua.gc_guard = ret var/datum/ret_datum = ret - ret_datum.RegisterSignal(ret_datum, COMSIG_PARENT_QDELETING, /datum.proc/lua_reference_cleanup, override = TRUE) + ret_datum.RegisterSignal(ret_datum, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum, lua_reference_cleanup), override = TRUE) return ret /proc/wrap_lua_print(state_id, list/arguments) @@ -43,5 +43,5 @@ return var/print_message = jointext(arguments, "\t") var/result = list("status" = "print", "param" = print_message) - INVOKE_ASYNC(target_state, /datum/lua_state.proc/log_result, result, TRUE) + INVOKE_ASYNC(target_state, TYPE_PROC_REF(/datum/lua_state, log_result), result, TRUE) log_lua("[target_state]: [print_message]") diff --git a/code/modules/admin/verbs/lua/lua_editor.dm b/code/modules/admin/verbs/lua/lua_editor.dm index 9e0fb17f86a..75d05c0a557 100644 --- a/code/modules/admin/verbs/lua/lua_editor.dm +++ b/code/modules/admin/verbs/lua/lua_editor.dm @@ -196,14 +196,14 @@ if(isweakref(thing_to_debug)) var/datum/weakref/ref = thing_to_debug thing_to_debug = ref.resolve() - INVOKE_ASYNC(usr.client, /client.proc/debug_variables, thing_to_debug) + INVOKE_ASYNC(usr.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug) return FALSE if("vvGlobal") var/thing_to_debug = traverse_list(params["indices"], current_state.globals) if(isweakref(thing_to_debug)) var/datum/weakref/ref = thing_to_debug thing_to_debug = ref.resolve() - INVOKE_ASYNC(usr.client, /client.proc/debug_variables, thing_to_debug) + INVOKE_ASYNC(usr.client, TYPE_PROC_REF(/client, debug_variables), thing_to_debug) return FALSE if("clearArgs") arguments.Cut() diff --git a/code/modules/admin/verbs/lua/lua_state.dm b/code/modules/admin/verbs/lua/lua_state.dm index 64805917201..df25d070b53 100644 --- a/code/modules/admin/verbs/lua/lua_state.dm +++ b/code/modules/admin/verbs/lua/lua_state.dm @@ -63,7 +63,7 @@ GLOBAL_PROTECT(lua_usr) result["param"] = weakrefify_list(encode_text_and_nulls(result["param"])) log += list(result) index_of_log = log.len - INVOKE_ASYNC(src, /datum/lua_state.proc/update_editors) + INVOKE_ASYNC(src, TYPE_PROC_REF(/datum/lua_state, update_editors)) return index_of_log /datum/lua_state/proc/load_script(script) diff --git a/code/modules/admin/verbs/plane_debugger.dm b/code/modules/admin/verbs/plane_debugger.dm index d1a613449a6..1cf7d9c37a5 100644 --- a/code/modules/admin/verbs/plane_debugger.dm +++ b/code/modules/admin/verbs/plane_debugger.dm @@ -36,7 +36,7 @@ UnregisterSignal(owner.owner.mob, COMSIG_MOB_LOGOUT) return - RegisterSignal(owner.owner.mob, COMSIG_MOB_LOGOUT, .proc/on_our_logout, override = TRUE) + RegisterSignal(owner.owner.mob, COMSIG_MOB_LOGOUT, PROC_REF(on_our_logout), override = TRUE) mirror = new() mirror.shadow(new_mob) @@ -50,7 +50,7 @@ // Recreate our stored view, since we've changed mobs now create_store() UnregisterSignal(source, COMSIG_MOB_LOGOUT) - RegisterSignal(owner.owner.mob, COMSIG_MOB_LOGOUT, .proc/on_our_logout, override = TRUE) + RegisterSignal(owner.owner.mob, COMSIG_MOB_LOGOUT, PROC_REF(on_our_logout), override = TRUE) /// Create or refresh our stored visual data, represeting the viewing mob /datum/plane_master_debug/proc/create_store() diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index d10ec67d139..c2112c224d1 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -51,6 +51,6 @@ set desc = "Give this guy possess/release verbs" set category = "Debug" set name = "Give Possessing Verbs" - add_verb(M, /proc/possess) - add_verb(M, /proc/release) + add_verb(M, GLOBAL_PROC_REF(possess)) + add_verb(M, GLOBAL_PROC_REF(release)) SSblackbox.record_feedback("tally", "admin_verb", 1, "Give Possessing Verbs") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 6fe8dd9f7e5..8e5118692f1 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -208,7 +208,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) var/datum/round_event_control/disease_outbreak/DC = locate(/datum/round_event_control/disease_outbreak) in SSevents.control E = DC.runEvent() if("Choose") - var/virus = input("Choose the virus to spread", "BIOHAZARD") as null|anything in sort_list(typesof(/datum/disease), /proc/cmp_typepaths_asc) + var/virus = input("Choose the virus to spread", "BIOHAZARD") as null|anything in sort_list(typesof(/datum/disease), GLOBAL_PROC_REF(cmp_typepaths_asc)) var/datum/round_event_control/disease_outbreak/DC = locate(/datum/round_event_control/disease_outbreak) in SSevents.control var/datum/round_event/disease_outbreak/DO = DC.runEvent() DO.virus_type = virus @@ -426,9 +426,9 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) var/ghostcandidates = list() for (var/j in 1 to min(prefs["amount"]["value"], length(candidates))) ghostcandidates += pick_n_take(candidates) - addtimer(CALLBACK(GLOBAL_PROC, .proc/doPortalSpawn, get_random_station_turf(), pathToSpawn, length(ghostcandidates), storm_appearances, ghostcandidates, outfit), i*prefs["delay"]["value"]) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(doPortalSpawn), get_random_station_turf(), pathToSpawn, length(ghostcandidates), storm_appearances, 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_appearances, null, outfit), i*prefs["delay"]["value"]) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(doPortalSpawn), get_random_station_turf(), pathToSpawn, prefs["amount"]["value"], storm_appearances, null, outfit), i*prefs["delay"]["value"]) if("changebombcap") if(!is_funmin) return @@ -449,7 +449,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) log_admin("[key_name_admin(holder)] made everyone into monkeys.") for(var/i in GLOB.human_list) var/mob/living/carbon/human/H = i - INVOKE_ASYNC(H, /mob/living/carbon.proc/monkeyize) + INVOKE_ASYNC(H, TYPE_PROC_REF(/mob/living/carbon, monkeyize)) if("traitor_all") if(!is_funmin) return @@ -622,7 +622,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) /datum/everyone_is_a_traitor_controller/New(objective) src.objective = objective - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/make_traitor) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(make_traitor)) /datum/everyone_is_a_traitor_controller/Destroy() UnregisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED) diff --git a/code/modules/admin/view_variables/reference_tracking.dm b/code/modules/admin/view_variables/reference_tracking.dm index 46c073de185..a5b2af68c77 100644 --- a/code/modules/admin/view_variables/reference_tracking.dm +++ b/code/modules/admin/view_variables/reference_tracking.dm @@ -26,6 +26,10 @@ var/starting_time = world.time +#if DM_VERSION >= 515 + log_reftracker("Refcount for [type]: [refcount(src)]") +#endif + //Time to search the whole game for our ref DoSearchVar(GLOB, "GLOB", search_time = starting_time) //globals log_reftracker("Finished searching globals") diff --git a/code/modules/admin/view_variables/topic_basic.dm b/code/modules/admin/view_variables/topic_basic.dm index 9f0aee07d32..09759c72c6f 100644 --- a/code/modules/admin/view_variables/topic_basic.dm +++ b/code/modules/admin/view_variables/topic_basic.dm @@ -56,11 +56,11 @@ if(!check_rights(NONE)) return var/list/names = list() - var/list/componentsubtypes = sort_list(subtypesof(/datum/component), /proc/cmp_typepaths_asc) + var/list/componentsubtypes = sort_list(subtypesof(/datum/component), GLOBAL_PROC_REF(cmp_typepaths_asc)) names += "---Components---" names += componentsubtypes names += "---Elements---" - names += sort_list(subtypesof(/datum/element), /proc/cmp_typepaths_asc) + names += sort_list(subtypesof(/datum/element), GLOBAL_PROC_REF(cmp_typepaths_asc)) var/result = tgui_input_list(usr, "Choose a component/element to add", "Add Component", names) if(isnull(result)) return @@ -97,10 +97,10 @@ var/list/names = list() names += "---Components---" if(length(components)) - names += sort_list(components, /proc/cmp_typepaths_asc) + names += sort_list(components, GLOBAL_PROC_REF(cmp_typepaths_asc)) names += "---Elements---" // We have to list every element here because there is no way to know what element is on this object without doing some sort of hack. - names += sort_list(subtypesof(/datum/element), /proc/cmp_typepaths_asc) + names += sort_list(subtypesof(/datum/element), GLOBAL_PROC_REF(cmp_typepaths_asc)) var/path = tgui_input_list(usr, "Choose a component/element to remove. All elements listed here may not be on the datum.", "Remove element", names) if(isnull(path)) return diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index 0ef17eddef8..6d93e7ecbdf 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -156,8 +156,8 @@ GLOBAL_LIST_EMPTY(antagonists) info_button.Trigger() apply_innate_effects() give_antag_moodies() - RegisterSignal(owner, COMSIG_PRE_MINDSHIELD_IMPLANT, .proc/pre_mindshield) - RegisterSignal(owner, COMSIG_MINDSHIELD_IMPLANTED, .proc/on_mindshield) + RegisterSignal(owner, COMSIG_PRE_MINDSHIELD_IMPLANT, PROC_REF(pre_mindshield)) + RegisterSignal(owner, COMSIG_MINDSHIELD_IMPLANTED, PROC_REF(on_mindshield)) if(is_banned(owner.current) && replace_banned) replace_banned_player() else if(owner.current.client?.holder && (CONFIG_GET(flag/auto_deadmin_antagonists) || owner.current.client.prefs?.toggles & DEADMIN_ANTAGONIST)) diff --git a/code/modules/antagonists/_common/antag_hud.dm b/code/modules/antagonists/_common/antag_hud.dm index 1087369f2f7..516631e8f50 100644 --- a/code/modules/antagonists/_common/antag_hud.dm +++ b/code/modules/antagonists/_common/antag_hud.dm @@ -34,7 +34,7 @@ GLOBAL_LIST_EMPTY_TYPED(has_antagonist_huds, /datum/atom_hud/alternate_appearanc RegisterSignal( mind, list(COMSIG_ANTAGONIST_GAINED, COMSIG_ANTAGONIST_REMOVED), - .proc/update_antag_hud_images + PROC_REF(update_antag_hud_images) ) check_processing() diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 944fba672f5..5e9a38b869d 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -49,7 +49,7 @@ . = ..() if(used || polling || !ishuman(usr)) return - INVOKE_ASYNC(src, .proc/poll_for_student, usr, params["school"]) + INVOKE_ASYNC(src, PROC_REF(poll_for_student), usr, params["school"]) SStgui.close_uis(src) /obj/item/antag_spawner/contract/proc/poll_for_student(mob/living/carbon/human/teacher, apprentice_school) diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index 1640a817f0c..9b3aa551f23 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -132,7 +132,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 0be54a14f70..90e037c2a2c 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -666,7 +666,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} user.visible_message(span_notice("[user] places down [src] and activates it."), span_notice("You place down [src] and activate it.")) user.dropItemToGround(src) playsound(src, 'sound/machines/terminal_alert.ogg', 50) - addtimer(CALLBACK(src, .proc/try_spawn_machine), 30) + addtimer(CALLBACK(src, PROC_REF(try_spawn_machine)), 30) /obj/item/abductor_machine_beacon/proc/try_spawn_machine() var/viable = FALSE @@ -735,7 +735,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/item/clothing/head/helmet/abductor/equipped(mob/living/user, slot) . = ..() if(slot_flags & slot) - RegisterSignal(user, COMSIG_LIVING_CAN_TRACK, .proc/can_track) + RegisterSignal(user, COMSIG_LIVING_CAN_TRACK, PROC_REF(can_track)) else UnregisterSignal(user, COMSIG_LIVING_CAN_TRACK) @@ -830,7 +830,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} /obj/structure/table/optable/abductor/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 155bb7b67f9..2893172551e 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -69,7 +69,7 @@ update_gland_hud() var/atom/movable/screen/alert/mind_control/mind_alert = owner.throw_alert(ALERT_MIND_CONTROL, /atom/movable/screen/alert/mind_control) mind_alert.command = command - addtimer(CALLBACK(src, .proc/clear_mind_control), mind_control_duration) + addtimer(CALLBACK(src, PROC_REF(clear_mind_control)), mind_control_duration) return TRUE /obj/item/organ/internal/heart/gland/proc/clear_mind_control() diff --git a/code/modules/antagonists/abductor/equipment/glands/electric.dm b/code/modules/antagonists/abductor/equipment/glands/electric.dm index 69226f3e4f2..47eb8be7a13 100644 --- a/code/modules/antagonists/abductor/equipment/glands/electric.dm +++ b/code/modules/antagonists/abductor/equipment/glands/electric.dm @@ -19,7 +19,7 @@ owner.visible_message(span_danger("[owner]'s skin starts emitting electric arcs!"),\ span_warning("You feel electric energy building up inside you!")) playsound(get_turf(owner), SFX_SPARKS, 100, TRUE, -1, SHORT_RANGE_SOUND_EXTRARANGE) - addtimer(CALLBACK(src, .proc/zap), rand(30, 100)) + addtimer(CALLBACK(src, PROC_REF(zap)), rand(30, 100)) /obj/item/organ/internal/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 ac366f55ab6..06b823603cd 100644 --- a/code/modules/antagonists/abductor/equipment/glands/heal.dm +++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm @@ -157,7 +157,7 @@ else to_chat(owner, span_warning("You feel a weird rumble behind your eye sockets...")) - addtimer(CALLBACK(src, .proc/finish_replace_eyes), rand(100, 200)) + addtimer(CALLBACK(src, PROC_REF(finish_replace_eyes)), rand(100, 200)) /obj/item/organ/internal/heart/gland/heal/proc/finish_replace_eyes() var/eye_type = /obj/item/organ/internal/eyes @@ -175,7 +175,7 @@ else to_chat(owner, span_warning("You feel a weird tingle in your [parse_zone(body_zone)]... even if you don't have one.")) - addtimer(CALLBACK(src, .proc/finish_replace_limb, body_zone), rand(150, 300)) + addtimer(CALLBACK(src, PROC_REF(finish_replace_limb), body_zone), rand(150, 300)) /obj/item/organ/internal/heart/gland/heal/proc/finish_replace_limb(body_zone) owner.visible_message(span_warning("With a loud snap, [owner]'s [parse_zone(body_zone)] rapidly grows back from [owner.p_their()] body!"), @@ -205,7 +205,7 @@ if(owner.reagents.has_reagent(R.type)) keep_going = TRUE if(keep_going) - addtimer(CALLBACK(src, .proc/keep_replacing_blood), 30) + addtimer(CALLBACK(src, PROC_REF(keep_replacing_blood)), 30) /obj/item/organ/internal/heart/gland/heal/proc/replace_chest(obj/item/bodypart/chest/chest) if(!IS_ORGANIC_LIMB(chest)) diff --git a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm index 677000a56f8..87870947f17 100644 --- a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm +++ b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm @@ -57,7 +57,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 ecc4ca3988c..92aa7abcc45 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/internal/heart/gland/plasma/activate() to_chat(owner, span_warning("You feel bloated.")) - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, owner, span_userdanger("A massive stomachache overcomes you.")), 150) - addtimer(CALLBACK(src, .proc/vomit_plasma), 200) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), owner, span_userdanger("A massive stomachache overcomes you.")), 150) + addtimer(CALLBACK(src, PROC_REF(vomit_plasma)), 200) /obj/item/organ/internal/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 1c3ad4e9da9..d32304a5987 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/internal/heart/gland/quantum/proc/quantum_swap() diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm index b484056591f..515f181fc3c 100644 --- a/code/modules/antagonists/abductor/machinery/pad.dm +++ b/code/modules/antagonists/abductor/machinery/pad.dm @@ -38,7 +38,7 @@ /obj/machinery/abductor/pad/proc/MobToLoc(place,mob/living/target) new /obj/effect/temp_visual/teleport_abductor(place) - addtimer(CALLBACK(src, .proc/doMobToLoc, place, target), 80) + addtimer(CALLBACK(src, PROC_REF(doMobToLoc), place, target), 80) /obj/machinery/abductor/pad/proc/doPadToLoc(place) flick("alien-pad", src) @@ -48,7 +48,7 @@ /obj/machinery/abductor/pad/proc/PadToLoc(place) new /obj/effect/temp_visual/teleport_abductor(place) - addtimer(CALLBACK(src, .proc/doPadToLoc, place), 80) + addtimer(CALLBACK(src, PROC_REF(doPadToLoc), place), 80) /obj/effect/temp_visual/teleport_abductor name = "Huh" diff --git a/code/modules/antagonists/ashwalker/ashwalker.dm b/code/modules/antagonists/ashwalker/ashwalker.dm index f59a1e4096e..f9933b22b81 100644 --- a/code/modules/antagonists/ashwalker/ashwalker.dm +++ b/code/modules/antagonists/ashwalker/ashwalker.dm @@ -26,11 +26,12 @@ /datum/antagonist/ashwalker/on_body_transfer(mob/living/old_body, mob/living/new_body) . = ..() UnregisterSignal(old_body, COMSIG_MOB_EXAMINATE) - RegisterSignal(new_body, COMSIG_MOB_EXAMINATE, .proc/on_examinate) + RegisterSignal(new_body, COMSIG_MOB_EXAMINATE, PROC_REF(on_examinate)) /datum/antagonist/ashwalker/on_gain() . = ..() - RegisterSignal(owner.current, COMSIG_MOB_EXAMINATE, .proc/on_examinate) + RegisterSignal(owner.current, COMSIG_MOB_EXAMINATE, PROC_REF(on_examinate)) + //owner.teach_crafting_recipe(/datum/crafting_recipe/skeleton_key) //SKYRAT EDIT REMOVAL - ASH RITUALS /datum/antagonist/ashwalker/on_removal() . = ..() diff --git a/code/modules/antagonists/blob/blob.dm b/code/modules/antagonists/blob/blob.dm index c849a5e3ca5..72f5318ab6b 100644 --- a/code/modules/antagonists/blob/blob.dm +++ b/code/modules/antagonists/blob/blob.dm @@ -71,7 +71,7 @@ /datum/action/innate/blobpop/Grant(Target) . = ..() if(owner) - addtimer(CALLBACK(src, .proc/Activate, TRUE), autoplace_time, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(Activate), TRUE), autoplace_time, TIMER_UNIQUE|TIMER_OVERRIDE) to_chat(owner, "You will automatically pop and place your blob core in [DisplayTimeText(autoplace_time)].") /datum/action/innate/blobpop/Activate(timer_activated = FALSE) diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index 3cfc9771239..b55db72e1a8 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -142,7 +142,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) SSsecurity_level.set_level(SEC_LEVEL_DELTA) max_blob_points = INFINITY blob_points = INFINITY - addtimer(CALLBACK(src, .proc/victory), 450) + addtimer(CALLBACK(src, PROC_REF(victory)), 450) else if(!free_strain_rerolls && (last_reroll_time + BLOB_POWER_REROLL_FREE_TIME[span_big("You have gained another free strain re-roll.")]") free_strain_rerolls = 1 diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 71a5ee04cce..8921ec4690e 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -161,9 +161,9 @@ var/mob/living/living_mob = mob_to_tweak handle_clown_mutation(living_mob, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") - RegisterSignal(living_mob, COMSIG_MOB_LOGIN, .proc/on_login) - RegisterSignal(living_mob, COMSIG_LIVING_LIFE, .proc/on_life) - RegisterSignal(living_mob, list(COMSIG_MOB_MIDDLECLICKON, COMSIG_MOB_ALTCLICKON), .proc/on_click_sting) + RegisterSignal(living_mob, COMSIG_MOB_LOGIN, PROC_REF(on_login)) + RegisterSignal(living_mob, COMSIG_LIVING_LIFE, PROC_REF(on_life)) + RegisterSignal(living_mob, list(COMSIG_MOB_MIDDLECLICKON, COMSIG_MOB_ALTCLICKON), PROC_REF(on_click_sting)) if(living_mob.hud_used) var/datum/hud/hud_used = living_mob.hud_used @@ -178,7 +178,7 @@ hud_used.show_hud(hud_used.hud_version) else - RegisterSignal(living_mob, COMSIG_MOB_HUD_CREATED, .proc/on_hud_created) + RegisterSignal(living_mob, COMSIG_MOB_HUD_CREATED, PROC_REF(on_hud_created)) // Brains are optional for lings. var/obj/item/organ/internal/brain/our_ling_brain = living_mob.getorganslot(ORGAN_SLOT_BRAIN) @@ -313,7 +313,7 @@ if(!isliving(clicked) || !IN_GIVEN_RANGE(ling, clicked, sting_range)) return - INVOKE_ASYNC(chosen_sting, /datum/action/changeling/sting.proc/try_to_sting, ling, clicked) + INVOKE_ASYNC(chosen_sting, TYPE_PROC_REF(/datum/action/changeling/sting, try_to_sting), ling, clicked) return COMSIG_MOB_CANCEL_CLICKON @@ -722,7 +722,7 @@ /datum/antagonist/changeling/get_admin_commands() . = ..() if(stored_profiles.len && (owner.current.real_name != first_profile.name)) - .["Transform to initial appearance."] = CALLBACK(src,.proc/admin_restore_appearance) + .["Transform to initial appearance."] = CALLBACK(src, PROC_REF(admin_restore_appearance)) /* * Restores the appearance of the changeling to the original DNA. diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm index a01fb9a7649..b2fb47ff358 100644 --- a/code/modules/antagonists/changeling/powers/biodegrade.dm +++ b/code/modules/antagonists/changeling/powers/biodegrade.dm @@ -20,7 +20,7 @@ user.visible_message(span_warning("[user] vomits a glob of acid on [user.p_their()] [O]!"), \ span_warning("We vomit acidic ooze onto our restraints!")) - addtimer(CALLBACK(src, .proc/dissolve_handcuffs, user, O), 30) + addtimer(CALLBACK(src, PROC_REF(dissolve_handcuffs), user, O), 30) used = TRUE if(user.legcuffed) @@ -30,7 +30,7 @@ user.visible_message(span_warning("[user] vomits a glob of acid on [user.p_their()] [O]!"), \ span_warning("We vomit acidic ooze onto our restraints!")) - addtimer(CALLBACK(src, .proc/dissolve_legcuffs, user, O), 30) + addtimer(CALLBACK(src, PROC_REF(dissolve_legcuffs), user, O), 30) used = TRUE if(user.wear_suit && user.wear_suit.breakouttime && !used) @@ -39,7 +39,7 @@ return FALSE user.visible_message(span_warning("[user] vomits a glob of acid across the front of [user.p_their()] [S]!"), \ span_warning("We vomit acidic ooze onto our straight jacket!")) - addtimer(CALLBACK(src, .proc/dissolve_straightjacket, user, S), 30) + addtimer(CALLBACK(src, PROC_REF(dissolve_straightjacket), user, S), 30) used = TRUE @@ -49,7 +49,7 @@ return FALSE C.visible_message(span_warning("[C]'s hinges suddenly begin to melt and run!")) to_chat(user, span_warning("We vomit acidic goop onto the interior of [C]!")) - addtimer(CALLBACK(src, .proc/open_closet, user, C), 70) + addtimer(CALLBACK(src, PROC_REF(open_closet), user, C), 70) used = TRUE if(istype(user.loc, /obj/structure/spider/cocoon) && !used) @@ -58,7 +58,7 @@ return FALSE C.visible_message(span_warning("[src] shifts and starts to fall apart!")) to_chat(user, span_warning("We secrete acidic enzymes from our skin and begin melting our cocoon...")) - addtimer(CALLBACK(src, .proc/dissolve_cocoon, user, C), 25) //Very short because it's just webs + addtimer(CALLBACK(src, PROC_REF(dissolve_cocoon), user, C), 25) //Very short because it's just webs used = TRUE ..() return used diff --git a/code/modules/antagonists/changeling/powers/fakedeath.dm b/code/modules/antagonists/changeling/powers/fakedeath.dm index 05a58894cd9..b1315945d6a 100644 --- a/code/modules/antagonists/changeling/powers/fakedeath.dm +++ b/code/modules/antagonists/changeling/powers/fakedeath.dm @@ -13,7 +13,7 @@ /datum/action/changeling/fakedeath/sting_action(mob/living/user) ..() if(revive_ready) - INVOKE_ASYNC(src, .proc/revive, user) + INVOKE_ASYNC(src, PROC_REF(revive), user) revive_ready = FALSE name = "Reviving Stasis" desc = "We fall into a stasis, allowing us to regenerate and trick our enemies." @@ -24,7 +24,7 @@ else to_chat(user, span_notice("We begin our stasis, preparing energy to arise once more.")) user.fakedeath("changeling") //play dead - addtimer(CALLBACK(src, .proc/ready_to_regenerate, user), LING_FAKEDEATH_TIME, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(ready_to_regenerate), user), LING_FAKEDEATH_TIME, TIMER_UNIQUE) return TRUE /datum/action/changeling/fakedeath/proc/revive(mob/living/user) diff --git a/code/modules/antagonists/changeling/powers/headcrab.dm b/code/modules/antagonists/changeling/powers/headcrab.dm index c0b63ca8f74..b49d23d5bc1 100644 --- a/code/modules/antagonists/changeling/powers/headcrab.dm +++ b/code/modules/antagonists/changeling/powers/headcrab.dm @@ -37,7 +37,7 @@ user.investigate_log("has been gibbed by headslug burst.", INVESTIGATE_DEATHS) user.gib() . = TRUE - addtimer(CALLBACK(src, .proc/spawn_headcrab, stored_mind, user_turf, organs), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(spawn_headcrab), stored_mind, user_turf, organs), 3 SECONDS) /datum/action/changeling/headcrab/proc/spawn_headcrab(datum/mind/stored_mind, turf/spawn_location, list/organs) var/mob/living/simple_animal/hostile/headcrab/crab = new(spawn_location) diff --git a/code/modules/antagonists/changeling/powers/humanform.dm b/code/modules/antagonists/changeling/powers/humanform.dm index e68bac60714..46e0c6326f2 100644 --- a/code/modules/antagonists/changeling/powers/humanform.dm +++ b/code/modules/antagonists/changeling/powers/humanform.dm @@ -28,7 +28,7 @@ ..() changeling.purchased_powers -= src Remove(user) - + // SKYRAT EDIT START var/datum/dna/chosen_dna = chosen_prof.dna var/datum/species/chosen_species = chosen_dna.species @@ -45,14 +45,28 @@ /datum/action/changeling/humanform/from_monkey/sting_action(mob/living/carbon/user) . = ..() - if(!.) - return + RegisterSignal(user, COMSIG_MONKEY_HUMANIZE, PROC_REF(give_lesserform)) - var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) +/datum/action/changeling/humanform/from_monkey/Remove(mob/remove_from) + UnregisterSignal(remove_from, COMSIG_MONKEY_HUMANIZE) + return ..() + +/** + * Called on COMSIG_MONKEY_HUMANIZE + * Handles giving the new lesserform ability + * Removing ourselves is handled by parent already, so it's not needed here like it is on lesserform. + * + * Args: + * source - Monkey user who is now turning into a human + */ +/datum/action/changeling/humanform/from_monkey/proc/give_lesserform(mob/living/carbon/source) + SIGNAL_HANDLER + + var/datum/antagonist/changeling/changeling = source.mind.has_antag_datum(/datum/antagonist/changeling) var/datum/action/changeling/lesserform/monkey_form_ability = new() changeling.purchased_powers += monkey_form_ability - monkey_form_ability.Grant(user) + monkey_form_ability.Grant(source) // Delete ourselves when we're done. qdel(src) diff --git a/code/modules/antagonists/changeling/powers/lesserform.dm b/code/modules/antagonists/changeling/powers/lesserform.dm index 2542e10c677..acac97322ea 100644 --- a/code/modules/antagonists/changeling/powers/lesserform.dm +++ b/code/modules/antagonists/changeling/powers/lesserform.dm @@ -7,45 +7,47 @@ dna_cost = 1 req_human = TRUE +/datum/action/changeling/lesserform/Grant(mob/granted_to) + . = ..() + RegisterSignal(granted_to, COMSIG_HUMAN_MONKEYIZE, PROC_REF(swap_powers)) + +/datum/action/changeling/lesserform/Remove(mob/remove_from) + UnregisterSignal(remove_from, COMSIG_HUMAN_MONKEYIZE) + return ..() + //Transform into a monkey. /datum/action/changeling/lesserform/sting_action(mob/living/carbon/human/user) if(!user || user.notransform) return FALSE - to_chat(user, span_warning("Our genes cry out!")) ..() - - // SKYRAT EDIT START - var/datum/dna/current_dna = user.dna - for(var/key in current_dna.mutant_bodyparts) - LAZYSET(current_dna.mutant_bodyparts, key, "None") - for(var/key in current_dna.body_markings) - LAZYSET(current_dna.body_markings, key, null) - if(current_dna.features["body_size"]) - LAZYSET(current_dna.features, "body_size", 1) - if(current_dna.features["legs"]) - LAZYREMOVE(current_dna.features, "legs") - // SKYRAT EDIT END - + to_chat(user, span_warning("Our genes cry out!")) user.monkeyize() + return TRUE + +/** + * Called on COMSIG_HUMAN_MONKEYIZE + * Handles giving the new human force ability and removing ourselves + * + * Args: + * source - Human user who is now turning into a monkey + */ +/datum/action/changeling/lesserform/proc/swap_powers(mob/living/carbon/source) + SIGNAL_HANDLER + + var/datum/antagonist/changeling/changeling = source.mind.has_antag_datum(/datum/antagonist/changeling) + // Drops all flesh disguise items after monkeyizing, because they don't drop automatically like real clothing. + for(var/slot in changeling.slot2type) + if(istype(source.vars[slot], changeling.slot2type[slot])) + qdel(source.vars[slot]) + for(var/datum/scar/iter_scar as anything in source.all_scars) + if(iter_scar.fake) + qdel(iter_scar) + source.regenerate_icons() - var/datum/antagonist/changeling/changeling = user.mind.has_antag_datum(/datum/antagonist/changeling) var/datum/action/changeling/humanform/from_monkey/human_form_ability = new() changeling.purchased_powers += human_form_ability changeling.purchased_powers -= src - - // SKYRAT EDIT START - for(var/slot in changeling.slot2type) - if(istype(user.vars[slot], changeling.slot2type[slot])) - qdel(user.vars[slot]) - for(var/scar in user.all_scars) - var/datum/scar/iter_scar = scar - if(iter_scar.fake) - qdel(iter_scar) - user.regenerate_icons() - // SKYRAT EDIT END - - Remove(user) - human_form_ability.Grant(user) + human_form_ability.Grant(source) + Remove(source) qdel(src) - return TRUE diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index d0ecb1baf86..6481b41f9b6 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -378,7 +378,7 @@ return BULLET_ACT_HIT if(firer_combat_mode) C.visible_message(span_danger("[L] is thrown towards [H] by a tentacle!"),span_userdanger("A tentacle grabs you and throws you towards [H]!")) - C.throw_at(get_step_towards(H,C), 8, 2, H, TRUE, TRUE, callback=CALLBACK(src, .proc/tentacle_grab, H, C)) + C.throw_at(get_step_towards(H,C), 8, 2, H, TRUE, TRUE, callback=CALLBACK(src, PROC_REF(tentacle_grab), H, C)) return BULLET_ACT_HIT else C.visible_message(span_danger("[L] is grabbed by [H]'s tentacle!"),span_userdanger("A tentacle grabs you and pulls you towards [H]!")) diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm index ff6440caa59..19c4458a388 100644 --- a/code/modules/antagonists/changeling/powers/strained_muscles.dm +++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm @@ -25,7 +25,7 @@ user.Paralyze(60) user.emote("gasp") - INVOKE_ASYNC(src, .proc/muscle_loop, user) + INVOKE_ASYNC(src, PROC_REF(muscle_loop), user) return TRUE diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm index eb773db6324..d578d5c23de 100644 --- a/code/modules/antagonists/changeling/powers/tiny_prick.dm +++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm @@ -151,7 +151,7 @@ target.visible_message(span_warning("A grotesque blade forms around [target.name]\'s arm!"), span_userdanger("Your arm twists and mutates, transforming into a horrific monstrosity!"), span_hear("You hear organic matter ripping and tearing!")) playsound(target, 'sound/effects/blobattack.ogg', 30, TRUE) - addtimer(CALLBACK(src, .proc/remove_fake, target, blade), 600) + addtimer(CALLBACK(src, PROC_REF(remove_fake), target, blade), 600) return TRUE /datum/action/changeling/sting/false_armblade/proc/remove_fake(mob/target, obj/item/melee/arm_blade/false/blade) @@ -223,7 +223,7 @@ /datum/action/changeling/sting/lsd/sting_action(mob/user, mob/living/carbon/target) log_combat(user, target, "stung", "LSD sting") - addtimer(CALLBACK(src, .proc/hallucination_time, target), rand(30 SECONDS, 60 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(hallucination_time), target), rand(30 SECONDS, 60 SECONDS)) return TRUE /datum/action/changeling/sting/lsd/proc/hallucination_time(mob/living/carbon/target) diff --git a/code/modules/antagonists/changeling/powers/transform.dm b/code/modules/antagonists/changeling/powers/transform.dm index 84c7ff06c57..1510f1b0783 100644 --- a/code/modules/antagonists/changeling/powers/transform.dm +++ b/code/modules/antagonists/changeling/powers/transform.dm @@ -160,7 +160,7 @@ disguise_image.overlays = snap.overlays disguises[current_profile.name] = disguise_image - var/chosen_name = show_radial_menu(user, user, disguises, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 40, require_near = TRUE, tooltips = TRUE) + var/chosen_name = show_radial_menu(user, user, disguises, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 40, require_near = TRUE, tooltips = TRUE) if(!chosen_name) return diff --git a/code/modules/antagonists/clown_ops/bananium_bomb.dm b/code/modules/antagonists/clown_ops/bananium_bomb.dm index 66ce818c41f..3381c7bdb95 100644 --- a/code/modules/antagonists/clown_ops/bananium_bomb.dm +++ b/code/modules/antagonists/clown_ops/bananium_bomb.dm @@ -31,7 +31,7 @@ return /datum/cinematic/nuke/fake /obj/machinery/nuclearbomb/syndicate/bananium/nuke_effects(list/affected_z_levels) - INVOKE_ASYNC(GLOBAL_PROC, /proc/callback_on_everyone_on_z, affected_z_levels, CALLBACK(GLOBAL_PROC, /proc/make_into_clown), src) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(callback_on_everyone_on_z), affected_z_levels, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(make_into_clown)), src) /** * Helper proc that handles making someone into a clown after a bananium nuke goes off. diff --git a/code/modules/antagonists/clown_ops/clown_weapons.dm b/code/modules/antagonists/clown_ops/clown_weapons.dm index 551349c4c63..b44593d968c 100644 --- a/code/modules/antagonists/clown_ops/clown_weapons.dm +++ b/code/modules/antagonists/clown_ops/clown_weapons.dm @@ -84,7 +84,7 @@ attack_verb_continuous_on = list("slips"), \ attack_verb_simple_on = list("slip"), \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/energy/sword/bananium/on_transform(obj/item/source, mob/user, active) . = ..() @@ -234,7 +234,7 @@ /obj/item/clothing/mask/fakemoustache/sticky/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT) - addtimer(CALLBACK(src, .proc/unstick), unstick_time) + addtimer(CALLBACK(src, PROC_REF(unstick)), unstick_time) /obj/item/clothing/mask/fakemoustache/sticky/proc/unstick() REMOVE_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 3e98066e051..542b7ab0157 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -245,7 +245,7 @@ var/image/sparkle_image = image('icons/effects/cult/effects.dmi', clicked_on, "bloodsparkles", ABOVE_MOB_LAYER) clicked_on.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", sparkle_image, NONE) - addtimer(CALLBACK(clicked_on, /atom/.proc/remove_alt_appearance, "cult_apoc", TRUE), 4 MINUTES, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(clicked_on, TYPE_PROC_REF(/atom/, remove_alt_appearance), "cult_apoc", TRUE), 4 MINUTES, TIMER_OVERRIDE|TIMER_UNIQUE) to_chat(caller, span_cultbold("[clicked_on] has been cursed with living nightmares!")) charges-- @@ -583,7 +583,7 @@ if(do_after(user, 90, target = candidate)) candidate.undeploy() candidate.emp_act(EMP_HEAVY) - var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return if(QDELETED(candidate)) @@ -778,14 +778,12 @@ /obj/item/melee/blood_magic/manipulator/attack_self(mob/living/user) if(IS_CULTIST(user)) - //skyrat edit var/static/list/spells = list( "Bloody Halberd (150)" = image(icon = 'icons/obj/cult/items_and_weapons.dmi', icon_state = "occultpoleaxe0"), "Blood Bolt Barrage (300)" = image(icon = 'icons/obj/weapons/guns/ballistic.dmi', icon_state = "arcane_barrage"), "Blood Beam (500)" = image(icon = 'icons/obj/weapons/items_and_weapons.dmi', icon_state = "disintegrate") ) - //skyrat edit - var/choice = show_radial_menu(user, src, spells, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE) + var/choice = show_radial_menu(user, src, spells, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE) if(!check_menu(user)) to_chat(user, span_cultitalic("You decide against conducting a greater blood rite.")) return diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index a6844674c7b..d5b3836a58c 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -184,9 +184,9 @@ /datum/antagonist/cult/get_admin_commands() . = ..() - .["Dagger"] = CALLBACK(src,.proc/admin_give_dagger) - .["Dagger and Metal"] = CALLBACK(src,.proc/admin_give_metal) - .["Remove Dagger and Metal"] = CALLBACK(src, .proc/admin_take_all) + .["Dagger"] = CALLBACK(src, PROC_REF(admin_give_dagger)) + .["Dagger and Metal"] = CALLBACK(src, PROC_REF(admin_give_metal)) + .["Remove Dagger and Metal"] = CALLBACK(src, PROC_REF(admin_take_all)) /datum/antagonist/cult/proc/admin_give_dagger(mob/admin) if(!equip_cultist(metal=FALSE)) @@ -366,9 +366,9 @@ update_explanation_text() // Register a bunch of signals to both the target mind and its body // to stop cult from softlocking everytime the target is deleted before being actually sacrificed. - RegisterSignal(target, COMSIG_MIND_TRANSFERRED, .proc/on_mind_transfer) - RegisterSignal(target.current, COMSIG_PARENT_QDELETING, .proc/on_target_body_del) - RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, .proc/on_possible_mindswap) + RegisterSignal(target, COMSIG_MIND_TRANSFERRED, PROC_REF(on_mind_transfer)) + RegisterSignal(target.current, COMSIG_PARENT_QDELETING, PROC_REF(on_target_body_del)) + RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, PROC_REF(on_possible_mindswap)) else message_admins("Cult Sacrifice: Could not find unconvertible or convertible target. WELP!") sacced = TRUE // Prevents another hypothetical softlock. This basically means every PC is a cultist. @@ -381,30 +381,30 @@ /datum/objective/sacrifice/proc/on_target_body_del() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/find_target) + INVOKE_ASYNC(src, PROC_REF(find_target)) /datum/objective/sacrifice/proc/on_mind_transfer(datum/source, mob/previous_body) SIGNAL_HANDLER //If, for some reason, the mind was transferred to a ghost (better safe than sorry), find a new target. if(!isliving(target.current)) - INVOKE_ASYNC(src, .proc/find_target) + INVOKE_ASYNC(src, PROC_REF(find_target)) return UnregisterSignal(previous_body, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_MIND_TRANSFERRED_INTO)) - RegisterSignal(target.current, COMSIG_PARENT_QDELETING, .proc/on_target_body_del) - RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, .proc/on_possible_mindswap) + RegisterSignal(target.current, COMSIG_PARENT_QDELETING, PROC_REF(on_target_body_del)) + RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, PROC_REF(on_possible_mindswap)) /datum/objective/sacrifice/proc/on_possible_mindswap(mob/source) SIGNAL_HANDLER UnregisterSignal(target.current, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_MIND_TRANSFERRED_INTO)) //we check if the mind is bodyless only after mindswap shenanigeans to avoid issues. - addtimer(CALLBACK(src, .proc/do_we_have_a_body), 0 SECONDS) + addtimer(CALLBACK(src, PROC_REF(do_we_have_a_body)), 0 SECONDS) /datum/objective/sacrifice/proc/do_we_have_a_body() if(!target.current) //The player was ghosted and the mind isn't probably going to be transferred to another mob at this point. find_target() return - RegisterSignal(target.current, COMSIG_PARENT_QDELETING, .proc/on_target_body_del) - RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, .proc/on_possible_mindswap) + RegisterSignal(target.current, COMSIG_PARENT_QDELETING, PROC_REF(on_target_body_del)) + RegisterSignal(target.current, COMSIG_MOB_MIND_TRANSFERRED_INTO, PROC_REF(on_possible_mindswap)) /datum/objective/sacrifice/check_completion() return sacced || completed @@ -509,7 +509,7 @@ return FALSE blood_target = new_target - RegisterSignal(blood_target, COMSIG_PARENT_QDELETING, .proc/unset_blood_target_and_timer) + RegisterSignal(blood_target, COMSIG_PARENT_QDELETING, PROC_REF(unset_blood_target_and_timer)) var/area/target_area = get_area(new_target) blood_target_image = image('icons/effects/mouse_pointers/cult_target.dmi', new_target, "glow", ABOVE_MOB_LAYER) @@ -527,7 +527,7 @@ SEND_SOUND(cultist.current, sound(pick('sound/hallucinations/over_here2.ogg','sound/hallucinations/over_here3.ogg'), 0, 1, 75)) cultist.current.client.images += blood_target_image - blood_target_reset_timer = addtimer(CALLBACK(src, .proc/unset_blood_target), duration, TIMER_STOPPABLE) + blood_target_reset_timer = addtimer(CALLBACK(src, PROC_REF(unset_blood_target)), duration, TIMER_STOPPABLE) return TRUE /// Unsets out blood target, clearing the images from all the cultists. diff --git a/code/modules/antagonists/cult/cult_bastard_sword.dm b/code/modules/antagonists/cult/cult_bastard_sword.dm index 8401adc8620..edbdd84f065 100644 --- a/code/modules/antagonists/cult/cult_bastard_sword.dm +++ b/code/modules/antagonists/cult/cult_bastard_sword.dm @@ -36,8 +36,8 @@ AddComponent( \ /datum/component/spin2win, \ spin_cooldown_time = 25 SECONDS, \ - on_spin_callback = CALLBACK(src, .proc/on_spin), \ - on_unspin_callback = CALLBACK(src, .proc/on_unspin), \ + on_spin_callback = CALLBACK(src, PROC_REF(on_spin)), \ + on_unspin_callback = CALLBACK(src, PROC_REF(on_unspin)), \ start_spin_message = span_danger("%USER begins swinging the sword around with inhuman strength!"), \ end_spin_message = span_warning("%USER's inhuman strength dissipates and the sword's runes grow cold!") \ ) diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index 1f9d77a512c..89ec611e098 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -208,7 +208,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 @@ -276,7 +276,7 @@ unset_ranged_ability(caller, span_cult("The marking rite is complete! It will last for [DisplayTimeText(cult_mark_duration)] seconds.")) COOLDOWN_START(src, cult_mark_cooldown, cult_mark_cooldown_duration) UpdateButtons() - addtimer(CALLBACK(src, .proc/UpdateButtons), cult_mark_cooldown_duration + 1) + addtimer(CALLBACK(src, PROC_REF(UpdateButtons)), cult_mark_cooldown_duration + 1) return TRUE unset_ranged_ability(caller, span_cult("The marking rite failed!")) @@ -326,7 +326,7 @@ to_chat(owner, span_cultbold("You have marked [mark_target] for the cult! It will last for [DisplayTimeText(cult_mark_duration)].")) COOLDOWN_START(src, cult_mark_cooldown, cult_mark_cooldown_duration) update_button_status() - addtimer(CALLBACK(src, .proc/reset_button), cult_mark_cooldown_duration + 1) + addtimer(CALLBACK(src, PROC_REF(reset_button)), cult_mark_cooldown_duration + 1) return TRUE to_chat(owner, span_cult("The marking failed!")) @@ -431,7 +431,7 @@ caller.click_intercept = null throwee_ref = null UpdateButtons() - addtimer(CALLBACK(src, .proc/UpdateButtons), pulse_cooldown_duration + 1) + addtimer(CALLBACK(src, PROC_REF(UpdateButtons)), pulse_cooldown_duration + 1) return TRUE diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index a0634e5b820..186945303d2 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -297,7 +297,7 @@ Striking a noncultist, however, will tear their flesh."} hoodtype = /obj/item/clothing/head/hooded/cult_hoodie/cult_shield /obj/item/clothing/suit/hooded/cultrobes/cult_shield/setup_shielding() - AddComponent(/datum/component/shielded, recharge_start_delay = 0 SECONDS, shield_icon_file = 'icons/effects/cult/effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, .proc/shield_damaged)) + AddComponent(/datum/component/shielded, recharge_start_delay = 0 SECONDS, shield_icon_file = 'icons/effects/cult/effects.dmi', shield_icon = "shield-cult", run_hit_callback = CALLBACK(src, PROC_REF(shield_damaged))) /// A proc for callback when the shield breaks, since cult robes are stupid and have different effects /obj/item/clothing/suit/hooded/cultrobes/cult_shield/proc/shield_damaged(mob/living/wearer, attack_text, new_current_charges) @@ -439,7 +439,7 @@ Striking a noncultist, however, will tear their flesh."} if(totalcurses >= MAX_SHUTTLE_CURSES && (world.time < first_curse_time + SHUTTLE_CURSE_OMFG_TIMESPAN)) var/omfg_message = pick_list(CULT_SHUTTLE_CURSE, "omfg_announce") || "LEAVE US ALONE!" - addtimer(CALLBACK(GLOBAL_PROC, .proc/priority_announce, omfg_message, "Priority Alert", 'sound/misc/notice1.ogg', null, "Nanotrasen Department of Transportation: Central Command"), rand(2 SECONDS, 6 SECONDS)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(priority_announce), omfg_message, "Priority Alert", 'sound/misc/notice1.ogg', null, "Nanotrasen Department of Transportation: Central Command"), rand(2 SECONDS, 6 SECONDS)) for(var/mob/iter_player as anything in GLOB.player_list) if(IS_CULTIST(iter_player)) iter_player.client?.give_award(/datum/award/achievement/misc/cult_shuttle_omfg, iter_player) @@ -761,11 +761,11 @@ Striking a noncultist, however, will tear their flesh."} qdel(src) return charging = TRUE - INVOKE_ASYNC(src, .proc/charge, user) + INVOKE_ASYNC(src, PROC_REF(charge), user) if(do_after(user, 9 SECONDS, target = user)) firing = TRUE ADD_TRAIT(user, TRAIT_IMMOBILIZED, CULT_TRAIT) - INVOKE_ASYNC(src, .proc/pewpew, user, clickparams) + INVOKE_ASYNC(src, PROC_REF(pewpew), user, clickparams) var/obj/structure/emergency_shield/cult/weak/N = new(user.loc) if(do_after(user, 9 SECONDS, target = user)) user.Paralyze(40) @@ -881,7 +881,7 @@ Striking a noncultist, however, will tear their flesh."} playsound(src, 'sound/weapons/parry.ogg', 100, TRUE) if(illusions > 0) illusions-- - addtimer(CALLBACK(src, /obj/item/shield/mirror.proc/readd), 450) + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/shield/mirror, readd)), 450) if(prob(60)) var/mob/living/simple_animal/hostile/illusion/M = new(owner.loc) M.faction = list("cult") diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 5f430a9d054..8a9f8fec207 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -147,7 +147,7 @@ user, src, choices, - custom_check = CALLBACK(src, .proc/check_menu, user), + custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE, ) diff --git a/code/modules/antagonists/cult/rune_spawn_action.dm b/code/modules/antagonists/cult/rune_spawn_action.dm index de9cdda3570..6846307db70 100644 --- a/code/modules/antagonists/cult/rune_spawn_action.dm +++ b/code/modules/antagonists/cult/rune_spawn_action.dm @@ -57,7 +57,7 @@ cooldown = base_cooldown + world.time owner.update_action_buttons_icon() - addtimer(CALLBACK(owner, /mob.proc/update_action_buttons_icon), base_cooldown) + addtimer(CALLBACK(owner, TYPE_PROC_REF(/mob, update_action_buttons_icon)), base_cooldown) var/list/health if(damage_interrupt && isliving(owner)) var/mob/living/L = owner @@ -66,7 +66,7 @@ if(istype(T, /turf/open/floor/engine/cult)) scribe_mod *= 0.5 playsound(T, 'sound/magic/enter_blood.ogg', 100, FALSE) - if(do_after(owner, scribe_mod, target = owner, extra_checks = CALLBACK(owner, /mob.proc/break_do_after_checks, health, action_interrupt))) + if(do_after(owner, scribe_mod, target = owner, extra_checks = CALLBACK(owner, TYPE_PROC_REF(/mob, break_do_after_checks), health, action_interrupt))) new rune_type(owner.loc, chosen_keyword) else qdel(R1) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 521a5384a60..569eb28d211 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -487,7 +487,7 @@ structure_check() searches for nearby cultist structures required for the invoca outer_portal = new(T, 600, color) set_light_range(4) update_light() - addtimer(CALLBACK(src, .proc/close_portal), 600, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(close_portal)), 600, TIMER_UNIQUE) /obj/effect/rune/teleport/proc/close_portal() QDEL_NULL(inner_portal) @@ -984,11 +984,11 @@ structure_check() searches for nearby cultist structures required for the invoca if(ishuman(M)) if(!IS_CULTIST(M)) sec_hud.hide_from(M) - addtimer(CALLBACK(GLOBAL_PROC, .proc/hudFix, M), duration) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(hudFix), M), duration) var/image/A = image('icons/mob/nonhuman-player/cult.dmi',M,"cultist", ABOVE_MOB_LAYER) A.override = 1 add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "human_apoc", A, NONE) - addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"human_apoc",TRUE), duration) + addtimer(CALLBACK(M, TYPE_PROC_REF(/atom/, remove_alt_appearance),"human_apoc",TRUE), duration) images += A SEND_SOUND(M, pick(sound('sound/ambience/antag/bloodcult.ogg'),sound('sound/voice/ghost_whisper.ogg'),sound('sound/misc/ghosty_wind.ogg'))) else @@ -996,13 +996,13 @@ structure_check() searches for nearby cultist structures required for the invoca var/image/B = image('icons/mob/simple/mob.dmi',M,construct, ABOVE_MOB_LAYER) B.override = 1 add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "mob_apoc", B, NONE) - addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"mob_apoc",TRUE), duration) + addtimer(CALLBACK(M, TYPE_PROC_REF(/atom/, remove_alt_appearance),"mob_apoc",TRUE), duration) images += B if(!IS_CULTIST(M)) if(M.client) var/image/C = image('icons/effects/cult/effects.dmi',M,"bloodsparkles", ABOVE_MOB_LAYER) add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/cult, "cult_apoc", C, NONE) - addtimer(CALLBACK(M,/atom/.proc/remove_alt_appearance,"cult_apoc",TRUE), duration) + addtimer(CALLBACK(M, TYPE_PROC_REF(/atom/, remove_alt_appearance),"cult_apoc",TRUE), duration) images += C else to_chat(M, span_cultlarge("An Apocalypse Rune was invoked in the [place.name], it is no longer available as a summoning site!")) diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 4bdea9c40e2..b27dba98051 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -71,7 +71,7 @@ the new instance inside the host to be updated to the template's stats. browser = new /datum/browser(src, "disease_menu", "Adaptation Menu", 1000, 770, src) freemove_end = world.time + FREEMOVE_TIME - freemove_end_timerid = addtimer(CALLBACK(src, .proc/infect_random_patient_zero), FREEMOVE_TIME, TIMER_STOPPABLE) + freemove_end_timerid = addtimer(CALLBACK(src, PROC_REF(infect_random_patient_zero)), FREEMOVE_TIME, TIMER_STOPPABLE) /mob/camera/disease/Destroy() . = ..() @@ -288,7 +288,7 @@ the new instance inside the host to be updated to the template's stats. /mob/camera/disease/proc/set_following(mob/living/L) if(following_host) UnregisterSignal(following_host, COMSIG_MOVABLE_MOVED) - RegisterSignal(L, COMSIG_MOVABLE_MOVED, .proc/follow_mob) + RegisterSignal(L, COMSIG_MOVABLE_MOVED, PROC_REF(follow_mob)) following_host = L follow_mob() @@ -329,7 +329,7 @@ the new instance inside the host to be updated to the template's stats. /mob/camera/disease/proc/adapt_cooldown() to_chat(src, span_notice("You have altered your genetic structure. You will be unable to adapt again for [DisplayTimeText(adaptation_cooldown)].")) next_adaptation_time = world.time + adaptation_cooldown - addtimer(CALLBACK(src, .proc/notify_adapt_ready), adaptation_cooldown) + addtimer(CALLBACK(src, PROC_REF(notify_adapt_ready)), adaptation_cooldown) /mob/camera/disease/proc/notify_adapt_ready() to_chat(src, span_notice("You are now ready to adapt again.")) diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm index d1fe23e6881..b86b0026167 100644 --- a/code/modules/antagonists/heretic/heretic_antag.dm +++ b/code/modules/antagonists/heretic/heretic_antag.dm @@ -79,7 +79,7 @@ knowledge_data["disabled"] = (initial(knowledge.cost) > knowledge_points) // Final knowledge can't be learned until all objectives are complete. - if(ispath(knowledge, /datum/heretic_knowledge/final)) + if(ispath(knowledge, /datum/heretic_knowledge/ultimate)) knowledge_data["disabled"] = !can_ascend() knowledge_data["hereticPath"] = initial(knowledge.route) @@ -177,7 +177,7 @@ gain_knowledge(starting_knowledge) GLOB.reality_smash_track.add_tracked_mind(owner) - addtimer(CALLBACK(src, .proc/passive_influence_gain), passive_gain_timer) // Gain +1 knowledge every 20 minutes. + addtimer(CALLBACK(src, PROC_REF(passive_influence_gain)), passive_gain_timer) // Gain +1 knowledge every 20 minutes. return ..() /datum/antagonist/heretic/on_removal() @@ -194,11 +194,11 @@ handle_clown_mutation(our_mob, "Ancient knowledge described to you has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") our_mob.faction |= FACTION_HERETIC - RegisterSignal(our_mob, list(COMSIG_MOB_BEFORE_SPELL_CAST, COMSIG_MOB_SPELL_ACTIVATED), .proc/on_spell_cast) - RegisterSignal(our_mob, COMSIG_MOB_ITEM_AFTERATTACK, .proc/on_item_afterattack) - RegisterSignal(our_mob, COMSIG_MOB_LOGIN, .proc/fix_influence_network) - RegisterSignal(our_mob, COMSIG_LIVING_POST_FULLY_HEAL, .proc/after_fully_healed) - RegisterSignal(our_mob, COMSIG_LIVING_CULT_SACRIFICED, .proc/on_cult_sacrificed) + RegisterSignal(our_mob, list(COMSIG_MOB_BEFORE_SPELL_CAST, COMSIG_MOB_SPELL_ACTIVATED), PROC_REF(on_spell_cast)) + RegisterSignal(our_mob, COMSIG_MOB_ITEM_AFTERATTACK, PROC_REF(on_item_afterattack)) + RegisterSignal(our_mob, COMSIG_MOB_LOGIN, PROC_REF(fix_influence_network)) + RegisterSignal(our_mob, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(after_fully_healed)) + RegisterSignal(our_mob, COMSIG_LIVING_CULT_SACRIFICED, PROC_REF(on_cult_sacrificed)) /datum/antagonist/heretic/remove_innate_effects(mob/living/mob_override) var/mob/living/our_mob = mob_override || owner.current @@ -265,7 +265,7 @@ if(QDELETED(offhand) || !istype(offhand, /obj/item/melee/touch_attack/mansus_fist)) return - try_draw_rune(source, target, additional_checks = CALLBACK(src, .proc/check_mansus_grasp_offhand, source)) + try_draw_rune(source, target, additional_checks = CALLBACK(src, PROC_REF(check_mansus_grasp_offhand), source)) return COMPONENT_CANCEL_ATTACK_CHAIN /** @@ -291,7 +291,7 @@ target_turf.balloon_alert(user, "already drawing a rune!") return - INVOKE_ASYNC(src, .proc/draw_rune, user, target_turf, drawing_time, additional_checks) + INVOKE_ASYNC(src, PROC_REF(draw_rune), user, target_turf, drawing_time, additional_checks) /** * The actual process of drawing a rune. @@ -392,7 +392,7 @@ target_image.overlays = target.overlays LAZYSET(sac_targets, target, target_image) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/on_target_deleted) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_deleted)) /** * Removes [target] from the heretic's sacrifice list. @@ -423,7 +423,7 @@ knowledge_points++ if(owner.current.stat <= SOFT_CRIT) to_chat(owner.current, "[span_hear("You hear a whisper...")] [span_hypnophrase(pick(strings(HERETIC_INFLUENCE_FILE, "drain_message")))]") - addtimer(CALLBACK(src, .proc/passive_influence_gain), passive_gain_timer) + addtimer(CALLBACK(src, PROC_REF(passive_influence_gain)), passive_gain_timer) /datum/antagonist/heretic/roundend_report() var/list/parts = list() @@ -478,12 +478,12 @@ switch(has_living_heart()) if(HERETIC_NO_LIVING_HEART) - .["Give Living Heart"] = CALLBACK(src, .proc/give_living_heart) + .["Give Living Heart"] = CALLBACK(src, PROC_REF(give_living_heart)) if(HERETIC_HAS_LIVING_HEART) - .["Add Heart Target (Marked Mob)"] = CALLBACK(src, .proc/add_marked_as_target) - .["Remove Heart Target"] = CALLBACK(src, .proc/remove_target) + .["Add Heart Target (Marked Mob)"] = CALLBACK(src, PROC_REF(add_marked_as_target)) + .["Remove Heart Target"] = CALLBACK(src, PROC_REF(remove_target)) - .["Adjust Knowledge Points"] = CALLBACK(src, .proc/admin_change_points) + .["Adjust Knowledge Points"] = CALLBACK(src, PROC_REF(admin_change_points)) /* * Admin proc for giving a heretic a Living Heart easily. @@ -564,7 +564,7 @@ for(var/knowledge_index in researched_knowledge) var/datum/heretic_knowledge/knowledge = researched_knowledge[knowledge_index] - if(istype(knowledge, /datum/heretic_knowledge/final)) + if(istype(knowledge, /datum/heretic_knowledge/ultimate)) string_of_knowledge += span_bold(knowledge.name) else string_of_knowledge += knowledge.name @@ -636,7 +636,7 @@ continue rituals[knowledge.name] = knowledge - return sortTim(rituals, /proc/cmp_heretic_knowledge, associative = TRUE) + return sortTim(rituals, GLOBAL_PROC_REF(cmp_heretic_knowledge), associative = TRUE) /* * Checks to see if our heretic can ccurrently ascend. diff --git a/code/modules/antagonists/heretic/heretic_focus.dm b/code/modules/antagonists/heretic/heretic_focus.dm index 2bcd7577e84..d6faf2577c2 100644 --- a/code/modules/antagonists/heretic/heretic_focus.dm +++ b/code/modules/antagonists/heretic/heretic_focus.dm @@ -7,9 +7,9 @@ if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equip) - RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/on_drop) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) + RegisterSignal(target, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) var/obj/item/item_target = target // If our loc is a mob, it's possible we already have it equippied diff --git a/code/modules/antagonists/heretic/heretic_knowledge.dm b/code/modules/antagonists/heretic/heretic_knowledge.dm index 0fbc8be2383..3296fc74e93 100644 --- a/code/modules/antagonists/heretic/heretic_knowledge.dm +++ b/code/modules/antagonists/heretic/heretic_knowledge.dm @@ -242,7 +242,7 @@ /datum/heretic_knowledge/limited_amount/starting/New() . = ..() // Starting path also determines the final knowledge we're limited too - for(var/datum/heretic_knowledge/final_knowledge_type as anything in subtypesof(/datum/heretic_knowledge/final)) + for(var/datum/heretic_knowledge/final_knowledge_type as anything in subtypesof(/datum/heretic_knowledge/ultimate)) if(initial(final_knowledge_type.route) == route) continue banned_knowledge += final_knowledge_type @@ -265,8 +265,8 @@ var/datum/status_effect/eldritch/mark_type /datum/heretic_knowledge/mark/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) /datum/heretic_knowledge/mark/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_HERETIC_MANSUS_GRASP_ATTACK, COMSIG_HERETIC_BLADE_ATTACK)) @@ -328,8 +328,8 @@ cost = 2 /datum/heretic_knowledge/blade_upgrade/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) - RegisterSignal(user, COMSIG_HERETIC_RANGED_BLADE_ATTACK, .proc/on_ranged_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) + RegisterSignal(user, COMSIG_HERETIC_RANGED_BLADE_ATTACK, PROC_REF(on_ranged_eldritch_blade)) /datum/heretic_knowledge/blade_upgrade/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_HERETIC_BLADE_ATTACK, COMSIG_HERETIC_RANGED_BLADE_ATTACK)) @@ -432,7 +432,7 @@ potential_targets[human_to_check.real_name] = human_to_check - var/chosen_mob = tgui_input_list(user, "Select the victim you wish to curse.", name, sort_list(potential_targets, /proc/cmp_text_asc)) + var/chosen_mob = tgui_input_list(user, "Select the victim you wish to curse.", name, sort_list(potential_targets, GLOBAL_PROC_REF(cmp_text_asc))) if(isnull(chosen_mob)) return FALSE @@ -471,7 +471,7 @@ /datum/heretic_knowledge/curse/proc/curse(mob/living/carbon/human/chosen_mob, boosted = FALSE) SHOULD_CALL_PARENT(TRUE) - addtimer(CALLBACK(src, .proc/uncurse, chosen_mob, boosted), duration * (boosted ? duration_modifier : 1)) + addtimer(CALLBACK(src, PROC_REF(uncurse), chosen_mob, boosted), duration * (boosted ? duration_modifier : 1)) if(!curse_color) return @@ -637,14 +637,14 @@ /* * The special final tier of knowledges that unlocks ASCENSION. */ -/datum/heretic_knowledge/final - abstract_parent_type = /datum/heretic_knowledge/final +/datum/heretic_knowledge/ultimate + abstract_parent_type = /datum/heretic_knowledge/ultimate mutually_exclusive = TRUE // I guess, but it doesn't really matter by this point cost = 2 priority = MAX_KNOWLEDGE_PRIORITY + 1 // Yes, the final ritual should be ABOVE the max priority. required_atoms = list(/mob/living/carbon/human = 3) -/datum/heretic_knowledge/final/on_research(mob/user) +/datum/heretic_knowledge/ultimate/on_research(mob/user) . = ..() var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) var/total_points = 0 @@ -655,7 +655,7 @@ They have [length(heretic_datum.researched_knowledge)] knowledge nodes researched, totalling [total_points] points \ and have sacrificed [heretic_datum.total_sacrifices] people ([heretic_datum.high_value_sacrifices] of which were high value)") -/datum/heretic_knowledge/final/can_be_invoked(datum/antagonist/heretic/invoker) +/datum/heretic_knowledge/ultimate/can_be_invoked(datum/antagonist/heretic/invoker) if(invoker.ascended) return FALSE @@ -664,7 +664,7 @@ return TRUE -/datum/heretic_knowledge/final/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) +/datum/heretic_knowledge/ultimate/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) if(!can_be_invoked(heretic_datum)) return FALSE @@ -682,10 +682,10 @@ /** * Checks if the passed human is a valid sacrifice for our ritual. */ -/datum/heretic_knowledge/final/proc/is_valid_sacrifice(mob/living/carbon/human/sacrifice) +/datum/heretic_knowledge/ultimate/proc/is_valid_sacrifice(mob/living/carbon/human/sacrifice) return (sacrifice.stat == DEAD) && !ismonkey(sacrifice) -/datum/heretic_knowledge/final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +/datum/heretic_knowledge/ultimate/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) heretic_datum.ascended = TRUE @@ -698,7 +698,7 @@ log_heretic_knowledge("[key_name(user)] completed their final ritual at [worldtime2text()].") return TRUE -/datum/heretic_knowledge/final/cleanup_atoms(list/selected_atoms) +/datum/heretic_knowledge/ultimate/cleanup_atoms(list/selected_atoms) for(var/mob/living/carbon/human/sacrifice in selected_atoms) selected_atoms -= sacrifice sacrifice.gib() diff --git a/code/modules/antagonists/heretic/heretic_living_heart.dm b/code/modules/antagonists/heretic/heretic_living_heart.dm index 3fa3a40c250..e8b95eeebe2 100644 --- a/code/modules/antagonists/heretic/heretic_living_heart.dm +++ b/code/modules/antagonists/heretic/heretic_living_heart.dm @@ -25,8 +25,8 @@ /datum/component/living_heart/RegisterWithParent() ADD_TRAIT(parent, TRAIT_LIVING_HEART, REF(src)) - RegisterSignal(parent, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed) - RegisterSignal(parent, COMSIG_ORGAN_BEING_REPLACED, .proc/on_organ_replaced) + RegisterSignal(parent, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed)) + RegisterSignal(parent, COMSIG_ORGAN_BEING_REPLACED, PROC_REF(on_organ_replaced)) /datum/component/living_heart/UnregisterFromParent() REMOVE_TRAIT(parent, TRAIT_LIVING_HEART, REF(src)) @@ -125,7 +125,7 @@ owner, owner, targets_to_choose, - custom_check = CALLBACK(src, .proc/check_menu), + custom_check = CALLBACK(src, PROC_REF(check_menu)), radius = 40, require_near = TRUE, tooltips = TRUE, diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm index 6e6dbf8535c..65a6f074beb 100644 --- a/code/modules/antagonists/heretic/influences.dm +++ b/code/modules/antagonists/heretic/influences.dm @@ -128,7 +128,7 @@ /obj/effect/visible_heretic_influence/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/show_presence), 15 SECONDS) + addtimer(CALLBACK(src, PROC_REF(show_presence)), 15 SECONDS) var/image/silicon_image = image('icons/effects/eldritch.dmi', src, null, OBJ_LAYER) silicon_image.override = TRUE @@ -234,7 +234,7 @@ if(being_drained) balloon_alert(user, "already being drained!") else - INVOKE_ASYNC(src, .proc/drain_influence, user, 1) + INVOKE_ASYNC(src, PROC_REF(drain_influence), user, 1) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN @@ -247,7 +247,7 @@ if(!being_drained && istype(weapon, /obj/item/codex_cicatrix)) var/obj/item/codex_cicatrix/codex = weapon codex.open_animation() - INVOKE_ASYNC(src, .proc/drain_influence, user, 2) + INVOKE_ASYNC(src, PROC_REF(drain_influence), user, 2) return TRUE @@ -261,7 +261,7 @@ being_drained = TRUE balloon_alert(user, "draining influence...") - RegisterSignal(user, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(user, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) if(!do_after(user, 10 SECONDS, src)) being_drained = FALSE diff --git a/code/modules/antagonists/heretic/items/forbidden_book.dm b/code/modules/antagonists/heretic/items/forbidden_book.dm index e9d848993d9..cd764f292bf 100644 --- a/code/modules/antagonists/heretic/items/forbidden_book.dm +++ b/code/modules/antagonists/heretic/items/forbidden_book.dm @@ -50,7 +50,7 @@ icon_state = "[base_icon_state]_open" flick("[base_icon_state]_opening", src) - addtimer(CALLBACK(src, .proc/close_animation), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(close_animation)), 5 SECONDS) /* * Plays a closing animation and resets the icon state. diff --git a/code/modules/antagonists/heretic/items/hunter_rifle.dm b/code/modules/antagonists/heretic/items/hunter_rifle.dm index 21bea5d4fa8..6957470bcfb 100644 --- a/code/modules/antagonists/heretic/items/hunter_rifle.dm +++ b/code/modules/antagonists/heretic/items/hunter_rifle.dm @@ -84,7 +84,7 @@ animate(reticle, fire_time * 0.5, transform = turn(reticle.transform, 180)) currently_aiming = TRUE - . = do_after(user, fire_time, target, IGNORE_TARGET_LOC_CHANGE, extra_checks = CALLBACK(src, .proc/check_fire_callback, target, user)) + . = do_after(user, fire_time, target, IGNORE_TARGET_LOC_CHANGE, extra_checks = CALLBACK(src, PROC_REF(check_fire_callback), target, user)) currently_aiming = FALSE animate(reticle, 0.5 SECONDS, alpha = 0) diff --git a/code/modules/antagonists/heretic/knowledge/ash_lore.dm b/code/modules/antagonists/heretic/knowledge/ash_lore.dm index d05d6a76f8c..2f248def655 100644 --- a/code/modules/antagonists/heretic/knowledge/ash_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/ash_lore.dm @@ -54,7 +54,7 @@ route = PATH_ASH /datum/heretic_knowledge/ashen_grasp/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) /datum/heretic_knowledge/ashen_grasp/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK) @@ -158,7 +158,7 @@ gain_text = "The fire was inescapable, and yet, life remained in his charred body. \ The Nightwatcher was a particular man, always watching." next_knowledge = list( - /datum/heretic_knowledge/final/ash_final, + /datum/heretic_knowledge/ultimate/ash_final, /datum/heretic_knowledge/summon/ashy, /datum/heretic_knowledge/summon/rusty, ) @@ -166,7 +166,7 @@ cost = 1 route = PATH_ASH -/datum/heretic_knowledge/final/ash_final +/datum/heretic_knowledge/ultimate/ash_final name = "Ashlord's Rite" desc = "The ascension ritual of the Path of Ash. \ Bring 3 burning or husked corpses to a transumation rune to complete the ritual. \ @@ -188,7 +188,7 @@ TRAIT_NOFIRE, ) -/datum/heretic_knowledge/final/ash_final/is_valid_sacrifice(mob/living/carbon/human/sacrifice) +/datum/heretic_knowledge/ultimate/ash_final/is_valid_sacrifice(mob/living/carbon/human/sacrifice) . = ..() if(!.) return @@ -199,7 +199,7 @@ return TRUE return FALSE -/datum/heretic_knowledge/final/ash_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +/datum/heretic_knowledge/ultimate/ash_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) . = ..() priority_announce("[generate_heretic_text()] Fear the blaze, for the Ashlord, [user.real_name] has ascended! The flames shall consume all! [generate_heretic_text()]","[generate_heretic_text()]", ANNOUNCER_SPANOMALIES) diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm index f136143c24d..b96aa7720ad 100644 --- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm @@ -50,7 +50,7 @@ route = PATH_BLADE /datum/heretic_knowledge/blade_grasp/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) /datum/heretic_knowledge/blade_grasp/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK) @@ -113,7 +113,7 @@ var/riposte_ready = TRUE /datum/heretic_knowledge/blade_dance/on_gain(mob/user) - RegisterSignal(user, COMSIG_HUMAN_CHECK_SHIELDS, .proc/on_shield_reaction) + RegisterSignal(user, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(on_shield_reaction)) /datum/heretic_knowledge/blade_dance/on_lose(mob/user) UnregisterSignal(user, COMSIG_HUMAN_CHECK_SHIELDS) @@ -165,11 +165,11 @@ return // If we made it here, deliver the strike - INVOKE_ASYNC(src, .proc/counter_attack, source, attacker, striking_with, attack_text) + INVOKE_ASYNC(src, PROC_REF(counter_attack), source, attacker, striking_with, attack_text) // And reset after a bit riposte_ready = FALSE - addtimer(CALLBACK(src, .proc/reset_riposte, source), BLADE_DANCE_COOLDOWN) + addtimer(CALLBACK(src, PROC_REF(reset_riposte), source), BLADE_DANCE_COOLDOWN) /datum/heretic_knowledge/blade_dance/proc/counter_attack(mob/living/carbon/human/source, mob/living/target, obj/item/melee/sickly_blade/weapon, attack_text) playsound(get_turf(source), 'sound/weapons/parry.ogg', 100, TRUE) @@ -241,9 +241,9 @@ /datum/heretic_knowledge/duel_stance/on_gain(mob/user) ADD_TRAIT(user, TRAIT_NODISMEMBER, type) - RegisterSignal(user, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(user, COMSIG_CARBON_GAIN_WOUND, .proc/on_wound_gain) - RegisterSignal(user, COMSIG_CARBON_HEALTH_UPDATE, .proc/on_health_update) + RegisterSignal(user, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(user, COMSIG_CARBON_GAIN_WOUND, PROC_REF(on_wound_gain)) + RegisterSignal(user, COMSIG_CARBON_HEALTH_UPDATE, PROC_REF(on_health_update)) on_health_update(user) // Run this once, so if the knowledge is learned while hurt it activates properly @@ -312,7 +312,7 @@ return // Give it a short delay (for style, also lets people dodge it I guess) - addtimer(CALLBACK(src, .proc/follow_up_attack, source, target, off_hand), 0.25 SECONDS) + addtimer(CALLBACK(src, PROC_REF(follow_up_attack), source, target, off_hand), 0.25 SECONDS) /datum/heretic_knowledge/blade_upgrade/blade/proc/follow_up_attack(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade) if(QDELETED(source) || QDELETED(target) || QDELETED(blade)) @@ -340,14 +340,14 @@ The Torn Champion smiled at their first taste of agony, and with a nod, their blades became my own." next_knowledge = list( /datum/heretic_knowledge/summon/maid_in_mirror, - /datum/heretic_knowledge/final/blade_final, + /datum/heretic_knowledge/ultimate/blade_final, /datum/heretic_knowledge/rifle, ) spell_to_add = /datum/action/cooldown/spell/pointed/projectile/furious_steel cost = 1 route = PATH_BLADE -/datum/heretic_knowledge/final/blade_final +/datum/heretic_knowledge/ultimate/blade_final name = "Maelstrom of Silver" desc = "The ascension ritual of the Path of Blades. \ Bring 3 headless corpses to a transmutation rune to complete the ritual. \ @@ -360,26 +360,26 @@ I AM UNMATCHED! A STORM OF STEEL AND SILVER IS UPON US! WITNESS MY ASCENSION!" route = PATH_BLADE -/datum/heretic_knowledge/final/blade_final/is_valid_sacrifice(mob/living/carbon/human/sacrifice) +/datum/heretic_knowledge/ultimate/blade_final/is_valid_sacrifice(mob/living/carbon/human/sacrifice) . = ..() if(!.) return FALSE return !sacrifice.get_bodypart(BODY_ZONE_HEAD) -/datum/heretic_knowledge/final/blade_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +/datum/heretic_knowledge/ultimate/blade_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) . = ..() priority_announce("[generate_heretic_text()] Master of blades, the Torn Champion's disciple, [user.real_name] has ascended! Their steel is that which will cut reality in a maelstom of silver! [generate_heretic_text()]","[generate_heretic_text()]", ANNOUNCER_SPANOMALIES) user.client?.give_award(/datum/award/achievement/misc/blade_ascension, user) ADD_TRAIT(user, TRAIT_STUNIMMUNE, name) ADD_TRAIT(user, TRAIT_NEVER_WOUNDED, name) - RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, .proc/on_eldritch_blade) + RegisterSignal(user, COMSIG_HERETIC_BLADE_ATTACK, PROC_REF(on_eldritch_blade)) user.apply_status_effect(/datum/status_effect/protective_blades/recharging, null, 8, 30, 0.25 SECONDS, 1 MINUTES) var/datum/action/cooldown/spell/pointed/projectile/furious_steel/steel_spell = locate() in user.actions steel_spell?.cooldown_time /= 3 -/datum/heretic_knowledge/final/blade_final/proc/on_eldritch_blade(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade) +/datum/heretic_knowledge/ultimate/blade_final/proc/on_eldritch_blade(mob/living/source, mob/living/target, obj/item/melee/sickly_blade/blade) SIGNAL_HANDLER if(target == source) diff --git a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm index 629d851412c..5c23b9bcfea 100644 --- a/code/modules/antagonists/heretic/knowledge/flesh_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/flesh_lore.dm @@ -69,7 +69,7 @@ route = PATH_FLESH /datum/heretic_knowledge/limited_amount/flesh_grasp/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) /datum/heretic_knowledge/limited_amount/flesh_grasp/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK) @@ -110,8 +110,8 @@ /datum/status_effect/ghoul, GHOUL_MAX_HEALTH, user.mind, - CALLBACK(src, .proc/apply_to_ghoul), - CALLBACK(src, .proc/remove_from_ghoul), + CALLBACK(src, PROC_REF(apply_to_ghoul)), + CALLBACK(src, PROC_REF(remove_from_ghoul)), ) /// Callback for the ghoul status effect - Tracking all of our ghouls @@ -195,8 +195,8 @@ /datum/status_effect/ghoul, MUTE_MAX_HEALTH, user.mind, - CALLBACK(src, .proc/apply_to_ghoul), - CALLBACK(src, .proc/remove_from_ghoul), + CALLBACK(src, PROC_REF(apply_to_ghoul)), + CALLBACK(src, PROC_REF(remove_from_ghoul)), ) /// Callback for the ghoul status effect - Tracks all of our ghouls and applies effects @@ -268,7 +268,7 @@ gain_text = "I was able to combine my greed and desires to summon an eldritch beast I had never seen before. \ An ever shapeshifting mass of flesh, it knew well my goals. The Marshal approved." next_knowledge = list( - /datum/heretic_knowledge/final/flesh_final, + /datum/heretic_knowledge/ultimate/flesh_final, /datum/heretic_knowledge/summon/ashy, /datum/heretic_knowledge/spell/cleave, ) @@ -283,7 +283,7 @@ cost = 1 route = PATH_FLESH -/datum/heretic_knowledge/final/flesh_final +/datum/heretic_knowledge/ultimate/flesh_final name = "Priest's Final Hymn" desc = "The ascension ritual of the Path of Flesh. \ Bring 4 corpses to a transumation rune to complete the ritual. \ @@ -299,7 +299,7 @@ required_atoms = list(/mob/living/carbon/human = 4) route = PATH_FLESH -/datum/heretic_knowledge/final/flesh_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +/datum/heretic_knowledge/ultimate/flesh_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) . = ..() priority_announce("[generate_heretic_text()] Ever coiling vortex. Reality unfolded. ARMS OUTREACHED, THE LORD OF THE NIGHT, [user.real_name] has ascended! Fear the ever twisting hand! [generate_heretic_text()]", "[generate_heretic_text()]", ANNOUNCER_SPANOMALIES) diff --git a/code/modules/antagonists/heretic/knowledge/rust_lore.dm b/code/modules/antagonists/heretic/knowledge/rust_lore.dm index 020b1cb979e..86956513e97 100644 --- a/code/modules/antagonists/heretic/knowledge/rust_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/rust_lore.dm @@ -54,8 +54,8 @@ route = PATH_RUST /datum/heretic_knowledge/rust_fist/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY, .proc/on_secondary_mansus_grasp) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY, PROC_REF(on_secondary_mansus_grasp)) /datum/heretic_knowledge/rust_fist/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_HERETIC_MANSUS_GRASP_ATTACK, COMSIG_HERETIC_MANSUS_GRASP_ATTACK_SECONDARY)) @@ -88,8 +88,8 @@ route = PATH_RUST /datum/heretic_knowledge/rust_regen/on_gain(mob/user) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_move) - RegisterSignal(user, COMSIG_LIVING_LIFE, .proc/on_life) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life)) /datum/heretic_knowledge/rust_regen/on_lose(mob/user) UnregisterSignal(user, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_LIFE)) @@ -183,14 +183,14 @@ The Blacksmith was gone, and you hold their blade. Champions of hope, the Rustbringer is nigh!" next_knowledge = list( /datum/heretic_knowledge/rifle, - /datum/heretic_knowledge/final/rust_final, + /datum/heretic_knowledge/ultimate/rust_final, /datum/heretic_knowledge/summon/rusty, ) spell_to_add = /datum/action/cooldown/spell/cone/staggered/entropic_plume cost = 1 route = PATH_RUST -/datum/heretic_knowledge/final/rust_final +/datum/heretic_knowledge/ultimate/rust_final name = "Rustbringer's Oath" desc = "The ascension ritual of the Path of Rust. \ Bring 3 corpses to a transumation rune on the bridge of the station to complete the ritual. \ @@ -221,14 +221,14 @@ TRAIT_NOBREATH, ) -/datum/heretic_knowledge/final/rust_final/on_research(mob/user) +/datum/heretic_knowledge/ultimate/rust_final/on_research(mob/user) . = ..() // This map doesn't have a Bridge, for some reason?? // Let them complete the ritual anywhere if(!GLOB.areas_by_type[ritual_location]) ritual_location = null -/datum/heretic_knowledge/final/rust_final/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) +/datum/heretic_knowledge/ultimate/rust_final/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) if(ritual_location) var/area/our_area = get_area(loc) if(!istype(our_area, ritual_location)) @@ -237,12 +237,12 @@ return ..() -/datum/heretic_knowledge/final/rust_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +/datum/heretic_knowledge/ultimate/rust_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) . = ..() priority_announce("[generate_heretic_text()] Fear the decay, for the Rustbringer, [user.real_name] has ascended! None shall escape the corrosion! [generate_heretic_text()]","[generate_heretic_text()]", ANNOUNCER_SPANOMALIES) new /datum/rust_spread(loc) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_move) - RegisterSignal(user, COMSIG_LIVING_LIFE, .proc/on_life) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) + RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life)) user.client?.give_award(/datum/award/achievement/misc/rust_ascension, user) /** @@ -250,7 +250,7 @@ * * Gives our heretic ([source]) buffs if they stand on rust. */ -/datum/heretic_knowledge/final/rust_final/proc/on_move(mob/source, atom/old_loc, dir, forced, list/old_locs) +/datum/heretic_knowledge/ultimate/rust_final/proc/on_move(mob/source, atom/old_loc, dir, forced, list/old_locs) SIGNAL_HANDLER // If we're on a rusty turf, and haven't given out our traits, buff our guy @@ -273,7 +273,7 @@ * * Gradually heals the heretic ([source]) on rust. */ -/datum/heretic_knowledge/final/rust_final/proc/on_life(mob/living/source, delta_time, times_fired) +/datum/heretic_knowledge/ultimate/rust_final/proc/on_life(mob/living/source, delta_time, times_fired) SIGNAL_HANDLER var/turf/our_turf = get_turf(source) diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index cb5904beb89..d9d35b1c89b 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -37,7 +37,7 @@ if(!heretic_level_generated) heretic_level_generated = TRUE message_admins("Generating z-level for heretic sacrifices...") - INVOKE_ASYNC(src, .proc/generate_heretic_z_level) + INVOKE_ASYNC(src, PROC_REF(generate_heretic_z_level)) /// Generate the sacrifice z-level. /datum/heretic_knowledge/hunt_and_sacrifice/proc/generate_heretic_z_level() @@ -199,7 +199,7 @@ disembowel_target(sacrifice) /** - * This proc is called from [proc/sacrifice_process] after the heretic successfully sacrifices [sac_target]. + * This proc is called from [proc/sacrifice_process] after the heretic successfully sacrifices [sac_target].) * * Sets off a chain that sends the person sacrificed to the shadow realm to dodge hands to fight for survival. * @@ -236,8 +236,8 @@ sac_target.do_jitter_animation() log_combat(heretic_mind.current, sac_target, "sacrificed") - addtimer(CALLBACK(sac_target, /mob/living/carbon.proc/do_jitter_animation), SACRIFICE_SLEEP_DURATION * (1/3)) - addtimer(CALLBACK(sac_target, /mob/living/carbon.proc/do_jitter_animation), SACRIFICE_SLEEP_DURATION * (2/3)) + addtimer(CALLBACK(sac_target, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation)), SACRIFICE_SLEEP_DURATION * (1/3)) + addtimer(CALLBACK(sac_target, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation)), SACRIFICE_SLEEP_DURATION * (2/3)) // If our target is dead, try to revive them // and if we fail to revive them, don't proceede the chain @@ -252,12 +252,12 @@ sac_target.AdjustParalyzed(SACRIFICE_SLEEP_DURATION * 1.2) sac_target.AdjustImmobilized(SACRIFICE_SLEEP_DURATION * 1.2) - addtimer(CALLBACK(src, .proc/after_target_sleeps, sac_target, destination), SACRIFICE_SLEEP_DURATION * 0.5) // Teleport to the minigame + addtimer(CALLBACK(src, PROC_REF(after_target_sleeps), sac_target, destination), SACRIFICE_SLEEP_DURATION * 0.5) // Teleport to the minigame return TRUE /** - * This proc is called from [proc/begin_sacrifice] after the [sac_target] falls asleep, shortly after the sacrifice occurs. + * This proc is called from [proc/begin_sacrifice] after the [sac_target] falls asleep), shortly after the sacrifice occurs. * * Teleports the [sac_target] to the heretic room, asleep. * If it fails to teleport, they will be disemboweled and stop the chain. @@ -290,13 +290,13 @@ to_chat(sac_target, span_big(span_hypnophrase("Unnatural forces begin to claw at your every being from beyond the veil."))) sac_target.apply_status_effect(/datum/status_effect/unholy_determination, SACRIFICE_REALM_DURATION) - addtimer(CALLBACK(src, .proc/after_target_wakes, sac_target), SACRIFICE_SLEEP_DURATION * 0.5) // Begin the minigame + addtimer(CALLBACK(src, PROC_REF(after_target_wakes), sac_target), SACRIFICE_SLEEP_DURATION * 0.5) // Begin the minigame - RegisterSignal(sac_target, COMSIG_MOVABLE_Z_CHANGED, .proc/on_target_escape) // Cheese condition - RegisterSignal(sac_target, COMSIG_LIVING_DEATH, .proc/on_target_death) // Loss condition + RegisterSignal(sac_target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_target_escape)) // Cheese condition + RegisterSignal(sac_target, COMSIG_LIVING_DEATH, PROC_REF(on_target_death)) // Loss condition /** - * This proc is called from [proc/after_target_sleeps] when the [sac_target] should be waking up. + * This proc is called from [proc/after_target_sleeps] when the [sac_target] should be waking up.) * * Begins the survival minigame, featuring the sacrifice targets. * Gives them Helgrasp, throwing cursed hands towards them that they must dodge to survive. @@ -326,13 +326,13 @@ to_chat(sac_target, span_reallybig(span_hypnophrase("The grasp of the Mansus reveal themselves to you!"))) to_chat(sac_target, span_hypnophrase("You feel invigorated! Fight to survive!")) // When it runs out, let them know they're almost home free - addtimer(CALLBACK(src, .proc/after_helgrasp_ends, sac_target), helgrasp_time) + addtimer(CALLBACK(src, PROC_REF(after_helgrasp_ends), sac_target), helgrasp_time) // Win condition - var/win_timer = addtimer(CALLBACK(src, .proc/return_target, sac_target), SACRIFICE_REALM_DURATION, TIMER_STOPPABLE) + var/win_timer = addtimer(CALLBACK(src, PROC_REF(return_target), sac_target), SACRIFICE_REALM_DURATION, TIMER_STOPPABLE) LAZYSET(return_timers, REF(sac_target), win_timer) /** - * This proc is called from [proc/after_target_wakes] after the helgrasp runs out in the [sac_target]. + * This proc is called from [proc/after_target_wakes] after the helgrasp runs out in the [sac_target].) * * It gives them a message letting them know it's getting easier and they're almost free. */ @@ -343,7 +343,7 @@ to_chat(sac_target, span_hypnophrase("The worst is behind you... Not much longer! Hold fast, or expire!")) /** - * This proc is called from [proc/begin_sacrifice] if the target survived the shadow realm, or [COMSIG_LIVING_DEATH] if they don't. + * This proc is called from [proc/begin_sacrifice] if the target survived the shadow realm), or [COMSIG_LIVING_DEATH] if they don't. * * Teleports [sac_target] back to a random safe turf on the station (or observer spawn if it fails to find a safe turf). * Also clears their status effects, unregisters any signals associated with the shadow realm, and sends a message @@ -431,7 +431,7 @@ disembowel_target(sac_target) /** - * This proc is called from [proc/return_target] if the [sac_target] survives the shadow realm. + * This proc is called from [proc/return_target] if the [sac_target] survives the shadow realm.) * * Gives the sacrifice target some after effects upon ariving back to reality. */ @@ -457,7 +457,7 @@ sac_target.reagents?.add_reagent(/datum/reagent/medicine/epinephrine, 8) /** - * This proc is called from [proc/return_target] if the target dies in the shadow realm. + * This proc is called from [proc/return_target] if the target dies in the shadow realm.) * * After teleporting the target back to the station (dead), * it spawns a special red broken illusion on their spot, for style. diff --git a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm index e1aa8c2845e..2ffec3761d3 100644 --- a/code/modules/antagonists/heretic/knowledge/side_void_blade.dm +++ b/code/modules/antagonists/heretic/knowledge/side_void_blade.dm @@ -76,8 +76,8 @@ /datum/status_effect/ghoul, RISEN_MAX_HEALTH, user.mind, - CALLBACK(src, .proc/apply_to_risen), - CALLBACK(src, .proc/remove_from_risen), + CALLBACK(src, PROC_REF(apply_to_risen)), + CALLBACK(src, PROC_REF(remove_from_risen)), ) /// Callback for the ghoul status effect - what effects are applied to the ghoul. diff --git a/code/modules/antagonists/heretic/knowledge/void_lore.dm b/code/modules/antagonists/heretic/knowledge/void_lore.dm index a7f5f9ca82f..7f8d7f981e3 100644 --- a/code/modules/antagonists/heretic/knowledge/void_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/void_lore.dm @@ -64,7 +64,7 @@ route = PATH_VOID /datum/heretic_knowledge/void_grasp/on_gain(mob/user) - RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, .proc/on_mansus_grasp) + RegisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK, PROC_REF(on_mansus_grasp)) /datum/heretic_knowledge/void_grasp/on_lose(mob/user) UnregisterSignal(user, COMSIG_HERETIC_MANSUS_GRASP_ATTACK) @@ -146,7 +146,7 @@ var/dir = angle2dir(dir2angle(get_dir(user, target)) + 180) user.forceMove(get_step(target, dir)) - INVOKE_ASYNC(src, .proc/follow_up_attack, user, target, blade) + INVOKE_ASYNC(src, PROC_REF(follow_up_attack), user, target, blade) /datum/heretic_knowledge/blade_upgrade/void/proc/follow_up_attack(mob/living/user, mob/living/target, obj/item/melee/sickly_blade/blade) blade.melee_attack_chain(user, target) @@ -157,7 +157,7 @@ gain_text = "All is fleeting, but what else stays? I'm close to ending what was started. \ The Aristocrat reveals themself to me again. They tell me I am late. Their pull is immense, I cannot turn back." next_knowledge = list( - /datum/heretic_knowledge/final/void_final, + /datum/heretic_knowledge/ultimate/void_final, /datum/heretic_knowledge/spell/cleave, /datum/heretic_knowledge/summon/maid_in_mirror, ) @@ -165,7 +165,7 @@ cost = 1 route = PATH_VOID -/datum/heretic_knowledge/final/void_final +/datum/heretic_knowledge/ultimate/void_final name = "Waltz at the End of Time" desc = "The ascension ritual of the Path of Void. \ Bring 3 corpses to a transumation rune in sub-zero temperatures to complete the ritual. \ @@ -181,7 +181,7 @@ ///Reference to the ongoing voidstrom that surrounds the heretic var/datum/weather/void_storm/storm -/datum/heretic_knowledge/final/void_final/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) +/datum/heretic_knowledge/ultimate/void_final/recipe_snowflake_check(mob/living/user, list/atoms, list/selected_atoms, turf/loc) if(!isopenturf(loc)) loc.balloon_alert(user, "ritual failed, invalid location!") return FALSE @@ -193,7 +193,7 @@ return ..() -/datum/heretic_knowledge/final/void_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) +/datum/heretic_knowledge/ultimate/void_final/on_finished_recipe(mob/living/user, list/selected_atoms, turf/loc) . = ..() priority_announce("[generate_heretic_text()] The nobleman of void [user.real_name] has arrived, stepping along the Waltz that ends worlds! [generate_heretic_text()]","[generate_heretic_text()]", ANNOUNCER_SPANOMALIES) user.client?.give_award(/datum/award/achievement/misc/void_ascension, user) @@ -201,10 +201,10 @@ // Let's get this show on the road! sound_loop = new(user, TRUE, TRUE) - RegisterSignal(user, COMSIG_LIVING_LIFE, .proc/on_life) - RegisterSignal(user, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(user, COMSIG_LIVING_LIFE, PROC_REF(on_life)) + RegisterSignal(user, COMSIG_LIVING_DEATH, PROC_REF(on_death)) -/datum/heretic_knowledge/final/void_final/on_lose(mob/user) +/datum/heretic_knowledge/ultimate/void_final/on_lose(mob/user) on_death() // Losing is pretty much dying. I think RegisterSignal(user, list(COMSIG_LIVING_LIFE, COMSIG_LIVING_DEATH)) @@ -216,7 +216,7 @@ * * Also starts storms in any area that doesn't have one. */ -/datum/heretic_knowledge/final/void_final/proc/on_life(mob/living/source, delta_time, times_fired) +/datum/heretic_knowledge/ultimate/void_final/proc/on_life(mob/living/source, delta_time, times_fired) SIGNAL_HANDLER for(var/mob/living/carbon/close_carbon in view(5, source)) @@ -243,7 +243,7 @@ * * Stop the storm when the heretic passes away. */ -/datum/heretic_knowledge/final/void_final/proc/on_death() +/datum/heretic_knowledge/ultimate/void_final/proc/on_death() SIGNAL_HANDLER if(sound_loop) diff --git a/code/modules/antagonists/heretic/magic/ash_ascension.dm b/code/modules/antagonists/heretic/magic/ash_ascension.dm index f4faf0dc6d8..a4017ff6d12 100644 --- a/code/modules/antagonists/heretic/magic/ash_ascension.dm +++ b/code/modules/antagonists/heretic/magic/ash_ascension.dm @@ -78,7 +78,7 @@ /datum/action/cooldown/spell/fire_cascade/cast(atom/cast_on) . = ..() - INVOKE_ASYNC(src, .proc/fire_cascade, get_turf(cast_on), flame_radius) + INVOKE_ASYNC(src, PROC_REF(fire_cascade), get_turf(cast_on), flame_radius) /// Spreads a huge wave of fire in a radius around us, staggered between levels /datum/action/cooldown/spell/fire_cascade/proc/fire_cascade(atom/centre, flame_radius = 1) @@ -121,7 +121,7 @@ . = ..() var/static/list/offsets = list(-25, -10, 0, 10, 25) for(var/offset in offsets) - INVOKE_ASYNC(src, .proc/fire_line, owner, line_target(offset, flame_line_length, target, owner)) + INVOKE_ASYNC(src, PROC_REF(fire_line), owner, line_target(offset, flame_line_length, target, owner)) /datum/action/cooldown/spell/pointed/ash_beams/proc/line_target(offset, range, atom/at, atom/user) if(!at) diff --git a/code/modules/antagonists/heretic/magic/furious_steel.dm b/code/modules/antagonists/heretic/magic/furious_steel.dm index 2fc6322e4f1..cca4e56fbbd 100644 --- a/code/modules/antagonists/heretic/magic/furious_steel.dm +++ b/code/modules/antagonists/heretic/magic/furious_steel.dm @@ -31,7 +31,7 @@ return if(IS_HERETIC(owner)) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), .proc/on_focus_lost) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), PROC_REF(on_focus_lost)) /datum/action/cooldown/spell/pointed/projectile/furious_steel/Remove(mob/remove_from) UnregisterSignal(remove_from, SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING)) @@ -68,7 +68,7 @@ var/mob/living/living_user = on_who blade_effect = living_user.apply_status_effect(/datum/status_effect/protective_blades, null, projectile_amount, 25, 0.66 SECONDS) - RegisterSignal(blade_effect, COMSIG_PARENT_QDELETING, .proc/on_status_effect_deleted) + RegisterSignal(blade_effect, COMSIG_PARENT_QDELETING, PROC_REF(on_status_effect_deleted)) /datum/action/cooldown/spell/pointed/projectile/furious_steel/on_deactivation(mob/on_who, refund_cooldown = TRUE) . = ..() diff --git a/code/modules/antagonists/heretic/magic/mansus_grasp.dm b/code/modules/antagonists/heretic/magic/mansus_grasp.dm index 950a9ece769..46e3dfa512d 100644 --- a/code/modules/antagonists/heretic/magic/mansus_grasp.dm +++ b/code/modules/antagonists/heretic/magic/mansus_grasp.dm @@ -65,7 +65,7 @@ AddComponent(/datum/component/effect_remover, \ success_feedback = "You remove %THEEFFECT.", \ tip_text = "Clear rune", \ - on_clear_callback = CALLBACK(src, .proc/after_clear_rune), \ + on_clear_callback = CALLBACK(src, PROC_REF(after_clear_rune)), \ effects_we_clear = list(/obj/effect/heretic_rune)) /* diff --git a/code/modules/antagonists/heretic/magic/mirror_walk.dm b/code/modules/antagonists/heretic/magic/mirror_walk.dm index 24b09925e74..14713635aa0 100644 --- a/code/modules/antagonists/heretic/magic/mirror_walk.dm +++ b/code/modules/antagonists/heretic/magic/mirror_walk.dm @@ -23,7 +23,7 @@ /datum/action/cooldown/spell/jaunt/mirror_walk/Grant(mob/grant_to) . = ..() - RegisterSignal(grant_to, COMSIG_MOVABLE_MOVED, .proc/update_icon_on_signal) + RegisterSignal(grant_to, COMSIG_MOVABLE_MOVED, PROC_REF(update_icon_on_signal)) /datum/action/cooldown/spell/jaunt/mirror_walk/Remove(mob/remove_from) . = ..() @@ -77,7 +77,7 @@ var/obj/effect/dummy/phased_mob/jaunt = ..(jaunter, get_turf(nearby_reflection)) if (!jaunt) return FALSE - RegisterSignal(jaunt, COMSIG_MOVABLE_MOVED, .proc/update_icon_on_signal) + RegisterSignal(jaunt, COMSIG_MOVABLE_MOVED, PROC_REF(update_icon_on_signal)) return jaunt /datum/action/cooldown/spell/jaunt/mirror_walk/exit_jaunt(mob/living/unjaunter, turf/loc_override) diff --git a/code/modules/antagonists/heretic/magic/shadow_cloak.dm b/code/modules/antagonists/heretic/magic/shadow_cloak.dm index cac020f265e..8044532668f 100644 --- a/code/modules/antagonists/heretic/magic/shadow_cloak.dm +++ b/code/modules/antagonists/heretic/magic/shadow_cloak.dm @@ -49,7 +49,7 @@ StartCooldown(new_cd) else - uncloak_timer = addtimer(CALLBACK(src, .proc/timed_uncloak, cast_on), uncloak_time, TIMER_STOPPABLE) + uncloak_timer = addtimer(CALLBACK(src, PROC_REF(timed_uncloak), cast_on), uncloak_time, TIMER_STOPPABLE) cloak_mob(cast_on) StartCooldown() @@ -68,8 +68,8 @@ ) active_cloak = cast_on.apply_status_effect(/datum/status_effect/shadow_cloak) - RegisterSignal(active_cloak, COMSIG_PARENT_QDELETING, .proc/on_early_cloak_loss) - RegisterSignal(cast_on, SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), .proc/on_focus_lost) + RegisterSignal(active_cloak, COMSIG_PARENT_QDELETING, PROC_REF(on_early_cloak_loss)) + RegisterSignal(cast_on, SIGNAL_REMOVETRAIT(TRAIT_ALLOW_HERETIC_CASTING), PROC_REF(on_focus_lost)) /datum/action/cooldown/spell/shadow_cloak/proc/uncloak_mob(mob/living/cast_on, show_message = TRUE) if(!QDELETED(active_cloak)) @@ -141,11 +141,11 @@ owner.add_movespeed_modifier(/datum/movespeed_modifier/shadow_cloak) owner.add_actionspeed_modifier(/datum/actionspeed_modifier/shadow_cloak) // Register signals to cause effects - RegisterSignal(owner, COMSIG_ATOM_DIR_CHANGE, .proc/on_dir_change) - RegisterSignal(owner, COMSIG_LIVING_SET_BODY_POSITION, .proc/on_body_position_change) - RegisterSignal(owner, COMSIG_MOB_STATCHANGE, .proc/on_stat_change) - RegisterSignal(owner, COMSIG_MOB_APPLY_DAMAGE, .proc/on_damaged) - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(owner, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change)) + RegisterSignal(owner, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(on_body_position_change)) + RegisterSignal(owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) + RegisterSignal(owner, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_damaged)) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) return TRUE /datum/status_effect/shadow_cloak/on_remove() diff --git a/code/modules/antagonists/heretic/mobs/maid_in_mirror.dm b/code/modules/antagonists/heretic/mobs/maid_in_mirror.dm index b1f74c75743..176acfd103b 100644 --- a/code/modules/antagonists/heretic/mobs/maid_in_mirror.dm +++ b/code/modules/antagonists/heretic/mobs/maid_in_mirror.dm @@ -59,7 +59,7 @@ recent_examiner_refs += user_ref apply_damage(maxHealth * 0.1) // We take 10% of our health as damage upon being examined playsound(src, 'sound/effects/ghost2.ogg', 40, TRUE) - addtimer(CALLBACK(src, .proc/clear_recent_examiner, user_ref), recent_examine_damage_cooldown) + addtimer(CALLBACK(src, PROC_REF(clear_recent_examiner), user_ref), recent_examine_damage_cooldown) // If we're examined on low enough health we die straight up else diff --git a/code/modules/antagonists/heretic/status_effects/buffs.dm b/code/modules/antagonists/heretic/status_effects/buffs.dm index 2523262459f..128adb6e016 100644 --- a/code/modules/antagonists/heretic/status_effects/buffs.dm +++ b/code/modules/antagonists/heretic/status_effects/buffs.dm @@ -132,13 +132,13 @@ return ..() /datum/status_effect/protective_blades/on_apply() - RegisterSignal(owner, COMSIG_HUMAN_CHECK_SHIELDS, .proc/on_shield_reaction) + RegisterSignal(owner, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(on_shield_reaction)) for(var/blade_num in 1 to max_num_blades) var/time_until_created = (blade_num - 1) * time_between_initial_blades if(time_until_created <= 0) create_blade() else - addtimer(CALLBACK(src, .proc/create_blade), time_until_created) + addtimer(CALLBACK(src, PROC_REF(create_blade)), time_until_created) return TRUE @@ -156,7 +156,7 @@ var/obj/effect/floating_blade/blade = new(get_turf(owner)) blades += blade blade.orbit(owner, blade_orbit_radius) - RegisterSignal(blade, COMSIG_PARENT_QDELETING, .proc/remove_blade) + RegisterSignal(blade, COMSIG_PARENT_QDELETING, PROC_REF(remove_blade)) playsound(get_turf(owner), 'sound/items/unsheath.ogg', 33, TRUE) /// Signal proc for [COMSIG_HUMAN_CHECK_SHIELDS]. @@ -233,4 +233,4 @@ if(!.) return - addtimer(CALLBACK(src, .proc/create_blade), blade_recharge_time) + addtimer(CALLBACK(src, PROC_REF(create_blade)), blade_recharge_time) diff --git a/code/modules/antagonists/heretic/status_effects/ghoul.dm b/code/modules/antagonists/heretic/status_effects/ghoul.dm index 515ce6e0b1a..9fac065a352 100644 --- a/code/modules/antagonists/heretic/status_effects/ghoul.dm +++ b/code/modules/antagonists/heretic/status_effects/ghoul.dm @@ -47,7 +47,7 @@ var/mob/living/carbon/human/human_target = owner - RegisterSignal(human_target, COMSIG_LIVING_DEATH, .proc/remove_ghoul_status) + RegisterSignal(human_target, COMSIG_LIVING_DEATH, PROC_REF(remove_ghoul_status)) human_target.revive(full_heal = TRUE, admin_revive = TRUE) if(new_max_health) diff --git a/code/modules/antagonists/heretic/status_effects/mark_effects.dm b/code/modules/antagonists/heretic/status_effects/mark_effects.dm index e526e3acbb1..b6f1ca5dcd9 100644 --- a/code/modules/antagonists/heretic/status_effects/mark_effects.dm +++ b/code/modules/antagonists/heretic/status_effects/mark_effects.dm @@ -21,7 +21,7 @@ /datum/status_effect/eldritch/on_apply() if(owner.mob_size >= MOB_SIZE_HUMAN) - RegisterSignal(owner, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/update_owner_underlay) + RegisterSignal(owner, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(update_owner_underlay)) owner.update_icon(UPDATE_OVERLAYS) return TRUE return FALSE @@ -143,9 +143,9 @@ /datum/status_effect/eldritch/blade/on_apply() . = ..() - RegisterSignal(owner, COMSIG_MOVABLE_PRE_THROW, .proc/on_pre_throw) - RegisterSignal(owner, COMSIG_MOVABLE_TELEPORTED, .proc/on_teleport) - RegisterSignal(owner, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(owner, COMSIG_MOVABLE_PRE_THROW, PROC_REF(on_pre_throw)) + RegisterSignal(owner, COMSIG_MOVABLE_TELEPORTED, PROC_REF(on_teleport)) + RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) /datum/status_effect/eldritch/blade/on_remove() UnregisterSignal(owner, list( diff --git a/code/modules/antagonists/heretic/structures/carving_knife.dm b/code/modules/antagonists/heretic/structures/carving_knife.dm index 6c642a97132..f98d8ef8ed4 100644 --- a/code/modules/antagonists/heretic/structures/carving_knife.dm +++ b/code/modules/antagonists/heretic/structures/carving_knife.dm @@ -59,7 +59,7 @@ if(is_type_in_typecache(target, blacklisted_turfs)) return - INVOKE_ASYNC(src, .proc/try_carve_rune, target, user) + INVOKE_ASYNC(src, PROC_REF(try_carve_rune), target, user) /* * Begin trying to carve a rune. Go through a few checks, then call do_carve_rune if successful. diff --git a/code/modules/antagonists/heretic/structures/mawed_crucible.dm b/code/modules/antagonists/heretic/structures/mawed_crucible.dm index e50da967a55..a409c38d1b9 100644 --- a/code/modules/antagonists/heretic/structures/mawed_crucible.dm +++ b/code/modules/antagonists/heretic/structures/mawed_crucible.dm @@ -117,7 +117,7 @@ balloon_alert(user, "not full enough!") return TRUE - INVOKE_ASYNC(src, .proc/show_radial, user) + INVOKE_ASYNC(src, PROC_REF(show_radial), user) return TRUE /* diff --git a/code/modules/antagonists/heretic/transmutation_rune.dm b/code/modules/antagonists/heretic/transmutation_rune.dm index a99df7f0d32..f1c4b0d4b7a 100644 --- a/code/modules/antagonists/heretic/transmutation_rune.dm +++ b/code/modules/antagonists/heretic/transmutation_rune.dm @@ -36,7 +36,7 @@ /obj/effect/heretic_rune/interact(mob/living/user) . = ..() - INVOKE_ASYNC(src, .proc/try_rituals, user) + INVOKE_ASYNC(src, PROC_REF(try_rituals), user) return TRUE /** diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm index 6cb752cbb24..f12f605958f 100644 --- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm +++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm @@ -97,7 +97,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/nuclear_authentication_disk.dm b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm index 3059af9b402..7fb00029d10 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_authentication_disk.dm @@ -119,7 +119,7 @@ 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/equipment/nuclear_bomb/_nuclear_bomb.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm index 26c6becd3f3..fa1c3df1414 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/_nuclear_bomb.dm @@ -501,7 +501,7 @@ GLOBAL_VAR(station_nuke_source) /** * Begins the process of exploding the nuke. - * [proc/explode] -> [proc/actually_explode] -> [proc/really_actually_explode] + * [proc/explode] -> [proc/actually_explode] -> [proc/really_actually_explode]) * * Goes through a few timers and plays a cinematic. */ @@ -519,7 +519,7 @@ GLOBAL_VAR(station_nuke_source) if(SSticker?.mode) SSticker.roundend_check_paused = TRUE - addtimer(CALLBACK(src, .proc/actually_explode), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(actually_explode)), 10 SECONDS) return TRUE /obj/machinery/nuclearbomb/proc/actually_explode() @@ -591,7 +591,7 @@ GLOBAL_VAR(station_nuke_source) /// Cause nuke effects to the passed z-levels. /obj/machinery/nuclearbomb/proc/nuke_effects(list/affected_z_levels) - INVOKE_ASYNC(GLOBAL_PROC, /proc/callback_on_everyone_on_z, affected_z_levels, CALLBACK(GLOBAL_PROC, /proc/nuke_gib), src) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(callback_on_everyone_on_z), affected_z_levels, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(nuke_gib)), src) /// Gets what type of cinematic this nuke showcases depending on where we detonated. /obj/machinery/nuclearbomb/proc/get_cinematic_type(detonation_status) diff --git a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm index 387e978a5b1..37b886a057d 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclear_bomb/beer_nuke.dm @@ -37,10 +37,10 @@ disarm_nuke() return if(is_station_level(bomb_location.z)) - addtimer(CALLBACK(src, .proc/really_actually_explode), 11 SECONDS) + addtimer(CALLBACK(src, PROC_REF(really_actually_explode)), 11 SECONDS) else visible_message(span_notice("[src] fizzes ominously.")) - addtimer(CALLBACK(src, .proc/local_foam), 11 SECONDS) + addtimer(CALLBACK(src, PROC_REF(local_foam)), 11 SECONDS) /obj/machinery/nuclearbomb/beer/disarm_nuke(mob/disarmer) exploding = FALSE diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index defacf3c067..f7bd7e5cba9 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -154,8 +154,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)) @@ -261,7 +261,7 @@ var/obj/item/war_declaration = new challengeitem(leader.drop_location()) leader.put_in_hands(war_declaration) nuke_team.war_button_ref = WEAKREF(war_declaration) - addtimer(CALLBACK(src, .proc/nuketeam_name_assign), 1) + addtimer(CALLBACK(src, PROC_REF(nuketeam_name_assign)), 1) /datum/antagonist/nukeop/leader/proc/nuketeam_name_assign() if(!nuke_team) diff --git a/code/modules/antagonists/pirate/pirate.dm b/code/modules/antagonists/pirate/pirate.dm index d8882a2ba92..d591c692f57 100644 --- a/code/modules/antagonists/pirate/pirate.dm +++ b/code/modules/antagonists/pirate/pirate.dm @@ -84,7 +84,7 @@ //Lists notable loot. if(!cargo_hold || !cargo_hold.total_report) return "Nothing" - cargo_hold.total_report.total_value = sortTim(cargo_hold.total_report.total_value, cmp = /proc/cmp_numeric_dsc, associative = TRUE) + cargo_hold.total_report.total_value = sortTim(cargo_hold.total_report.total_value, cmp = GLOBAL_PROC_REF(cmp_numeric_dsc), associative = TRUE) var/count = 0 var/list/loot_texts = list() for(var/datum/export/E in cargo_hold.total_report.total_value) diff --git a/code/modules/antagonists/revenant/haunted_item.dm b/code/modules/antagonists/revenant/haunted_item.dm index a070f272747..f21d36fb8af 100644 --- a/code/modules/antagonists/revenant/haunted_item.dm +++ b/code/modules/antagonists/revenant/haunted_item.dm @@ -39,7 +39,7 @@ return COMPONENT_INCOMPATIBLE if(!isnull(haunt_duration)) - addtimer(CALLBACK(src, .proc/clear_haunting), haunt_duration) + addtimer(CALLBACK(src, PROC_REF(clear_haunting)), haunt_duration) if(!isnull(spawn_message)) haunted_item.visible_message(spawn_message) @@ -75,7 +75,7 @@ return ..() /datum/component/haunted_item/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_hit_by_holy_tool) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_hit_by_holy_tool)) /datum/component/haunted_item/UnregisterFromParent() UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index f7b66d5c998..b493cb483e3 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -95,7 +95,7 @@ var/datum/action/cooldown/spell/aoe/revenant/haunt_object/toolbox_go_bonk = new(src) toolbox_go_bonk.Grant(src) - RegisterSignal(src, COMSIG_LIVING_BANED, .proc/on_baned) + RegisterSignal(src, COMSIG_LIVING_BANED, PROC_REF(on_baned)) random_revenant_name() /mob/living/simple_animal/revenant/canUseTopic(atom/movable/M, be_close=FALSE, no_dexterity=FALSE, no_tk=FALSE, need_hands = FALSE, floor_okay=FALSE) @@ -214,7 +214,7 @@ span_revendanger("As [weapon] passes through you, you feel your essence draining away!")) inhibited = TRUE update_action_buttons_icon() - addtimer(CALLBACK(src, .proc/reset_inhibit), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_inhibit)), 3 SECONDS) /mob/living/simple_animal/revenant/proc/reset_inhibit() inhibited = FALSE @@ -415,7 +415,7 @@ /obj/item/ectoplasm/revenant/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/try_reform), 600) + addtimer(CALLBACK(src, PROC_REF(try_reform)), 600) /obj/item/ectoplasm/revenant/proc/scatter() qdel(src) diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index 0d57b81ecb8..f2f25611baa 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -249,7 +249,7 @@ light_sparks.set_up(4, 0, light) light_sparks.start() new /obj/effect/temp_visual/revenant(get_turf(light)) - addtimer(CALLBACK(src, .proc/overload_shock, light, caster), 20) + addtimer(CALLBACK(src, PROC_REF(overload_shock), light, caster), 20) /datum/action/cooldown/spell/aoe/revenant/overload/proc/overload_shock(obj/machinery/light/to_shock, mob/living/simple_animal/revenant/caster) flick("[to_shock.base_state]2", to_shock) diff --git a/code/modules/antagonists/revenant/revenant_blight.dm b/code/modules/antagonists/revenant/revenant_blight.dm index d014b0021b6..9c86bea0b9d 100644 --- a/code/modules/antagonists/revenant/revenant_blight.dm +++ b/code/modules/antagonists/revenant/revenant_blight.dm @@ -67,4 +67,4 @@ affected_mob.set_haircolor("#1d2953", override = TRUE) affected_mob.visible_message(span_warning("[affected_mob] looks terrifyingly gaunt..."), span_revennotice("You suddenly feel like your skin is wrong...")) affected_mob.add_atom_colour("#1d2953", TEMPORARY_COLOUR_PRIORITY) - addtimer(CALLBACK(src, .proc/cure), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(cure)), 10 SECONDS) diff --git a/code/modules/antagonists/revolution/revolution.dm b/code/modules/antagonists/revolution/revolution.dm index 77c45b5507e..f1c516bd8ad 100644 --- a/code/modules/antagonists/revolution/revolution.dm +++ b/code/modules/antagonists/revolution/revolution.dm @@ -99,7 +99,7 @@ /datum/antagonist/rev/get_admin_commands() . = ..() - .["Promote"] = CALLBACK(src,.proc/admin_promote) + .["Promote"] = CALLBACK(src, PROC_REF(admin_promote)) /datum/antagonist/rev/proc/admin_promote(mob/admin) var/datum/mind/O = owner @@ -119,10 +119,10 @@ /datum/antagonist/rev/head/get_admin_commands() . = ..() . -= "Promote" - .["Take flash"] = CALLBACK(src,.proc/admin_take_flash) - .["Give flash"] = CALLBACK(src,.proc/admin_give_flash) - .["Repair flash"] = CALLBACK(src,.proc/admin_repair_flash) - .["Demote"] = CALLBACK(src,.proc/admin_demote) + .["Take flash"] = CALLBACK(src, PROC_REF(admin_take_flash)) + .["Give flash"] = CALLBACK(src, PROC_REF(admin_give_flash)) + .["Repair flash"] = CALLBACK(src, PROC_REF(admin_repair_flash)) + .["Demote"] = CALLBACK(src, PROC_REF(admin_demote)) /datum/antagonist/rev/head/proc/admin_take_flash(mob/admin) var/list/L = owner.current.get_contents() @@ -348,7 +348,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() @@ -380,7 +380,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) @@ -520,7 +520,7 @@ return FALSE // Do it later so everyone has time to see the messages - addtimer(CALLBACK(src, .proc/perform_auto_shuttle_call), 20 SECONDS) + addtimer(CALLBACK(src, PROC_REF(perform_auto_shuttle_call)), 20 SECONDS) var/log = "REVOLUTION: Auto-calling the shuttle, [display_percent]% are revs" log_game(log) diff --git a/code/modules/antagonists/separatist/separatist.dm b/code/modules/antagonists/separatist/separatist.dm index 45e9f6885ff..81e4106bd19 100644 --- a/code/modules/antagonists/separatist/separatist.dm +++ b/code/modules/antagonists/separatist/separatist.dm @@ -10,7 +10,7 @@ /datum/team/nation/New(starting_members, potential_recruits, department) . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/new_possible_separatist) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(new_possible_separatist)) src.potential_recruits = potential_recruits src.department = department diff --git a/code/modules/antagonists/shade/shade_minion.dm b/code/modules/antagonists/shade/shade_minion.dm index 4d229129fd6..4b06452c4b7 100644 --- a/code/modules/antagonists/shade/shade_minion.dm +++ b/code/modules/antagonists/shade/shade_minion.dm @@ -26,7 +26,7 @@ src.master_name = master_name update_static_data(owner.current) - INVOKE_ASYNC(src, .proc/display_panel) + INVOKE_ASYNC(src, PROC_REF(display_panel)) /// Shows the info panel, moved out into its own proc for signal handling reasons. /datum/antagonist/shade_minion/proc/display_panel() diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 62b7bba2480..8b25d32b962 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -80,7 +80,7 @@ . = ..() var/datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/crawl = new crawl_type(src) crawl.Grant(src) - RegisterSignal(src, list(COMSIG_MOB_ENTER_JAUNT, COMSIG_MOB_AFTER_EXIT_JAUNT), .proc/on_crawl) + RegisterSignal(src, list(COMSIG_MOB_ENTER_JAUNT, COMSIG_MOB_AFTER_EXIT_JAUNT), PROC_REF(on_crawl)) /// Whenever we enter or exit blood crawl, reset our bonus and hitstreaks. /mob/living/simple_animal/hostile/imp/slaughter/proc/on_crawl(datum/source) @@ -89,7 +89,7 @@ // Grant us a speed boost if we're on the mortal plane if(isturf(loc)) add_movespeed_modifier(/datum/movespeed_modifier/slaughter) - addtimer(CALLBACK(src, .proc/remove_movespeed_modifier, /datum/movespeed_modifier/slaughter), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(remove_movespeed_modifier), /datum/movespeed_modifier/slaughter), 6 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) // Reset our streaks current_hitstreak = 0 diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 566d5f4ff69..d4b89aa027a 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -46,8 +46,8 @@ rift_ability = new rift_ability.Grant(owner.current) owner.current.faction |= "carp" - RegisterSignal(owner.current, COMSIG_LIVING_LIFE, .proc/rift_checks) - RegisterSignal(owner.current, COMSIG_LIVING_DEATH, .proc/destroy_rifts) + RegisterSignal(owner.current, COMSIG_LIVING_LIFE, PROC_REF(rift_checks)) + RegisterSignal(owner.current, COMSIG_LIVING_DEATH, PROC_REF(destroy_rifts)) /datum/antagonist/space_dragon/on_removal() . = ..() @@ -157,7 +157,7 @@ owner.current.fully_heal() owner.current.add_filter("anger_glow", 3, list("type" = "outline", "color" = "#ff330030", "size" = 5)) owner.current.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) /** * Removes Space Dragon's rift speed buff. diff --git a/code/modules/antagonists/traitor/components/demoraliser.dm b/code/modules/antagonists/traitor/components/demoraliser.dm index e3089b5b803..beab862e876 100644 --- a/code/modules/antagonists/traitor/components/demoraliser.dm +++ b/code/modules/antagonists/traitor/components/demoraliser.dm @@ -11,7 +11,7 @@ /datum/proximity_monitor/advanced/demoraliser/New(atom/_host, range, _ignore_if_not_on_turf = TRUE, datum/demoralise_moods/moods) . = ..() src.moods = moods - RegisterSignal(host, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(host, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/proximity_monitor/advanced/demoraliser/field_turf_crossed(atom/movable/crossed, turf/location) if (!isliving(crossed)) diff --git a/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm b/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm index 65bc57b8902..e5dc5e4cf58 100644 --- a/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm +++ b/code/modules/antagonists/traitor/components/traitor_objective_helpers.dm @@ -23,10 +23,10 @@ /datum/component/traitor_objective_register/RegisterWithParent() if(succeed_signals) - RegisterSignal(target, succeed_signals, .proc/on_success) + RegisterSignal(target, succeed_signals, PROC_REF(on_success)) if(fail_signals) - RegisterSignal(target, fail_signals, .proc/on_fail) - RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), .proc/delete_self) + RegisterSignal(target, fail_signals, PROC_REF(on_fail)) + RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), PROC_REF(delete_self)) /datum/component/traitor_objective_register/UnregisterFromParent() if(target) diff --git a/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm b/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm index e0abde5fe3c..ce72e1227de 100644 --- a/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm +++ b/code/modules/antagonists/traitor/components/traitor_objective_limit_per_time.dm @@ -20,7 +20,7 @@ src.typepath = parent.type /datum/component/traitor_objective_limit_per_time/RegisterWithParent() - RegisterSignal(parent, COMSIG_TRAITOR_OBJECTIVE_PRE_GENERATE, .proc/handle_generate) + RegisterSignal(parent, COMSIG_TRAITOR_OBJECTIVE_PRE_GENERATE, PROC_REF(handle_generate)) /datum/component/traitor_objective_limit_per_time/UnregisterFromParent() UnregisterSignal(parent, COMSIG_TRAITOR_OBJECTIVE_PRE_GENERATE) diff --git a/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm b/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm index eb7933c2a9c..1bd27c5ac32 100644 --- a/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm +++ b/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm @@ -17,9 +17,9 @@ src.signals = signals /datum/component/traitor_objective_mind_tracker/RegisterWithParent() - RegisterSignal(target, COMSIG_MIND_TRANSFERRED, .proc/handle_mind_transferred) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/delete_self) - RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), .proc/delete_self) + RegisterSignal(target, COMSIG_MIND_TRANSFERRED, PROC_REF(handle_mind_transferred)) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(delete_self)) + RegisterSignal(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), PROC_REF(delete_self)) handle_mind_transferred(target) /datum/component/traitor_objective_mind_tracker/UnregisterFromParent() diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index b2aa77b81ac..b8f46e02eea 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -322,14 +322,14 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) if(!sec_left) timing = FALSE sound_to_playing_players('sound/machines/alarm.ogg') - addtimer(CALLBACK(GLOBAL_PROC, /proc/play_cinematic, /datum/cinematic/malf, world, CALLBACK(src, .proc/trigger_doomsday)), 10 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(play_cinematic), /datum/cinematic/malf, world, CALLBACK(src, PROC_REF(trigger_doomsday))), 10 SECONDS) else if(world.time >= next_announce) minor_announce("[sec_left] SECONDS UNTIL DOOMSDAY DEVICE ACTIVATION!", "ERROR ER0RR $R0RRO$!R41.%%!!(%$^^__+ @#F0E4", TRUE) next_announce += DOOMSDAY_ANNOUNCE_INTERVAL /obj/machinery/doomsday_device/proc/trigger_doomsday() - callback_on_everyone_on_z(SSmapping.levels_by_trait(ZTRAIT_STATION), CALLBACK(GLOBAL_PROC, /proc/bring_doomsday), src) + callback_on_everyone_on_z(SSmapping.levels_by_trait(ZTRAIT_STATION), CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(bring_doomsday)), src) to_chat(world, span_bold("The AI cleansed the station of life with [src]!")) SSticker.force_ending = TRUE @@ -363,8 +363,8 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) for(var/obj/machinery/door/D in GLOB.airlocks) if(!is_station_level(D.z)) continue - INVOKE_ASYNC(D, /obj/machinery/door.proc/hostile_lockdown, owner) - addtimer(CALLBACK(D, /obj/machinery/door.proc/disable_lockdown), 900) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door, hostile_lockdown), owner) + addtimer(CALLBACK(D, TYPE_PROC_REF(/obj/machinery/door, disable_lockdown)), 900) var/obj/machinery/computer/communications/C = locate() in GLOB.machines if(C) @@ -372,7 +372,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) minor_announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.","Network Alert:", TRUE) to_chat(owner, span_danger("Lockdown initiated. Network reset in 90 seconds.")) - addtimer(CALLBACK(GLOBAL_PROC, .proc/minor_announce, + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(minor_announce), "Automatic system reboot complete. Have a secure day.", "Network reset:"), 900) @@ -418,7 +418,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) UpdateButtons() clicked_machine.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [clicked_machine]!")) - addtimer(CALLBACK(src, .proc/animate_machine, caller, clicked_machine), 5 SECONDS) //kabeep! + addtimer(CALLBACK(src, PROC_REF(animate_machine), caller, clicked_machine), 5 SECONDS) //kabeep! unset_ranged_ability(caller, span_danger("Sending override signal...")) return TRUE @@ -505,7 +505,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) UpdateButtons() clicked_machine.audible_message(span_userdanger("You hear a loud electrical buzzing sound coming from [clicked_machine]!")) - addtimer(CALLBACK(src, .proc/detonate_machine, caller, clicked_machine), 5 SECONDS) //kaboom! + addtimer(CALLBACK(src, PROC_REF(detonate_machine), caller, clicked_machine), 5 SECONDS) //kaboom! unset_ranged_ability(caller, span_danger("Overcharging machine...")) return TRUE @@ -642,7 +642,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) I.loc = T client.images += I I.icon_state = "[success ? "green" : "red"]Overlay" //greenOverlay and redOverlay for success and failure respectively - addtimer(CALLBACK(src, .proc/remove_transformer_image, client, I, T), 30) + addtimer(CALLBACK(src, PROC_REF(remove_transformer_image), client, I, T), 30) if(!success) to_chat(src, span_warning("[alert_msg]")) return success @@ -721,7 +721,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/ai_module)) for(var/obj/machinery/light/L in GLOB.machines) if(is_station_level(L.z)) L.no_low_power = TRUE - INVOKE_ASYNC(L, /obj/machinery/light/.proc/update, FALSE) + INVOKE_ASYNC(L, TYPE_PROC_REF(/obj/machinery/light/, update), FALSE) CHECK_TICK to_chat(owner, span_notice("Emergency light connections severed.")) owner.playsound_local(owner, 'sound/effects/light_flicker.ogg', 50, FALSE) diff --git a/code/modules/antagonists/traitor/equipment/module_picker.dm b/code/modules/antagonists/traitor/equipment/module_picker.dm index faf82461847..bca07f537ec 100644 --- a/code/modules/antagonists/traitor/equipment/module_picker.dm +++ b/code/modules/antagonists/traitor/equipment/module_picker.dm @@ -24,7 +24,7 @@ filtered_modules[AM.category][AM] = AM for(var/category in filtered_modules) - filtered_modules[category] = sortTim(filtered_modules[category], /proc/cmp_malfmodules_priority) + filtered_modules[category] = sortTim(filtered_modules[category], GLOBAL_PROC_REF(cmp_malfmodules_priority)) return filtered_modules diff --git a/code/modules/antagonists/traitor/objectives/assassination.dm b/code/modules/antagonists/traitor/objectives/assassination.dm index 66f7e38e3fd..689ece4582f 100644 --- a/code/modules/antagonists/traitor/objectives/assassination.dm +++ b/code/modules/antagonists/traitor/objectives/assassination.dm @@ -87,7 +87,7 @@ card = new(user.drop_location()) user.put_in_hands(card) card.balloon_alert(user, "the card materializes in your hand") - RegisterSignal(card, COMSIG_ITEM_EQUIPPED, .proc/on_card_planted) + RegisterSignal(card, COMSIG_ITEM_EQUIPPED, PROC_REF(on_card_planted)) AddComponent(/datum/component/traitor_objective_register, card, \ succeed_signals = null, \ fail_signals = COMSIG_PARENT_QDELETING, \ @@ -107,7 +107,7 @@ . = ..() if(!.) //didn't generate return FALSE - RegisterSignal(kill_target, COMSIG_PARENT_QDELETING, .proc/on_target_qdeleted) + RegisterSignal(kill_target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdeleted)) /datum/traitor_objective/assassinate/calling_card/ungenerate_objective() UnregisterSignal(kill_target, COMSIG_PARENT_QDELETING) @@ -132,7 +132,7 @@ if(!.) //didn't generate return FALSE AddComponent(/datum/component/traitor_objective_register, behead_goal, fail_signals = COMSIG_PARENT_QDELETING) - RegisterSignal(kill_target, COMSIG_CARBON_REMOVE_LIMB, .proc/on_target_dismembered) + RegisterSignal(kill_target, COMSIG_CARBON_REMOVE_LIMB, PROC_REF(on_target_dismembered)) /datum/traitor_objective/assassinate/behead/ungenerate_objective() UnregisterSignal(kill_target, COMSIG_CARBON_REMOVE_LIMB) @@ -159,7 +159,7 @@ fail_objective() else behead_goal = lost_head - RegisterSignal(behead_goal, COMSIG_ITEM_PICKUP, .proc/on_head_pickup) + RegisterSignal(behead_goal, COMSIG_ITEM_PICKUP, PROC_REF(on_head_pickup)) /datum/traitor_objective/assassinate/New(datum/uplink_handler/handler) . = ..() @@ -219,7 +219,7 @@ kill_target = kill_target_mind.current replace_in_name("%TARGET%", kill_target.real_name) replace_in_name("%JOB TITLE%", kill_target_mind.assigned_role.title) - RegisterSignal(kill_target, COMSIG_LIVING_DEATH, .proc/on_target_death) + RegisterSignal(kill_target, COMSIG_LIVING_DEATH, PROC_REF(on_target_death)) return TRUE /datum/traitor_objective/assassinate/ungenerate_objective() diff --git a/code/modules/antagonists/traitor/objectives/bug_room.dm b/code/modules/antagonists/traitor/objectives/bug_room.dm index a476620e9d1..b2e03aadfdd 100644 --- a/code/modules/antagonists/traitor/objectives/bug_room.dm +++ b/code/modules/antagonists/traitor/objectives/bug_room.dm @@ -167,7 +167,7 @@ target.vis_contents += src vis_flags |= VIS_INHERIT_PLANE planted_on = target - RegisterSignal(planted_on, COMSIG_PARENT_QDELETING, .proc/handle_planted_on_deletion) + RegisterSignal(planted_on, COMSIG_PARENT_QDELETING, PROC_REF(handle_planted_on_deletion)) SEND_SIGNAL(src, COMSIG_TRAITOR_BUG_PLANTED_OBJECT, target) /obj/item/traitor_bug/proc/handle_planted_on_deletion() @@ -199,7 +199,7 @@ /obj/structure/traitor_bug/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/fade_out, 10 SECONDS), 3 MINUTES) + addtimer(CALLBACK(src, PROC_REF(fade_out), 10 SECONDS), 3 MINUTES) /obj/structure/traitor_bug/proc/fade_out(seconds) animate(src, alpha = 30, time = seconds) diff --git a/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm b/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm index d29db73f969..e4cc3752397 100644 --- a/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm +++ b/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm @@ -33,8 +33,8 @@ user.put_in_hands(spray) spray.balloon_alert(user, "the spraycan materializes in your hand") - RegisterSignal(spray, COMSIG_PARENT_QDELETING, .proc/on_spray_destroyed) - RegisterSignal(spray, COMSIG_TRAITOR_GRAFFITI_DRAWN, .proc/on_rune_complete) + RegisterSignal(spray, COMSIG_PARENT_QDELETING, PROC_REF(on_spray_destroyed)) + RegisterSignal(spray, COMSIG_TRAITOR_GRAFFITI_DRAWN, PROC_REF(on_rune_complete)) /** * Called when the spray can is deleted. @@ -61,9 +61,9 @@ rune = drawn_rune UnregisterSignal(spray, COMSIG_PARENT_QDELETING) UnregisterSignal(spray, COMSIG_TRAITOR_GRAFFITI_DRAWN) - RegisterSignal(drawn_rune, COMSIG_PARENT_QDELETING, .proc/on_rune_destroyed) - RegisterSignal(drawn_rune, COMSIG_DEMORALISING_EVENT, .proc/on_mood_event) - RegisterSignal(drawn_rune, COMSIG_TRAITOR_GRAFFITI_SLIPPED, .proc/on_mood_event) + RegisterSignal(drawn_rune, COMSIG_PARENT_QDELETING, PROC_REF(on_rune_destroyed)) + RegisterSignal(drawn_rune, COMSIG_DEMORALISING_EVENT, PROC_REF(on_mood_event)) + RegisterSignal(drawn_rune, COMSIG_TRAITOR_GRAFFITI_SLIPPED, PROC_REF(on_mood_event)) /** * Called when your traitor rune is destroyed. If you haven't suceeded by now, you fail.area @@ -295,7 +295,7 @@ var/datum/demoralise_moods/graffiti/mood_category = new() demoraliser = new(src, 7, TRUE, mood_category) clean_proof = TRUE - protected_timer = addtimer(CALLBACK(src, .proc/set_stage, RUNE_STAGE_REMOVABLE), 5 MINUTES) + protected_timer = addtimer(CALLBACK(src, PROC_REF(set_stage), RUNE_STAGE_REMOVABLE), 5 MINUTES) /obj/effect/decal/cleanable/traitor_rune/wash(clean_types) if (clean_proof) diff --git a/code/modules/antagonists/traitor/objectives/demoralise_poster.dm b/code/modules/antagonists/traitor/objectives/demoralise_poster.dm index b058b9f2efa..b3df603db8f 100644 --- a/code/modules/antagonists/traitor/objectives/demoralise_poster.dm +++ b/code/modules/antagonists/traitor/objectives/demoralise_poster.dm @@ -37,9 +37,9 @@ var/obj/item/poster/traitor/added_poster = new /obj/item/poster/traitor(posterbox) var/obj/structure/sign/poster/traitor/poster_when_placed = added_poster.poster_structure posters += poster_when_placed - RegisterSignal(poster_when_placed, COMSIG_DEMORALISING_EVENT, .proc/on_mood_event) - RegisterSignal(poster_when_placed, COMSIG_POSTER_TRAP_SUCCEED, .proc/on_triggered_trap) - RegisterSignal(poster_when_placed, COMSIG_PARENT_QDELETING, .proc/on_poster_destroy) + RegisterSignal(poster_when_placed, COMSIG_DEMORALISING_EVENT, PROC_REF(on_mood_event)) + RegisterSignal(poster_when_placed, COMSIG_POSTER_TRAP_SUCCEED, PROC_REF(on_triggered_trap)) + RegisterSignal(poster_when_placed, COMSIG_PARENT_QDELETING, PROC_REF(on_poster_destroy)) user.put_in_hands(posterbox) posterbox.balloon_alert(user, "the box materializes in your hand") diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm index 1cf5a8b64b1..0d0e8b05de1 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_item.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm @@ -67,7 +67,7 @@ special_equipment = target_item.special_equipment replace_in_name("%ITEM%", target_item.name) AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \ - signals = list(COMSIG_MOB_EQUIPPED_ITEM = .proc/on_item_pickup)) + signals = list(COMSIG_MOB_EQUIPPED_ITEM = PROC_REF(on_item_pickup))) return TRUE /datum/traitor_objective/destroy_item/generate_ui_buttons(mob/user) diff --git a/code/modules/antagonists/traitor/objectives/eyesnatching.dm b/code/modules/antagonists/traitor/objectives/eyesnatching.dm index afb50a17319..63667af7f6b 100644 --- a/code/modules/antagonists/traitor/objectives/eyesnatching.dm +++ b/code/modules/antagonists/traitor/objectives/eyesnatching.dm @@ -104,7 +104,7 @@ replace_in_name("%TARGET%", victim_mind.name) replace_in_name("%JOB TITLE%", victim_mind.assigned_role.title) - RegisterSignal(victim, COMSIG_CARBON_LOSE_ORGAN, .proc/check_eye_removal) + RegisterSignal(victim, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_eye_removal)) AddComponent(/datum/component/traitor_objective_register, victim, fail_signals = COMSIG_PARENT_QDELETING) return TRUE @@ -167,12 +167,12 @@ victim.visible_message( span_warning("[user] presses [src] against [victim]'s skull!"), span_userdanger("[user] presses [src] against your skull!")) - if(!do_after(user, 5 SECONDS, target = victim, extra_checks = CALLBACK(src, .proc/eyeballs_exist, eyeballies, head, victim))) + if(!do_after(user, 5 SECONDS, target = victim, extra_checks = CALLBACK(src, PROC_REF(eyeballs_exist), eyeballies, head, victim))) return to_chat(victim, span_userdanger("You feel something forcing its way into your skull!")) balloon_alert(user, "applying pressure...") - if(!do_after(user, 5 SECONDS, target = victim, extra_checks = CALLBACK(src, .proc/eyeballs_exist, eyeballies, head, victim))) + if(!do_after(user, 5 SECONDS, target = victim, extra_checks = CALLBACK(src, PROC_REF(eyeballs_exist), eyeballies, head, victim))) return var/datum/wound/blunt/severe/severe_wound_type = /datum/wound/blunt/severe @@ -188,7 +188,7 @@ playsound(victim, "sound/effects/wounds/crackandbleed.ogg", 100) log_combat(user, victim, "cracked the skull of (eye snatching)", src) - if(!do_after(user, 5 SECONDS, target = victim, extra_checks = CALLBACK(src, .proc/eyeballs_exist, eyeballies, head, victim))) + if(!do_after(user, 5 SECONDS, target = victim, extra_checks = CALLBACK(src, PROC_REF(eyeballs_exist), eyeballies, head, victim))) return if(!HAS_TRAIT(victim, TRAIT_BLIND)) diff --git a/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm b/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm index e8bdb35bb06..dcc11fe532a 100644 --- a/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm +++ b/code/modules/antagonists/traitor/objectives/final_objective/battlecruiser.dm @@ -1,4 +1,4 @@ -/datum/traitor_objective/final/battlecruiser +/datum/traitor_objective/ultimate/battlecruiser name = "Reveal Station Coordinates to nearby Syndicate Battlecruiser" description = "Use a special upload card on a communications console to send the coordinates \ of the station to a nearby Battlecruiser. You may want to make your syndicate status known to \ @@ -9,14 +9,14 @@ /// Battlecruiser team that we get assigned to var/datum/team/battlecruiser/team -/datum/traitor_objective/final/battlecruiser/generate_objective(datum/mind/generating_for, list/possible_duplicates) +/datum/traitor_objective/ultimate/battlecruiser/generate_objective(datum/mind/generating_for, list/possible_duplicates) // There's no empty space to load a battlecruiser in... if(!SSmapping.empty_space) return FALSE return TRUE -/datum/traitor_objective/final/battlecruiser/on_objective_taken(mob/user) +/datum/traitor_objective/ultimate/battlecruiser/on_objective_taken(mob/user) . = ..() team = new() var/obj/machinery/nuclearbomb/selfdestruct/nuke = locate() in GLOB.nuke_list @@ -27,13 +27,13 @@ handler.owner.add_antag_datum(/datum/antagonist/battlecruiser/ally, team) -/datum/traitor_objective/final/battlecruiser/generate_ui_buttons(mob/user) +/datum/traitor_objective/ultimate/battlecruiser/generate_ui_buttons(mob/user) var/list/buttons = list() if(!sent_accesscard) buttons += add_ui_button("", "Pressing this will materialize an upload card, which you can use on a communication console to contact the fleet.", "phone", "card") return buttons -/datum/traitor_objective/final/battlecruiser/ui_perform_action(mob/living/user, action) +/datum/traitor_objective/ultimate/battlecruiser/ui_perform_action(mob/living/user, action) . = ..() switch(action) if("card") diff --git a/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm b/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm index c12016ae3e6..fdce4cdf651 100644 --- a/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm +++ b/code/modules/antagonists/traitor/objectives/final_objective/final_objective.dm @@ -1,21 +1,21 @@ /datum/traitor_objective_category/final_objective name = "Final Objective" objectives = list( - /datum/traitor_objective/final/romerol = 1, - /datum/traitor_objective/final/battlecruiser = 1, - /datum/traitor_objective/final/space_dragon = 1, - /datum/traitor_objective/final/supermatter_cascade = 1, + /datum/traitor_objective/ultimate/romerol = 1, + /datum/traitor_objective/ultimate/battlecruiser = 1, + /datum/traitor_objective/ultimate/space_dragon = 1, + /datum/traitor_objective/ultimate/supermatter_cascade = 1, ) weight = 100 -/datum/traitor_objective/final - abstract_type = /datum/traitor_objective/final +/datum/traitor_objective/ultimate + abstract_type = /datum/traitor_objective/ultimate progression_minimum = 140 MINUTES var/progression_points_in_objectives = 20 MINUTES /// Determines if this final objective can be taken. Should be put into every final objective's generate function. -/datum/traitor_objective/final/can_generate_objective(generating_for, list/possible_duplicates) +/datum/traitor_objective/ultimate/can_generate_objective(generating_for, list/possible_duplicates) if(handler.get_completion_progression(/datum/traitor_objective) < progression_points_in_objectives) return FALSE if(SStraitor.get_taken_count(type) > 0) // Prevents multiple people from ever getting the same final objective. @@ -24,13 +24,13 @@ return FALSE return TRUE -/datum/traitor_objective/final/on_objective_taken(mob/user) +/datum/traitor_objective/ultimate/on_objective_taken(mob/user) . = ..() handler.maximum_potential_objectives = 0 for(var/datum/traitor_objective/objective as anything in handler.potential_objectives) objective.fail_objective() user.playsound_local(get_turf(user), 'sound/traitor/final_objective.ogg', vol = 100, vary = FALSE, channel = CHANNEL_TRAITOR) -/datum/traitor_objective/final/uplink_ui_data(mob/user) +/datum/traitor_objective/ultimate/uplink_ui_data(mob/user) . = ..() .["final_objective"] = TRUE diff --git a/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm b/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm index d249506157f..fb28bad5d50 100644 --- a/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm +++ b/code/modules/antagonists/traitor/objectives/final_objective/romerol.dm @@ -1,4 +1,4 @@ -/datum/traitor_objective/final/romerol +/datum/traitor_objective/ultimate/romerol name = "Spread the experimental bioterror agent Romerol by calling a droppod down at %AREA%" description = "Go to %AREA%, and recieve the bioterror agent. Spread it to the crew, \ and watch then raise from the dead as mindless killing machines. Warning: The undead will attack you too." @@ -10,7 +10,7 @@ ///checker on whether we have sent the romerol yet. var/sent_romerol = FALSE -/datum/traitor_objective/final/romerol/generate_objective(datum/mind/generating_for, list/possible_duplicates) +/datum/traitor_objective/ultimate/romerol/generate_objective(datum/mind/generating_for, list/possible_duplicates) var/list/possible_areas = GLOB.the_station_areas.Copy() for(var/area/possible_area as anything in possible_areas) //remove areas too close to the destination, too obvious for our poor shmuck, or just unfair @@ -22,13 +22,13 @@ replace_in_name("%AREA%", initial(romerol_spawnarea_type.name)) return TRUE -/datum/traitor_objective/final/romerol/generate_ui_buttons(mob/user) +/datum/traitor_objective/ultimate/romerol/generate_ui_buttons(mob/user) var/list/buttons = list() if(!sent_romerol) buttons += add_ui_button("", "Pressing this will call down a pod with the biohazard kit.", "biohazard", "romerol") return buttons -/datum/traitor_objective/final/romerol/ui_perform_action(mob/living/user, action) +/datum/traitor_objective/ultimate/romerol/ui_perform_action(mob/living/user, action) . = ..() switch(action) if("romerol") diff --git a/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm b/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm index 84d7354a841..0629ea926c9 100644 --- a/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm +++ b/code/modules/antagonists/traitor/objectives/final_objective/space_dragon.dm @@ -1,4 +1,4 @@ -/datum/traitor_objective/final/space_dragon +/datum/traitor_objective/ultimate/space_dragon name = "Find a Space Carp and mutate their DNA with your own using a DNA harvester we will drop pod at %AREA%" description = "Go to %AREA%, and recieve the Carp DNA scanner. Use it on any Space Carp to harvest its DNA. \ From there, use it on yourself, to mutate your own DNA with it and become a Space Dragon. \ @@ -9,12 +9,12 @@ ///Whether the DNA extraction kit was sent already. var/recieved_dna_scanner = FALSE -/datum/traitor_objective/final/space_dragon/on_objective_taken(mob/user) +/datum/traitor_objective/ultimate/space_dragon/on_objective_taken(mob/user) . = ..() var/datum/round_event_control/carp_migration/carp_event = locate(/datum/round_event_control/carp_migration) in SSevents.control carp_event.runEvent() -/datum/traitor_objective/final/space_dragon/generate_objective(datum/mind/generating_for, list/possible_duplicates) +/datum/traitor_objective/ultimate/space_dragon/generate_objective(datum/mind/generating_for, list/possible_duplicates) var/list/possible_areas = GLOB.the_station_areas.Copy() for(var/area/possible_area as anything in possible_areas) //remove areas too close to the destination, too obvious for our poor shmuck, or just unfair @@ -26,13 +26,13 @@ replace_in_name("%AREA%", initial(dna_scanner_spawnarea_type.name)) return TRUE -/datum/traitor_objective/final/space_dragon/generate_ui_buttons(mob/user) +/datum/traitor_objective/ultimate/space_dragon/generate_ui_buttons(mob/user) var/list/buttons = list() if(!recieved_dna_scanner) buttons += add_ui_button("", "Pressing this will call down a pod with the DNA extraction kit.", "biohazard", "carp_dna") return buttons -/datum/traitor_objective/final/space_dragon/ui_perform_action(mob/living/user, action) +/datum/traitor_objective/ultimate/space_dragon/ui_perform_action(mob/living/user, action) . = ..() switch(action) if("carp_dna") diff --git a/code/modules/antagonists/traitor/objectives/final_objective/supermatter_cascade.dm b/code/modules/antagonists/traitor/objectives/final_objective/supermatter_cascade.dm index 2960f75edc4..3c704a4331d 100644 --- a/code/modules/antagonists/traitor/objectives/final_objective/supermatter_cascade.dm +++ b/code/modules/antagonists/traitor/objectives/final_objective/supermatter_cascade.dm @@ -1,4 +1,4 @@ -/datum/traitor_objective/final/supermatter_cascade +/datum/traitor_objective/ultimate/supermatter_cascade name = "Destroy the station by causing a crystallizing resonance cascade" description = "Destroy the station by causing a supermatter cascade. Go to %AREA% to retrieve the destabilizing crystal \ and use it on the supermatter." @@ -8,7 +8,7 @@ ///checker on whether we have sent the crystal yet. var/sent_crystal = FALSE -/datum/traitor_objective/final/supermatter_cascade/can_generate_objective(generating_for, list/generating_for) +/datum/traitor_objective/ultimate/supermatter_cascade/can_generate_objective(generating_for, list/possible_duplicates) . = ..() if(!.) return FALSE @@ -19,7 +19,7 @@ return FALSE -/datum/traitor_objective/final/supermatter_cascade/generate_objective(datum/mind/generating_for, list/possible_duplicates) +/datum/traitor_objective/ultimate/supermatter_cascade/generate_objective(datum/mind/generating_for, list/possible_duplicates) var/list/possible_areas = GLOB.the_station_areas.Copy() for(var/area/possible_area as anything in possible_areas) //remove areas too close to the destination, too obvious for our poor shmuck, or just unfair @@ -31,13 +31,13 @@ replace_in_name("%AREA%", initial(dest_crystal_area_pickup.name)) return TRUE -/datum/traitor_objective/final/supermatter_cascade/generate_ui_buttons(mob/user) +/datum/traitor_objective/ultimate/supermatter_cascade/generate_ui_buttons(mob/user) var/list/buttons = list() if(!sent_crystal) buttons += add_ui_button("", "Pressing this will call down a pod with the supermatter cascade kit.", "biohazard", "destabilizing_crystal") return buttons -/datum/traitor_objective/final/supermatter_cascade/ui_perform_action(mob/living/user, action) +/datum/traitor_objective/ultimate/supermatter_cascade/ui_perform_action(mob/living/user, action) . = ..() switch(action) if("destabilizing_crystal") diff --git a/code/modules/antagonists/traitor/objectives/hack_comm_console.dm b/code/modules/antagonists/traitor/objectives/hack_comm_console.dm index 2519f76be1a..52e0397cc60 100644 --- a/code/modules/antagonists/traitor/objectives/hack_comm_console.dm +++ b/code/modules/antagonists/traitor/objectives/hack_comm_console.dm @@ -23,8 +23,8 @@ /datum/traitor_objective/hack_comm_console/generate_objective(datum/mind/generating_for, list/possible_duplicates) AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \ - signals = list(COMSIG_HUMAN_EARLY_UNARMED_ATTACK = .proc/on_unarmed_attack)) - RegisterSignal(SSdcs, COMSIG_GLOB_TRAITOR_OBJECTIVE_COMPLETED, .proc/on_global_obj_completed) + signals = list(COMSIG_HUMAN_EARLY_UNARMED_ATTACK = PROC_REF(on_unarmed_attack))) + RegisterSignal(SSdcs, COMSIG_GLOB_TRAITOR_OBJECTIVE_COMPLETED, PROC_REF(on_global_obj_completed)) return TRUE /datum/traitor_objective/hack_comm_console/ungenerate_objective() @@ -43,7 +43,7 @@ return if(!istype(target)) return - INVOKE_ASYNC(src, .proc/begin_hack, user, target) + INVOKE_ASYNC(src, PROC_REF(begin_hack), user, target) return COMPONENT_CANCEL_ATTACK_CHAIN /datum/traitor_objective/hack_comm_console/proc/begin_hack(mob/user, obj/machinery/computer/communications/target) diff --git a/code/modules/antagonists/traitor/objectives/kidnapping.dm b/code/modules/antagonists/traitor/objectives/kidnapping.dm index 3c9c0c67c8f..209edb96db9 100644 --- a/code/modules/antagonists/traitor/objectives/kidnapping.dm +++ b/code/modules/antagonists/traitor/objectives/kidnapping.dm @@ -212,7 +212,7 @@ /datum/traitor_objective/kidnapping/proc/call_pod(mob/living/user) pod_called = TRUE var/obj/structure/closet/supplypod/extractionpod/new_pod = new() - RegisterSignal(new_pod, COMSIG_ATOM_ENTERED, .proc/enter_check) + RegisterSignal(new_pod, COMSIG_ATOM_ENTERED, PROC_REF(enter_check)) new /obj/effect/pod_landingzone(get_turf(user), new_pod) /datum/traitor_objective/kidnapping/proc/enter_check(obj/structure/closet/supplypod/extractionpod/source, entered_atom) @@ -241,7 +241,7 @@ priority_announce("One of your crew was captured by a rival organisation - we've needed to pay their ransom to bring them back. As is policy we've taken a portion of the station's funds to offset the overall cost.", "Nanotrasen Asset Protection", has_important_message = TRUE) - addtimer(CALLBACK(src, .proc/handle_victim, sent_mob), 1.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(handle_victim), sent_mob), 1.5 SECONDS) if(sent_mob != victim) fail_objective(penalty_cost = telecrystal_penalty) @@ -255,7 +255,7 @@ source.startExitSequence(source) /datum/traitor_objective/kidnapping/proc/handle_victim(mob/living/carbon/human/sent_mob) - addtimer(CALLBACK(src, .proc/return_victim, sent_mob), 3 MINUTES) + addtimer(CALLBACK(src, PROC_REF(return_victim), sent_mob), 3 MINUTES) if(sent_mob.stat == DEAD) return diff --git a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm index 0f4bad50c39..ba7c200840a 100644 --- a/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm +++ b/code/modules/antagonists/traitor/objectives/locate_weakpoint.dm @@ -64,7 +64,7 @@ var/area/scan_area2 = scan_areas[2] replace_in_name("%AREA1%", initial(scan_area1.name)) replace_in_name("%AREA2%", initial(scan_area2.name)) - RegisterSignal(SSdcs, COMSIG_GLOB_TRAITOR_OBJECTIVE_COMPLETED, .proc/on_global_obj_completed) + RegisterSignal(SSdcs, COMSIG_GLOB_TRAITOR_OBJECTIVE_COMPLETED, PROC_REF(on_global_obj_completed)) return TRUE /datum/traitor_objective/locate_weakpoint/ungenerate_objective() @@ -190,7 +190,7 @@ for(var/mob/living/silicon/ai/ai_player in GLOB.player_list) to_chat(ai_player, alertstr) - if(!do_after(user, 30 SECONDS, src, IGNORE_USER_LOC_CHANGE | IGNORE_TARGET_LOC_CHANGE | IGNORE_HELD_ITEM | IGNORE_INCAPACITATED | IGNORE_SLOWDOWNS, extra_checks = CALLBACK(src, .proc/scan_checks, user, user_area, objective))) + if(!do_after(user, 30 SECONDS, src, IGNORE_USER_LOC_CHANGE | IGNORE_TARGET_LOC_CHANGE | IGNORE_HELD_ITEM | IGNORE_INCAPACITATED | IGNORE_SLOWDOWNS, extra_checks = CALLBACK(src, PROC_REF(scan_checks), user, user_area, objective))) playsound(user, 'sound/machines/buzz-sigh.ogg', 30, TRUE) return diff --git a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm index 7467f630352..df41944b651 100644 --- a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm +++ b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm @@ -62,7 +62,7 @@ /datum/traitor_objective/sleeper_protocol/generate_objective(datum/mind/generating_for, list/possible_duplicates) AddComponent(/datum/component/traitor_objective_mind_tracker, generating_for, \ - signals = list(COMSIG_MOB_SURGERY_STEP_SUCCESS = .proc/on_surgery_success)) + signals = list(COMSIG_MOB_SURGERY_STEP_SUCCESS = PROC_REF(on_surgery_success))) return TRUE /datum/traitor_objective/sleeper_protocol/ungenerate_objective() diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm index c558f4a8cd2..9aa06883757 100644 --- a/code/modules/antagonists/traitor/objectives/steal.dm +++ b/code/modules/antagonists/traitor/objectives/steal.dm @@ -29,7 +29,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) objectives_by_path = list() for(var/datum/objective_item/item as anything in subtypesof(/datum/objective_item)) objectives_by_path[initial(item.targetitem)] = list() - RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/save_items) + RegisterSignal(SSatoms, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(save_items)) /datum/objective_item_handler/proc/save_items() for(var/obj/item/typepath as anything in objectives_by_path) @@ -38,7 +38,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) if(!place || !is_station_level(place.z)) objectives_by_path[typepath] -= object continue - RegisterSignal(object, COMSIG_PARENT_QDELETING, .proc/remove_item) + RegisterSignal(object, COMSIG_PARENT_QDELETING, PROC_REF(remove_item)) generated_items = TRUE /datum/objective_item_handler/proc/remove_item(atom/source) @@ -213,8 +213,8 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) AddComponent(/datum/component/traitor_objective_register, bug, \ fail_signals = COMSIG_PARENT_QDELETING, \ penalty = telecrystal_penalty) - RegisterSignal(bug, COMSIG_TRAITOR_BUG_PLANTED_OBJECT, .proc/on_bug_planted) - RegisterSignal(bug, COMSIG_TRAITOR_BUG_PRE_PLANTED_OBJECT, .proc/handle_special_case) + RegisterSignal(bug, COMSIG_TRAITOR_BUG_PLANTED_OBJECT, PROC_REF(on_bug_planted)) + RegisterSignal(bug, COMSIG_TRAITOR_BUG_PRE_PLANTED_OBJECT, PROC_REF(handle_special_case)) if("summon_gear") if(!special_equipment) return diff --git a/code/modules/antagonists/traitor/uplink_handler.dm b/code/modules/antagonists/traitor/uplink_handler.dm index c2860fc0131..42e236b1e92 100644 --- a/code/modules/antagonists/traitor/uplink_handler.dm +++ b/code/modules/antagonists/traitor/uplink_handler.dm @@ -193,7 +193,7 @@ objective.update_progression_reward() /datum/uplink_handler/proc/abort_objective(datum/traitor_objective/to_abort) - if(istype(to_abort, /datum/traitor_objective/final)) + if(istype(to_abort, /datum/traitor_objective/ultimate)) return if(to_abort.objective_state != OBJECTIVE_STATE_ACTIVE) return diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 1561329561f..33530d9e4b2 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -145,7 +145,7 @@ jedi.mob_mood.sanity = 0 for(var/lore in typesof(/datum/brain_trauma/severe)) jedi.gain_trauma(lore) - addtimer(CALLBACK(src, .proc/deranged, jedi), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(deranged), jedi), 10 SECONDS) /obj/tear_in_reality/proc/deranged(mob/living/carbon/C) if(!C || C.stat == DEAD) @@ -343,7 +343,7 @@ if(!whistle) qdel(src) return - RegisterSignal(src, COMSIG_MOVABLE_CROSS_OVER, .proc/check_teleport) + RegisterSignal(src, COMSIG_MOVABLE_CROSS_OVER, PROC_REF(check_teleport)) SSmove_manager.move_towards(src, get_turf(whistle.whistler)) /// Check if anything the tornado crosses is the creator. @@ -357,7 +357,7 @@ ADD_TRAIT(crossed, TRAIT_INCAPACITATED, WARPWHISTLE_TRAIT) animate(src, alpha = 20, pixel_y = 400, time = 3 SECONDS) animate(crossed, pixel_y = 400, time = 3 SECONDS) - addtimer(CALLBACK(src, .proc/send_away), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(send_away)), 2 SECONDS) /obj/effect/temp_visual/teleporting_tornado/proc/send_away() var/turf/ending_turfs = find_safe_turf() diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index e5f2bebd1c0..8588b0917ea 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -26,7 +26,7 @@ /obj/item/soulstone/Initialize(mapload) . = ..() if(theme != THEME_HOLY) - RegisterSignal(src, COMSIG_BIBLE_SMACKED, .proc/on_bible_smacked) + RegisterSignal(src, COMSIG_BIBLE_SMACKED, PROC_REF(on_bible_smacked)) /obj/item/soulstone/update_appearance(updates) . = ..() @@ -80,7 +80,7 @@ ///signal called whenever a soulstone is smacked by a bible /obj/item/soulstone/proc/on_bible_smacked(datum/source, mob/living/user, direction) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/attempt_exorcism, user) + INVOKE_ASYNC(src, PROC_REF(attempt_exorcism), user) /** * attempt_exorcism: called from on_bible_smacked, takes time and if successful @@ -318,7 +318,7 @@ return TRUE to_chat(user, "[span_userdanger("Capture failed!")]: The soul has already fled its mortal frame. You attempt to bring it back...") - INVOKE_ASYNC(src, .proc/get_ghost_to_replace_shade, victim, user) + INVOKE_ASYNC(src, PROC_REF(get_ghost_to_replace_shade), victim, user) return TRUE //it'll probably get someone ;) ///captures a shade that was previously released from a soulstone. @@ -349,7 +349,7 @@ if(!shade) to_chat(user, "[span_userdanger("Creation failed!")]: [src] is empty! Go kill someone!") return FALSE - var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, .proc/check_menu, user, shell), require_near = TRUE, tooltips = TRUE) + var/construct_class = show_radial_menu(user, src, GLOB.construct_radial_images, custom_check = CALLBACK(src, PROC_REF(check_menu), user, shell), require_near = TRUE, tooltips = TRUE) if(QDELETED(shell) || !construct_class) return FALSE make_new_construct_from_class(construct_class, theme, shade, user, FALSE, shell.loc) diff --git a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm index df83035fc7f..a16f5b6f1fd 100644 --- a/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/wizard_spellbook.dm @@ -24,7 +24,7 @@ /obj/item/spellbook/Initialize(mapload) . = ..() prepare_spells() - RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, .proc/on_magic_charge) + RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, PROC_REF(on_magic_charge)) /obj/item/spellbook/Destroy(force) owner = null diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 8c907325684..9b251c0f93e 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(wizard_spellbook_purchases_by_key) /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/art/paintings.dm b/code/modules/art/paintings.dm index 266323e8790..f2dcfb9ec06 100644 --- a/code/modules/art/paintings.dm +++ b/code/modules/art/paintings.dm @@ -237,7 +237,7 @@ var/list/radial_options = list() for(var/frame_name in possible_frames) radial_options[frame_name] = image(icon, "[icon_state]frame_[frame_name]") - var/result = show_radial_menu(user, loc, radial_options, radius = 60, custom_check = CALLBACK(src, .proc/can_select_frame, user), tooltips = TRUE) + var/result = show_radial_menu(user, loc, radial_options, radius = 60, custom_check = CALLBACK(src, PROC_REF(can_select_frame), user), tooltips = TRUE) if(!result) return painting_metadata.frame_type = result @@ -506,7 +506,7 @@ /obj/structure/sign/painting/AltClick(mob/user) . = ..() if(current_canvas?.can_select_frame(user)) - INVOKE_ASYNC(current_canvas, /obj/item/canvas.proc/select_new_frame, user) + INVOKE_ASYNC(current_canvas, TYPE_PROC_REF(/obj/item/canvas, select_new_frame), user) /obj/structure/sign/painting/proc/frame_canvas(mob/user, obj/item/canvas/new_canvas) if(!(new_canvas.type in accepted_canvas_types)) diff --git a/code/modules/art/statues.dm b/code/modules/art/statues.dm index 61b8a514f1c..a7d79b28712 100644 --- a/code/modules/art/statues.dm +++ b/code/modules/art/statues.dm @@ -360,7 +360,7 @@ Moving interrupts /obj/item/chisel/proc/set_block(obj/structure/carving_block/B,mob/living/user) prepared_block = B tracked_user = user - RegisterSignal(tracked_user,COMSIG_MOVABLE_MOVED,.proc/break_sculpting) + RegisterSignal(tracked_user,COMSIG_MOVABLE_MOVED, PROC_REF(break_sculpting)) to_chat(user,span_notice("You prepare to work on [B]."),type=MESSAGE_TYPE_INFO) /obj/item/chisel/dropped(mob/user, silent) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 0b9becc8c86..a5830103416 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -78,9 +78,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, mob/pulser) if(wire_type & WIRE_RECEIVE) - INVOKE_ASYNC(src, .proc/activate, pulser) + INVOKE_ASYNC(src, PROC_REF(activate), pulser) if(radio && (wire_type & WIRE_RADIO_RECEIVE)) - INVOKE_ASYNC(src, .proc/activate, pulser) + INVOKE_ASYNC(src, PROC_REF(activate), pulser) SEND_SIGNAL(src, COMSIG_ASSEMBLY_PULSED) return TRUE diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index 89b1db1c9ff..71980ee8d36 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -29,7 +29,7 @@ if(M.id == src.id) if(openclose == null || !sync_doors) openclose = M.density - INVOKE_ASYNC(M, openclose ? /obj/machinery/door/poddoor.proc/open : /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(M, openclose ? TYPE_PROC_REF(/obj/machinery/door/poddoor, open) : TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10) /obj/item/assembly/control/curtain @@ -50,7 +50,7 @@ if(M.id == src.id) if(openclose == null || !sync_doors) openclose = M.density - INVOKE_ASYNC(M, openclose ? /obj/structure/curtain/cloth/fancy/mechanical.proc/open : /obj/structure/curtain/cloth/fancy/mechanical.proc/close) + INVOKE_ASYNC(M, openclose ? TYPE_PROC_REF(/obj/structure/curtain/cloth/fancy/mechanical, open) : TYPE_PROC_REF(/obj/structure/curtain/cloth/fancy/mechanical, close)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 5) @@ -94,7 +94,7 @@ D.safe = !D.safe for(var/D in open_or_close) - INVOKE_ASYNC(D, doors_need_closing ? /obj/machinery/door/airlock.proc/close : /obj/machinery/door/airlock.proc/open) + INVOKE_ASYNC(D, doors_need_closing ? TYPE_PROC_REF(/obj/machinery/door/airlock, close) : TYPE_PROC_REF(/obj/machinery/door/airlock, open)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10) @@ -109,7 +109,7 @@ cooldown = TRUE for(var/obj/machinery/door/poddoor/M in GLOB.machines) if (M.id == src.id) - INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/open) + INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/door/poddoor, open)) sleep(1 SECONDS) @@ -121,7 +121,7 @@ for(var/obj/machinery/door/poddoor/M in GLOB.machines) if (M.id == src.id) - INVOKE_ASYNC(M, /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 10) @@ -136,7 +136,7 @@ cooldown = TRUE for(var/obj/machinery/sparker/M in GLOB.machines) if (M.id == src.id) - INVOKE_ASYNC(M, /obj/machinery/sparker.proc/ignite) + INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/sparker, ignite)) for(var/obj/machinery/igniter/M in GLOB.machines) if(M.id == src.id) @@ -156,7 +156,7 @@ cooldown = TRUE for(var/obj/machinery/flasher/M in GLOB.machines) if(M.id == src.id) - INVOKE_ASYNC(M, /obj/machinery/flasher.proc/flash) + INVOKE_ASYNC(M, TYPE_PROC_REF(/obj/machinery/flasher, flash)) addtimer(VARSET_CALLBACK(src, cooldown, FALSE), 50) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index a651bb1b574..9ba1c85121b 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -50,7 +50,7 @@ flashing = flash . = ..() if(flash) - addtimer(CALLBACK(src, /atom/.proc/update_icon), 5) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_icon)), 5) holder?.update_icon(updates) /obj/item/assembly/flash/update_overlays() @@ -118,7 +118,7 @@ last_trigger = world.time playsound(src, 'sound/weapons/flash.ogg', 100, TRUE) set_light_on(TRUE) - addtimer(CALLBACK(src, .proc/flash_end), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(flash_end)), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) times_used++ if(!flash_recharge()) return FALSE @@ -345,7 +345,7 @@ to_chat(real_arm.owner, span_warning("Your photon projector implant overheats and deactivates!")) real_arm.Retract() overheat = TRUE - addtimer(CALLBACK(src, .proc/cooldown), flashcd * 2) + addtimer(CALLBACK(src, PROC_REF(cooldown)), flashcd * 2) /obj/item/assembly/flash/armimplant/try_use_flash(mob/user = null) if(overheat) @@ -354,7 +354,7 @@ to_chat(real_arm.owner, span_warning("Your photon projector is running too hot to be used again so quickly!")) return FALSE overheat = TRUE - addtimer(CALLBACK(src, .proc/cooldown), flashcd) + addtimer(CALLBACK(src, PROC_REF(cooldown)), flashcd) playsound(src, 'sound/weapons/flash.ogg', 100, TRUE) update_icon(ALL, TRUE) return TRUE diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index f3ea52ec6e8..9cce8adc370 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -18,7 +18,7 @@ . = ..() beams = list() START_PROCESSING(SSobj, src) - AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, .proc/AfterRotation)) + AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, PROC_REF(AfterRotation))) /obj/item/assembly/infra/proc/AfterRotation(mob/user, degrees) refreshBeam() @@ -160,7 +160,7 @@ return if(listeningTo) UnregisterSignal(listeningTo, COMSIG_ATOM_EXITED) - RegisterSignal(newloc, COMSIG_ATOM_EXITED, .proc/check_exit) + RegisterSignal(newloc, COMSIG_ATOM_EXITED, PROC_REF(check_exit)) listeningTo = newloc /obj/item/assembly/infra/proc/check_exit(datum/source, atom/movable/gone, direction) @@ -174,7 +174,7 @@ var/obj/item/I = gone if (I.item_flags & ABSTRACT) return - INVOKE_ASYNC(src, .proc/refreshBeam) + INVOKE_ASYNC(src, PROC_REF(refreshBeam)) /obj/item/assembly/infra/setDir() . = ..() @@ -228,7 +228,7 @@ /obj/effect/beam/i_beam/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -240,4 +240,4 @@ var/obj/item/I = AM if (I.item_flags & ABSTRACT) return - INVOKE_ASYNC(master, /obj/item/assembly/infra.proc/trigger_beam, AM, get_turf(src)) + INVOKE_ASYNC(master, TYPE_PROC_REF(/obj/item/assembly/infra, trigger_beam), AM, get_turf(src)) diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 085fb8f28bf..a118c1bc48a 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -54,7 +54,7 @@ if(host) UnregisterSignal(host,COMSIG_MOVABLE_MOVED) host = newhost - RegisterSignal(host,COMSIG_MOVABLE_MOVED,.proc/holder_movement) + RegisterSignal(host,COMSIG_MOVABLE_MOVED, PROC_REF(holder_movement)) // If host moved if((host_turf != host.loc) || force) @@ -63,7 +63,7 @@ host_turf = null if(isturf(host.loc)) host_turf = host.loc - RegisterSignal(host_turf,COMSIG_ATOM_ENTERED,.proc/on_entered) + RegisterSignal(host_turf,COMSIG_ATOM_ENTERED, PROC_REF(on_entered)) else host_turf = null @@ -197,13 +197,13 @@ if(ishuman(AM)) var/mob/living/carbon/H = AM if(H.m_intent == MOVE_INTENT_RUN) - INVOKE_ASYNC(src, .proc/triggered, H) + INVOKE_ASYNC(src, PROC_REF(triggered), H) H.visible_message(span_warning("[H] accidentally steps on [src]."), \ span_warning("You accidentally step on [src]")) else if(ismouse(MM) || isregalrat(MM)) - INVOKE_ASYNC(src, .proc/triggered, MM) + INVOKE_ASYNC(src, PROC_REF(triggered), MM) else if(AM.density) // For mousetrap grenades, set off by anything heavy - INVOKE_ASYNC(src, .proc/triggered, AM) + INVOKE_ASYNC(src, PROC_REF(triggered), AM) /obj/item/assembly/mousetrap/on_found(mob/finder) if(armed) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 425eacd959c..381c02de759 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -94,7 +94,7 @@ to_chat(usr, span_warning("[src] is still recharging...")) return TIMER_COOLDOWN_START(src, COOLDOWN_SIGNALLER_SEND, 1 SECONDS) - INVOKE_ASYNC(src, .proc/signal) + INVOKE_ASYNC(src, PROC_REF(signal)) . = TRUE if("freq") var/new_frequency = sanitize_frequency(unformat_frequency(params["freq"]), TRUE) @@ -132,7 +132,7 @@ balloon_alert(user, "still recharging...") return TIMER_COOLDOWN_START(src, COOLDOWN_SIGNALLER_SEND, 1 SECONDS) - INVOKE_ASYNC(src, .proc/signal) + INVOKE_ASYNC(src, PROC_REF(signal)) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN /obj/item/assembly/signaler/proc/signal() diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 9fef2ce84e6..a9f43ac380c 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -16,7 +16,7 @@ /obj/item/assembly/timer/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] looks at the timer and decides [user.p_their()] fate! It looks like [user.p_theyre()] going to commit suicide!")) activate()//doesnt rely on timer_end to prevent weird metas where one person can control the timer and therefore someone's life. (maybe that should be how it works...) - addtimer(CALLBACK(src, .proc/manual_suicide, user), time SECONDS)//kill yourself once the time runs out + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), time SECONDS)//kill yourself once the time runs out return MANUAL_SUICIDE /obj/item/assembly/timer/proc/manual_suicide(mob/living/user) diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 35961a97733..c3fac0690e5 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -91,7 +91,7 @@ /obj/item/assembly/voice/proc/send_pulse() visible_message("clicks", visible_message_flags = EMOTE_MESSAGE) playsound(src, 'sound/effects/whirthunk.ogg', 30) - addtimer(CALLBACK(src, .proc/pulse), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(pulse)), 2 SECONDS) /obj/item/assembly/voice/multitool_act(mob/living/user, obj/item/I) ..() diff --git a/code/modules/asset_cache/assets/uplink.dm b/code/modules/asset_cache/assets/uplink.dm index 317e76bd579..6af6e1ff93e 100644 --- a/code/modules/asset_cache/assets/uplink.dm +++ b/code/modules/asset_cache/assets/uplink.dm @@ -9,7 +9,7 @@ var/list/items = list() for(var/datum/uplink_category/category as anything in subtypesof(/datum/uplink_category)) categories += category - categories = sortTim(categories, .proc/cmp_uplink_category_desc) + categories = sortTim(categories, GLOBAL_PROC_REF(cmp_uplink_category_desc)) var/list/new_categories = list() for(var/datum/uplink_category/category as anything in categories) diff --git a/code/modules/asset_cache/transports/asset_transport.dm b/code/modules/asset_cache/transports/asset_transport.dm index 01b3816be91..138024c76f9 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) /** diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm index fcc0808ad13..9b7602877a9 100644 --- a/code/modules/atmospherics/environmental/LINDA_fire.dm +++ b/code/modules/atmospherics/environmental/LINDA_fire.dm @@ -111,8 +111,8 @@ setDir(pick(GLOB.cardinals)) air_update_turf(FALSE, FALSE) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, - COMSIG_ATOM_ABSTRACT_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), + COMSIG_ATOM_ABSTRACT_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 930586696bb..fe6044d4f4e 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -93,7 +93,7 @@ ///Represents a signel source of atmos alarms, complains to all the listeners if one of our thresholds is violated var/datum/alarm_handler/alarm_manager - var/static/list/atmos_connections = list(COMSIG_TURF_EXPOSE = .proc/check_air_dangerlevel) + var/static/list/atmos_connections = list(COMSIG_TURF_EXPOSE = PROC_REF(check_air_dangerlevel)) var/list/TLV = list( // Breathable air. "pressure" = new/datum/tlv(HAZARD_LOW_PRESSURE, WARNING_LOW_PRESSURE, WARNING_HIGH_PRESSURE, HAZARD_HIGH_PRESSURE), // kPa. Values are hazard_min, warning_min, warning_max, hazard_max @@ -644,10 +644,10 @@ danger_level = max(pressure_dangerlevel, temperature_dangerlevel, gas_dangerlevel) if(old_danger_level != danger_level) - INVOKE_ASYNC(src, .proc/apply_danger_level) + INVOKE_ASYNC(src, PROC_REF(apply_danger_level)) if(mode == AALARM_MODE_REPLACEMENT && environment_pressure < ONE_ATMOSPHERE * 0.05) mode = AALARM_MODE_SCRUBBING - INVOKE_ASYNC(src, .proc/apply_mode, src) + INVOKE_ASYNC(src, PROC_REF(apply_mode), src) /obj/machinery/airalarm/proc/post_alert(alert_level) @@ -956,9 +956,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_general/populate_ports() mode = add_option_port("Mode", options_map, order = 1) - set_mode = add_input_port("Set Mode", PORT_TYPE_SIGNAL, trigger = .proc/set_mode) - enable_fire_alarm = add_input_port("Enable Alarm", PORT_TYPE_SIGNAL, trigger = .proc/trigger_alarm) - disable_fire_alarm = add_input_port("Disable Alarm", PORT_TYPE_SIGNAL, trigger = .proc/trigger_alarm) + set_mode = add_input_port("Set Mode", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_mode)) + enable_fire_alarm = add_input_port("Enable Alarm", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_alarm)) + disable_fire_alarm = add_input_port("Disable Alarm", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_alarm)) fire_alarm_enabled = add_output_port("Alarm Enabled", PORT_TYPE_NUMBER) current_mode = add_output_port("Current Mode", PORT_TYPE_STRING) @@ -967,9 +967,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) . = ..() if(istype(shell, /obj/machinery/airalarm)) connected_alarm = shell - RegisterSignal(connected_alarm.alarm_manager, COMSIG_ALARM_TRIGGERED, .proc/on_alarm_triggered) - RegisterSignal(connected_alarm.alarm_manager, COMSIG_ALARM_CLEARED, .proc/on_alarm_cleared) - RegisterSignal(shell, COMSIG_AIRALARM_UPDATE_MODE, .proc/on_mode_updated) + RegisterSignal(connected_alarm.alarm_manager, COMSIG_ALARM_TRIGGERED, PROC_REF(on_alarm_triggered)) + RegisterSignal(connected_alarm.alarm_manager, COMSIG_ALARM_CLEARED, PROC_REF(on_alarm_cleared)) + RegisterSignal(shell, COMSIG_AIRALARM_UPDATE_MODE, PROC_REF(on_mode_updated)) current_mode.set_value(connected_alarm.get_mode_name(connected_alarm.mode)) /obj/item/circuit_component/air_alarm_general/unregister_usb_parent(atom/movable/shell) @@ -1007,10 +1007,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) if(port == enable_fire_alarm) if(connected_alarm.alarm_manager.send_alarm(ALARM_ATMOS)) - INVOKE_ASYNC(connected_alarm, /obj/machinery/airalarm.proc/post_alert, 2) + INVOKE_ASYNC(connected_alarm, TYPE_PROC_REF(/obj/machinery/airalarm, post_alert), 2) else if(connected_alarm.alarm_manager.clear_alarm(ALARM_ATMOS)) - INVOKE_ASYNC(connected_alarm, /obj/machinery/airalarm.proc/post_alert, 0) + INVOKE_ASYNC(connected_alarm, TYPE_PROC_REF(/obj/machinery/airalarm, post_alert), 0) /obj/item/circuit_component/air_alarm_general/proc/set_mode(datum/port/input/port) CIRCUIT_TRIGGER @@ -1022,7 +1022,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) connected_alarm.mode = options_map[mode.value] connected_alarm.investigate_log("was turned to [connected_alarm.get_mode_name(connected_alarm.mode)] by [parent.get_creator()]") - INVOKE_ASYNC(connected_alarm, /obj/machinery/airalarm.proc/apply_mode, src) + INVOKE_ASYNC(connected_alarm, TYPE_PROC_REF(/obj/machinery/airalarm, apply_mode), src) /obj/item/circuit_component/air_alarm display_name = "Air Alarm Core Control" @@ -1060,7 +1060,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) if(action == "add_new_component") var/obj/item/circuit_component/air_alarm/component = new /obj/item/circuit_component/air_alarm/duplicate(parent) parent.add_component(component) - RegisterSignal(component, COMSIG_PARENT_QDELETING, .proc/on_duplicate_removed) + RegisterSignal(component, COMSIG_PARENT_QDELETING, PROC_REF(on_duplicate_removed)) component.connected_alarm = connected_alarm alarm_duplicates += component @@ -1073,7 +1073,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) min_1 = add_input_port("Warning Minimum", PORT_TYPE_NUMBER, trigger = null) max_1 = add_input_port("Warning Maximum", PORT_TYPE_NUMBER, trigger = null) max_2 = add_input_port("Hazard Maximum", PORT_TYPE_NUMBER, trigger = null) - set_data = add_input_port("Set Limits", PORT_TYPE_SIGNAL, trigger = .proc/set_limits) + set_data = add_input_port("Set Limits", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_limits)) request_data = add_input_port("Request Data", PORT_TYPE_SIGNAL) pressure = add_output_port("Pressure", PORT_TYPE_NUMBER) @@ -1215,7 +1215,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) if(action == "add_new_component") var/obj/item/circuit_component/air_alarm_scrubbers/component = new /obj/item/circuit_component/air_alarm_scrubbers/duplicate(parent) parent.add_component(component) - RegisterSignal(component, COMSIG_PARENT_QDELETING, .proc/on_duplicate_removed) + RegisterSignal(component, COMSIG_PARENT_QDELETING, PROC_REF(on_duplicate_removed)) component.connected_alarm = connected_alarm component.scrubbers.possible_options = connected_alarm.my_area.air_scrub_info scrubber_duplicates += component @@ -1229,14 +1229,14 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_scrubbers/populate_ports() gas_filter = add_input_port("Gas To Filter", PORT_TYPE_LIST(PORT_TYPE_STRING), trigger = null) - set_gas_filter = add_input_port("Set Filter", PORT_TYPE_SIGNAL, trigger = .proc/set_gas_to_filter) - enable_extended_range = add_input_port("Enable Extra Range", PORT_TYPE_SIGNAL, trigger = .proc/toggle_range) - disable_extended_range = add_input_port("Disable Extra Range", PORT_TYPE_SIGNAL, trigger = .proc/toggle_range) - enable_siphon = add_input_port("Enable Siphon", PORT_TYPE_SIGNAL, trigger = .proc/toggle_siphon) - disable_siphon = add_input_port("Disable Siphon", PORT_TYPE_SIGNAL, trigger = .proc/toggle_siphon) - enable = add_input_port("Enable", PORT_TYPE_SIGNAL, trigger = .proc/toggle_scrubber) - disable = add_input_port("Disable", PORT_TYPE_SIGNAL, trigger = .proc/toggle_scrubber) - request_update = add_input_port("Request Data", PORT_TYPE_SIGNAL, trigger = .proc/update_data) + set_gas_filter = add_input_port("Set Filter", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_gas_to_filter)) + enable_extended_range = add_input_port("Enable Extra Range", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_range)) + disable_extended_range = add_input_port("Disable Extra Range", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_range)) + enable_siphon = add_input_port("Enable Siphon", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_siphon)) + disable_siphon = add_input_port("Disable Siphon", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_siphon)) + enable = add_input_port("Enable", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_scrubber)) + disable = add_input_port("Disable", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_scrubber)) + request_update = add_input_port("Request Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(update_data)) enabled = add_output_port("Enabled", PORT_TYPE_NUMBER) is_siphoning = add_output_port("Siphoning", PORT_TYPE_NUMBER) @@ -1284,7 +1284,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_scrubbers/proc/set_gas_to_filter(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/set_gas_filter_async, port) + INVOKE_ASYNC(src, PROC_REF(set_gas_filter_async), port) /obj/item/circuit_component/air_alarm_scrubbers/proc/set_gas_filter_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) @@ -1303,7 +1303,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_scrubber(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/toggle_scrubber_async, port) + INVOKE_ASYNC(src, PROC_REF(toggle_scrubber_async), port) /obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_scrubber_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) @@ -1322,7 +1322,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_range(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/toggle_range_async, port) + INVOKE_ASYNC(src, PROC_REF(toggle_range_async), port) /obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_range_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) @@ -1341,7 +1341,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_siphon(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/toggle_siphon_async, port) + INVOKE_ASYNC(src, PROC_REF(toggle_siphon_async), port) /obj/item/circuit_component/air_alarm_scrubbers/proc/toggle_siphon_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) @@ -1446,7 +1446,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) if(action == "add_new_component") var/obj/item/circuit_component/air_alarm_vents/component = new /obj/item/circuit_component/air_alarm_vents/duplicate(parent) parent.add_component(component) - RegisterSignal(component, COMSIG_PARENT_QDELETING, .proc/on_duplicate_removed) + RegisterSignal(component, COMSIG_PARENT_QDELETING, PROC_REF(on_duplicate_removed)) vent_duplicates += component component.connected_alarm = connected_alarm component.vents.possible_options = connected_alarm.my_area.air_vent_info @@ -1459,19 +1459,19 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) vents = add_option_port("Vent", null) /obj/item/circuit_component/air_alarm_vents/populate_ports() - external_pressure = add_input_port("External Pressure", PORT_TYPE_NUMBER, trigger = .proc/set_external_pressure) - internal_pressure = add_input_port("Internal Pressure", PORT_TYPE_NUMBER, trigger = .proc/set_internal_pressure) + external_pressure = add_input_port("External Pressure", PORT_TYPE_NUMBER, trigger = PROC_REF(set_external_pressure)) + internal_pressure = add_input_port("Internal Pressure", PORT_TYPE_NUMBER, trigger = PROC_REF(set_internal_pressure)) - enable_external = add_input_port("Enable External", PORT_TYPE_SIGNAL, trigger = .proc/toggle_external) - disable_external = add_input_port("Disable External", PORT_TYPE_SIGNAL, trigger = .proc/toggle_external) - enable_internal = add_input_port("Enable Internal", PORT_TYPE_SIGNAL, trigger = .proc/toggle_internal) - disable_internal = add_input_port("Disable Internal", PORT_TYPE_SIGNAL, trigger = .proc/toggle_internal) + enable_external = add_input_port("Enable External", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_external)) + disable_external = add_input_port("Disable External", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_external)) + enable_internal = add_input_port("Enable Internal", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_internal)) + disable_internal = add_input_port("Disable Internal", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_internal)) - enable_siphon = add_input_port("Enable Siphon", PORT_TYPE_SIGNAL, trigger = .proc/toggle_siphon) - disable_siphon = add_input_port("Disable Siphon", PORT_TYPE_SIGNAL, trigger = .proc/toggle_siphon) - enable = add_input_port("Enable", PORT_TYPE_SIGNAL, trigger = .proc/toggle_vent) - disable = add_input_port("Disable", PORT_TYPE_SIGNAL, trigger = .proc/toggle_vent) - request_update = add_input_port("Request Data", PORT_TYPE_SIGNAL, trigger = .proc/update_data) + enable_siphon = add_input_port("Enable Siphon", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_siphon)) + disable_siphon = add_input_port("Disable Siphon", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_siphon)) + enable = add_input_port("Enable", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_vent)) + disable = add_input_port("Disable", PORT_TYPE_SIGNAL, trigger = PROC_REF(toggle_vent)) + request_update = add_input_port("Request Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(update_data)) enabled = add_output_port("Enabled", PORT_TYPE_NUMBER) is_siphoning = add_output_port("Siphoning", PORT_TYPE_NUMBER) @@ -1515,7 +1515,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_vents/proc/toggle_vent(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/toggle_vent_async, port) + INVOKE_ASYNC(src, PROC_REF(toggle_vent_async), port) /obj/item/circuit_component/air_alarm_vents/proc/toggle_vent_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) @@ -1538,7 +1538,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_vents/proc/toggle_external(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/toggle_external_async, port) + INVOKE_ASYNC(src, PROC_REF(toggle_external_async), port) /obj/item/circuit_component/air_alarm_vents/proc/toggle_external_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) @@ -1560,7 +1560,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_vents/proc/toggle_internal(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/toggle_internal_async, port) + INVOKE_ASYNC(src, PROC_REF(toggle_internal_async), port) /obj/item/circuit_component/air_alarm_vents/proc/toggle_internal_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) @@ -1582,7 +1582,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_vents/proc/set_internal_pressure(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/set_internal_pressure_async, port) + INVOKE_ASYNC(src, PROC_REF(set_internal_pressure_async), port) /obj/item/circuit_component/air_alarm_vents/proc/set_internal_pressure_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) @@ -1596,7 +1596,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_vents/proc/set_external_pressure(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/set_external_pressure_async, port) + INVOKE_ASYNC(src, PROC_REF(set_external_pressure_async), port) /obj/item/circuit_component/air_alarm_vents/proc/set_external_pressure_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) @@ -1611,7 +1611,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 24) /obj/item/circuit_component/air_alarm_vents/proc/toggle_siphon(datum/port/input/port) CIRCUIT_TRIGGER - INVOKE_ASYNC(src, .proc/toggle_siphon_async, port) + INVOKE_ASYNC(src, PROC_REF(toggle_siphon_async), port) /obj/item/circuit_component/air_alarm_vents/proc/toggle_siphon_async(datum/port/input/port) if(!connected_alarm || connected_alarm.locked) diff --git a/code/modules/atmospherics/machinery/bluespace_vendor.dm b/code/modules/atmospherics/machinery/bluespace_vendor.dm index be58a4d1e16..d3f555a4bb5 100644 --- a/code/modules/atmospherics/machinery/bluespace_vendor.dm +++ b/code/modules/atmospherics/machinery/bluespace_vendor.dm @@ -164,7 +164,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/bluespace_vendor, 30) /obj/machinery/bluespace_vendor/proc/register_machine(machine) connected_machine = machine LAZYADD(connected_machine.vendors, src) - RegisterSignal(connected_machine, COMSIG_PARENT_QDELETING, .proc/unregister_machine) + RegisterSignal(connected_machine, COMSIG_PARENT_QDELETING, PROC_REF(unregister_machine)) mode = BS_MODE_IDLE update_appearance() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm index 45efa9e16e1..b74b5935c2f 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm @@ -182,7 +182,7 @@ if("set_external_pressure" in signal.data) external_pressure_bound = clamp(text2num(signal.data["set_external_pressure"]),0,ONE_ATMOSPHERE*50) - addtimer(CALLBACK(src, .proc/broadcast_status), 2) + addtimer(CALLBACK(src, PROC_REF(broadcast_status)), 2) if(!("status" in signal.data)) //do not update_appearance update_appearance() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index 1f372947f6e..0dd3d29fe9f 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -219,10 +219,10 @@ var/obj/machinery/atmospherics/components/binary/pump/connected_pump /obj/item/circuit_component/atmos_pump/populate_ports() - pressure_value = add_input_port("New Pressure", PORT_TYPE_NUMBER, trigger = .proc/set_pump_pressure) - on = add_input_port("Turn On", PORT_TYPE_SIGNAL, trigger = .proc/set_pump_on) - off = add_input_port("Turn Off", PORT_TYPE_SIGNAL, trigger = .proc/set_pump_off) - request_data = add_input_port("Request Port Data", PORT_TYPE_SIGNAL, trigger = .proc/request_pump_data) + pressure_value = add_input_port("New Pressure", PORT_TYPE_NUMBER, trigger = PROC_REF(set_pump_pressure)) + on = add_input_port("Turn On", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_pump_on)) + off = add_input_port("Turn Off", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_pump_off)) + request_data = add_input_port("Request Port Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(request_pump_data)) input_pressure = add_output_port("Input Pressure", PORT_TYPE_NUMBER) output_pressure = add_output_port("Output Pressure", PORT_TYPE_NUMBER) @@ -237,7 +237,7 @@ . = ..() if(istype(shell, /obj/machinery/atmospherics/components/binary/pump)) connected_pump = shell - RegisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON, .proc/handle_pump_activation) + RegisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON, PROC_REF(handle_pump_activation)) /obj/item/circuit_component/atmos_pump/unregister_usb_parent(atom/movable/shell) UnregisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm index 315d89038cb..32f3eb7419c 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm @@ -66,7 +66,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. return update_icon_nopipes(TRUE) switching = TRUE - addtimer(CALLBACK(src, .proc/finish_interact), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(finish_interact)), 1 SECONDS) /** * Called by iteract() after a 1 second timer, calls toggle(), allows another interaction with the component. @@ -119,7 +119,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off. . = ..() if(istype(shell, /obj/machinery/atmospherics/components/binary/valve/digital)) attached_valve = shell - RegisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN, .proc/handle_valve_toggled) + RegisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN, PROC_REF(handle_valve_toggled)) /obj/item/circuit_component/digital_valve/unregister_usb_parent(atom/movable/shell) UnregisterSignal(attached_valve, COMSIG_VALVE_SET_OPEN) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index 5109e2eb280..ef4567ca831 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -262,10 +262,10 @@ var/obj/machinery/atmospherics/components/binary/volume_pump/connected_pump /obj/item/circuit_component/atmos_volume_pump/populate_ports() - transfer_rate = add_input_port("New Transfer Rate", PORT_TYPE_NUMBER, trigger = .proc/set_transfer_rate) - on = add_input_port("Turn On", PORT_TYPE_SIGNAL, trigger = .proc/set_pump_on) - off = add_input_port("Turn Off", PORT_TYPE_SIGNAL, trigger = .proc/set_pump_off) - request_data = add_input_port("Request Port Data", PORT_TYPE_SIGNAL, trigger = .proc/request_pump_data) + transfer_rate = add_input_port("New Transfer Rate", PORT_TYPE_NUMBER, trigger = PROC_REF(set_transfer_rate)) + on = add_input_port("Turn On", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_pump_on)) + off = add_input_port("Turn Off", PORT_TYPE_SIGNAL, trigger = PROC_REF(set_pump_off)) + request_data = add_input_port("Request Port Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(request_pump_data)) input_pressure = add_output_port("Input Pressure", PORT_TYPE_NUMBER) output_pressure = add_output_port("Output Pressure", PORT_TYPE_NUMBER) @@ -280,7 +280,7 @@ . = ..() if(istype(shell, /obj/machinery/atmospherics/components/binary/volume_pump)) connected_pump = shell - RegisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON, .proc/handle_pump_activation) + RegisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON, PROC_REF(handle_pump_activation)) /obj/item/circuit_component/atmos_volume_pump/unregister_usb_parent(atom/movable/shell) UnregisterSignal(connected_pump, COMSIG_ATMOS_MACHINE_SET_ON) diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index 59d1072027a..6f39634d07c 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -36,7 +36,7 @@ . = ..() if(hide) - RegisterSignal(src, COMSIG_OBJ_HIDE, .proc/hide_pipe) + RegisterSignal(src, COMSIG_OBJ_HIDE, PROC_REF(hide_pipe)) // Iconnery diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm index 2a470df5881..081d8a44ee3 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm @@ -92,20 +92,20 @@ update_appearance() linked_interface.active = TRUE linked_interface.update_appearance() - RegisterSignal(linked_interface, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(linked_interface, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) linked_input.active = TRUE linked_input.update_appearance() - RegisterSignal(linked_input, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(linked_input, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) linked_output.active = TRUE linked_output.update_appearance() - RegisterSignal(linked_output, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(linked_output, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) linked_moderator.active = TRUE linked_moderator.update_appearance() - RegisterSignal(linked_moderator, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(linked_moderator, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) for(var/obj/machinery/hypertorus/corner/corner in corners) corner.active = TRUE corner.update_appearance() - RegisterSignal(corner, COMSIG_PARENT_QDELETING, .proc/unregister_signals) + RegisterSignal(corner, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) soundloop = new(src, TRUE) soundloop.volume = 5 diff --git a/code/modules/atmospherics/machinery/components/tank.dm b/code/modules/atmospherics/machinery/components/tank.dm index 73682fe0fbf..51f0114561d 100644 --- a/code/modules/atmospherics/machinery/components/tank.dm +++ b/code/modules/atmospherics/machinery/components/tank.dm @@ -81,9 +81,9 @@ AddElement(/datum/element/volatile_gas_storage) AddElement(/datum/element/crackable, 'icons/obj/atmospherics/stationary_canisters.dmi', crack_states) - RegisterSignal(src, COMSIG_MERGER_ADDING, .proc/merger_adding) - RegisterSignal(src, COMSIG_MERGER_REMOVING, .proc/merger_removing) - RegisterSignal(src, COMSIG_ATOM_SMOOTHED_ICON, .proc/smoothed) + RegisterSignal(src, COMSIG_MERGER_ADDING, PROC_REF(merger_adding)) + RegisterSignal(src, COMSIG_MERGER_REMOVING, PROC_REF(merger_removing)) + RegisterSignal(src, COMSIG_ATOM_SMOOTHED_ICON, PROC_REF(smoothed)) air_contents = new air_contents.temperature = T20C @@ -203,7 +203,7 @@ SIGNAL_HANDLER if(new_merger.id != merger_id) return - RegisterSignal(new_merger, COMSIG_MERGER_REFRESH_COMPLETE, .proc/merger_refresh_complete) + RegisterSignal(new_merger, COMSIG_MERGER_REFRESH_COMPLETE, PROC_REF(merger_refresh_complete)) /obj/machinery/atmospherics/components/tank/proc/merger_removing(obj/machinery/atmospherics/components/tank/us, datum/merger/old_merger) SIGNAL_HANDLER diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 8ef5432d497..2facc423f08 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -30,8 +30,8 @@ // It will follow this as the animation goes, but that's no problem as the "mask" icon state // already accounts for this. add_filter("alpha_mask", 1, list("type" = "alpha", "icon" = icon('icons/obj/medical/cryogenics.dmi', "mask"), "y" = -22)) - RegisterSignal(parent, COMSIG_MACHINERY_SET_OCCUPANT, .proc/on_set_occupant) - RegisterSignal(parent, COMSIG_CRYO_SET_ON, .proc/on_set_on) + RegisterSignal(parent, COMSIG_MACHINERY_SET_OCCUPANT, PROC_REF(on_set_occupant)) + RegisterSignal(parent, COMSIG_CRYO_SET_ON, PROC_REF(on_set_on)) /// COMSIG_MACHINERY_SET_OCCUPANT callback /atom/movable/visual/cryo_occupant/proc/on_set_occupant(datum/source, mob/living/new_occupant) diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index a8c66abf308..c06d74c0f23 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -159,7 +159,7 @@ var/obj/machinery/meter/connected_meter /obj/item/circuit_component/atmos_meter/populate_ports() - request_data = add_input_port("Request Meter Data", PORT_TYPE_SIGNAL, trigger = .proc/request_meter_data) + request_data = add_input_port("Request Meter Data", PORT_TYPE_SIGNAL, trigger = PROC_REF(request_meter_data)) pressure = add_output_port("Pressure", PORT_TYPE_NUMBER) temperature = add_output_port("Temperature", PORT_TYPE_NUMBER) diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 0f7a6f76c81..97fad5dea05 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -183,7 +183,7 @@ holding = null if(new_tank) holding = new_tank - RegisterSignal(holding, COMSIG_PARENT_QDELETING, .proc/unregister_holding) + RegisterSignal(holding, COMSIG_PARENT_QDELETING, PROC_REF(unregister_holding)) SSair.start_processing_machine(src) update_appearance() diff --git a/code/modules/autowiki/autowiki.dm b/code/modules/autowiki/autowiki.dm index 99e4755871f..f7a7d957c3e 100644 --- a/code/modules/autowiki/autowiki.dm +++ b/code/modules/autowiki/autowiki.dm @@ -4,7 +4,7 @@ #if defined(AUTOWIKI) || defined(UNIT_TESTS) /proc/setup_autowiki() Master.sleep_offline_after_initializations = FALSE - SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, /proc/generate_autowiki)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(generate_autowiki))) SSticker.start_immediately = TRUE CONFIG_SET(number/round_end_countdown, 0) diff --git a/code/modules/autowiki/pages/techweb.dm b/code/modules/autowiki/pages/techweb.dm index 83525621b54..6198e4645eb 100644 --- a/code/modules/autowiki/pages/techweb.dm +++ b/code/modules/autowiki/pages/techweb.dm @@ -4,7 +4,7 @@ /datum/autowiki/techweb/generate() var/output = "" - for (var/node_id in sort_list(SSresearch.techweb_nodes, /proc/sort_research_nodes)) + for (var/node_id in sort_list(SSresearch.techweb_nodes, GLOBAL_PROC_REF(sort_research_nodes))) var/datum/techweb_node/node = SSresearch.techweb_nodes[node_id] if (!node.show_on_wiki) continue diff --git a/code/modules/autowiki/pages/vending.dm b/code/modules/autowiki/pages/vending.dm index 798bf743410..0a8dd3db0a9 100644 --- a/code/modules/autowiki/pages/vending.dm +++ b/code/modules/autowiki/pages/vending.dm @@ -10,7 +10,7 @@ // So we put it inside, something var/obj/parent = new - for (var/vending_type in sort_list(subtypesof(/obj/machinery/vending), /proc/cmp_typepaths_asc)) + for (var/vending_type in sort_list(subtypesof(/obj/machinery/vending), GLOBAL_PROC_REF(cmp_typepaths_asc))) var/obj/machinery/vending/vending_machine = new vending_type(parent) vending_machine.use_power = FALSE vending_machine.update_icon(UPDATE_ICON_STATE) diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm index 30c63ce0dfa..920287dd51e 100644 --- a/code/modules/awaymissions/away_props.dm +++ b/code/modules/awaymissions/away_props.dm @@ -65,7 +65,7 @@ /obj/structure/pitgrate/Initialize(mapload) . = ..() - RegisterSignal(SSdcs,COMSIG_GLOB_BUTTON_PRESSED, .proc/OnButtonPressed) + RegisterSignal(SSdcs,COMSIG_GLOB_BUTTON_PRESSED, PROC_REF(OnButtonPressed)) if(hidden) update_openspace() @@ -93,7 +93,7 @@ obj_flags |= BLOCK_Z_OUT_DOWN | BLOCK_Z_IN_UP SET_PLANE_IMPLICIT(src, ABOVE_LIGHTING_PLANE) //What matters it's one above openspace, so our animation is not dependant on what's there. Up to revision with 513 animate(src,alpha = talpha,time = 10) - addtimer(CALLBACK(src,.proc/reset_plane),10) + addtimer(CALLBACK(src, PROC_REF(reset_plane)),10) if(hidden) update_openspace() var/turf/T = get_turf(src) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index 5f6a66032f7..9378d3330df 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -94,7 +94,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/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm index 5f7787cfe8c..cbdf042c124 100644 --- a/code/modules/awaymissions/mission_code/murderdome.dm +++ b/code/modules/awaymissions/mission_code/murderdome.dm @@ -29,7 +29,7 @@ /obj/effect/murderdome/dead_barricade/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/respawn), 3 MINUTES) + addtimer(CALLBACK(src, PROC_REF(respawn)), 3 MINUTES) /obj/effect/murderdome/dead_barricade/proc/respawn() if(!QDELETED(src)) diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm index dd1abe34fed..d4888cbaf0b 100644 --- a/code/modules/awaymissions/super_secret_room.dm +++ b/code/modules/awaymissions/super_secret_room.dm @@ -130,7 +130,7 @@ var/newcolor = pick(10;COLOR_GREEN, 5;COLOR_BLUE, 3;COLOR_RED, 1;COLOR_PURPLE) add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -138,7 +138,7 @@ SIGNAL_HANDLER if(!ismob(AM)) return - INVOKE_ASYNC(src, .proc/put_in_crossers_hands, AM) + INVOKE_ASYNC(src, PROC_REF(put_in_crossers_hands), AM) /obj/item/rupee/proc/put_in_crossers_hands(mob/crosser) if(crosser.put_in_hands(src)) diff --git a/code/modules/balloon_alert/balloon_alert.dm b/code/modules/balloon_alert/balloon_alert.dm index 2b1589b50e5..b9481969136 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. @@ -84,8 +84,8 @@ // These two timers are not the same // One manages the relation to the atom that spawned us, the other to the client we're displaying to // We could lose our loc, and still need to talk to our client, so they are done seperately - addtimer(CALLBACK(balloon_alert.loc, .proc/forget_balloon_alert, balloon_alert), BALLOON_TEXT_TOTAL_LIFETIME(duration_mult)) - addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_image_from_client, balloon_alert, viewer_client), BALLOON_TEXT_TOTAL_LIFETIME(duration_mult)) + addtimer(CALLBACK(balloon_alert.loc, PROC_REF(forget_balloon_alert), balloon_alert), BALLOON_TEXT_TOTAL_LIFETIME(duration_mult)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_image_from_client), balloon_alert, viewer_client), BALLOON_TEXT_TOTAL_LIFETIME(duration_mult)) /atom/proc/forget_balloon_alert(image/balloon_alert) LAZYREMOVE(update_on_z, balloon_alert) diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm index f256fae89b6..836748ac743 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -27,7 +27,7 @@ mode = new /datum/buildmode_mode/basic(src) holder = c buttons = list() - li_cb = CALLBACK(src, .proc/post_login) + li_cb = CALLBACK(src, PROC_REF(post_login)) holder.player_details.post_login_callbacks += li_cb holder.show_popup_menus = FALSE create_buttons() diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm index e1640b5f1f8..ef81f1072e2 100644 --- a/code/modules/capture_the_flag/ctf_game.dm +++ b/code/modules/capture_the_flag/ctf_game.dm @@ -40,7 +40,7 @@ if(!reset) reset = new reset_path(get_turf(src)) reset.flag = src - RegisterSignal(src, COMSIG_PARENT_PREQDELETED, .proc/reset_flag) //just in case CTF has some map hazards (read: chasms). + RegisterSignal(src, COMSIG_PARENT_PREQDELETED, PROC_REF(reset_flag)) //just in case CTF has some map hazards (read: chasms). /obj/item/ctf/process() if(is_ctf_target(loc)) //pickup code calls temporary drops to test things out, we need to make sure the flag doesn't reset from @@ -392,7 +392,7 @@ recently_dead_ckeys += body.ckey spawned_mobs -= body - addtimer(CALLBACK(src, .proc/clear_cooldown, body.ckey), respawn_cooldown, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(clear_cooldown), body.ckey), respawn_cooldown, TIMER_UNIQUE) /obj/machinery/capture_the_flag/proc/clear_cooldown(ckey) recently_dead_ckeys -= ckey @@ -428,7 +428,7 @@ M.key = new_team_member.key M.faction += team M.equipOutfit(chosen_class) - RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/ctf_qdelled_player) //just in case CTF has some map hazards (read: chasms). bit shorter than dust + RegisterSignal(M, COMSIG_PARENT_QDELETING, PROC_REF(ctf_qdelled_player)) //just in case CTF has some map hazards (read: chasms). bit shorter than dust for(var/trait in player_traits) ADD_TRAIT(M, trait, CAPTURE_THE_FLAG_TRAIT) spawned_mobs[M] = chosen_class diff --git a/code/modules/cards/cardhand.dm b/code/modules/cards/cardhand.dm index 79ac240e7e4..a45a5ff7e92 100644 --- a/code/modules/cards/cardhand.dm +++ b/code/modules/cards/cardhand.dm @@ -68,7 +68,7 @@ for(var/obj/item/toy/singlecard/card in cards) handradial[card] = image(icon = src.icon, icon_state = card.icon_state) - var/obj/item/toy/singlecard/choice = show_radial_menu(usr, src, handradial, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/obj/item/toy/singlecard/choice = show_radial_menu(usr, src, handradial, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE diff --git a/code/modules/cards/deck/deck.dm b/code/modules/cards/deck/deck.dm index 9d8852034a2..267f84da3aa 100644 --- a/code/modules/cards/deck/deck.dm +++ b/code/modules/cards/deck/deck.dm @@ -33,8 +33,8 @@ /obj/item/toy/cards/deck/Initialize(mapload) . = ..() AddElement(/datum/element/drag_pickup) - 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)) AddComponent(/datum/component/two_handed, attacksound='sound/items/cardflip.ogg') register_context() @@ -116,7 +116,7 @@ cards = shuffle(cards) playsound(src, 'sound/items/cardshuffle.ogg', 50, TRUE) user.balloon_alert_to_viewers("shuffles the deck") - addtimer(CALLBACK(src, .proc/CardgameEvent, user), 60 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(CardgameEvent), user), 60 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) /// This checks if nearby mobs are playing a cardgame and triggers a mood and memory /obj/item/toy/cards/deck/proc/CardgameEvent(mob/living/dealer) diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index b34c66bfadf..e2b54acf7fd 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -349,7 +349,7 @@ if (temp_pod.effectShrapnel == TRUE) //If already doing custom damage, set back to default (no shrapnel) temp_pod.effectShrapnel = FALSE return - var/shrapnelInput = input("Please enter the type of pellet cloud you'd like to create on landing (Can be any projectile!)", "Projectile Typepath", 0) in sort_list(subtypesof(/obj/projectile), /proc/cmp_typepaths_asc) + var/shrapnelInput = input("Please enter the type of pellet cloud you'd like to create on landing (Can be any projectile!)", "Projectile Typepath", 0) in sort_list(subtypesof(/obj/projectile), GLOBAL_PROC_REF(cmp_typepaths_asc)) if (isnull(shrapnelInput)) return var/shrapnelMagnitude = input("Enter the magnitude of the pellet cloud. This is usually a value around 1-5. Please note that Ryll-Ryll has asked me to tell you that if you go too crazy with the projectiles you might crash the server. So uh, be gentle!", "Shrapnel Magnitude", 0) as null|num diff --git a/code/modules/cargo/department_order.dm b/code/modules/cargo/department_order.dm index d4c1314a2c9..42008007bd1 100644 --- a/code/modules/cargo/department_order.dm +++ b/code/modules/cargo/department_order.dm @@ -141,7 +141,7 @@ GLOBAL_LIST_INIT(department_order_cooldowns, list( department_order = new(pack, name, rank, ckey, "", null, chosen_delivery_area, null) SSshuttle.shopping_list += department_order if(!already_signalled) - RegisterSignal(SSshuttle, COMSIG_SUPPLY_SHUTTLE_BUY, .proc/finalize_department_order) + RegisterSignal(SSshuttle, COMSIG_SUPPLY_SHUTTLE_BUY, PROC_REF(finalize_department_order)) say("Order processed. Cargo will deliver the crate when it comes in on their shuttle. NOTICE: Heads of staff may override the order.") calculate_cooldown(pack.cost) diff --git a/code/modules/cargo/gondolapod.dm b/code/modules/cargo/gondolapod.dm index e06c9615875..7945210d604 100644 --- a/code/modules/cargo/gondolapod.dm +++ b/code/modules/cargo/gondolapod.dm @@ -69,7 +69,7 @@ /mob/living/simple_animal/pet/gondola/gondolapod/setOpened() opened = TRUE update_appearance() - addtimer(CALLBACK(src, /atom/.proc/setClosed), 50) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, setClosed)), 50) /mob/living/simple_animal/pet/gondola/gondolapod/setClosed() opened = FALSE diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index a3d355ce1ea..0e6e91b7f81 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -198,7 +198,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)) message_admins("An anomalous pizza box was provided in a pizza crate at during cargo delivery.") else message_admins("An anomalous pizza box was silently created with no command report in a pizza crate delivery.") diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index dd37e84c759..e6197f95b55 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -290,11 +290,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) @@ -322,9 +322,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) @@ -345,7 +345,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() @@ -422,7 +422,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 @@ -469,7 +469,7 @@ vis_contents += glow_effect glow_effect.layer = GASFIRE_LAYER SET_PLANE_EXPLICIT(glow_effect, ABOVE_GAME_PLANE, src) - RegisterSignal(glow_effect, COMSIG_PARENT_QDELETING, .proc/remove_glow) + RegisterSignal(glow_effect, COMSIG_PARENT_QDELETING, PROC_REF(remove_glow)) /obj/structure/closet/supplypod/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) . = ..() @@ -621,8 +621,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) @@ -643,7 +643,7 @@ SET_PLANE_EXPLICIT(pod, ABOVE_GAME_PLANE, src) if (pod.style != STYLE_INVISIBLE) animate(pod, pixel_z = -1 * abs(sin(rotation))*4, pixel_x = SUPPLYPOD_X_OFFSET + (sin(rotation) * 20), time = pod.delays[POD_FALLING], easing = LINEAR_EASING) //Make the pod fall! At an angle! - addtimer(CALLBACK(src, .proc/endLaunch), pod.delays[POD_FALLING], TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation + addtimer(CALLBACK(src, PROC_REF(endLaunch)), pod.delays[POD_FALLING], TIMER_CLIENT_TIME) //Go onto the last step after a very short falling animation /obj/effect/pod_landingzone/proc/setupSmoke(rotation) if (pod.style == STYLE_INVISIBLE || pod.style == STYLE_SEETHROUGH) @@ -661,7 +661,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 d9ec5f6b3ae..660b813f1c8 100644 --- a/code/modules/cargo/supplypod_beacon.dm +++ b/code/modules/cargo/supplypod_beacon.dm @@ -23,7 +23,7 @@ launched = TRUE playsound(src,'sound/machines/triple_beep.ogg',50,FALSE) playsound(src,'sound/machines/warning-buzzer.ogg',50,FALSE) - addtimer(CALLBACK(src, .proc/endLaunch), 33)//wait 3.3 seconds (time it takes for supplypod to land), then update icon + addtimer(CALLBACK(src, PROC_REF(endLaunch)), 33)//wait 3.3 seconds (time it takes for supplypod to land), then update icon if (SP_UNLINK) linked = FALSE playsound(src,'sound/machines/synth_no.ogg',50,FALSE) diff --git a/code/modules/cargo/universal_scanner.dm b/code/modules/cargo/universal_scanner.dm index 742aa2b6e44..9d948ea6c12 100644 --- a/code/modules/cargo/universal_scanner.dm +++ b/code/modules/cargo/universal_scanner.dm @@ -42,7 +42,7 @@ /obj/item/universal_scanner/attack_self(mob/user, modifiers) . = ..() - var/choice = show_radial_menu(user, src, scale_mode, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, scale_mode, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE if(icon_state == "[choice]") diff --git a/code/modules/chatter/chatter.dm b/code/modules/chatter/chatter.dm index c6be322429f..986086c2c67 100644 --- a/code/modules/chatter/chatter.dm +++ b/code/modules/chatter/chatter.dm @@ -44,7 +44,7 @@ delay += 0.1 SECONDS if(delay) - addtimer(CALLBACK(GLOBAL_PROC, /proc/chatter_speak_word, speaker, letter_count, phomeme, length), delay, flags = TIMER_CLIENT_TIME) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(chatter_speak_word), speaker, letter_count, phomeme, length), delay, flags = TIMER_CLIENT_TIME) else chatter_speak_word(speaker, current_context, phomeme, length) break //We use the loop as a handy way of dealing with punctuation, the actual looping operation here happens in timers that call timers diff --git a/code/modules/client/client_colour.dm b/code/modules/client/client_colour.dm index b931d41cc0b..1e4792317ff 100644 --- a/code/modules/client/client_colour.dm +++ b/code/modules/client/client_colour.dm @@ -208,7 +208,7 @@ /datum/client_colour/bloodlust/New(mob/_owner) ..() - addtimer(CALLBACK(src, .proc/update_colour, list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0), 10, SINE_EASING|EASE_OUT), 1) + addtimer(CALLBACK(src, PROC_REF(update_colour), list(1,0,0,0.8,0.2,0, 0.8,0,0.2,0.1,0,0), 10, SINE_EASING|EASE_OUT), 1) /datum/client_colour/rave priority = PRIORITY_LOW diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 2c80e77dba5..302f81a48da 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -130,11 +130,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( //fun fact: Topic() acts like a verb and is executed at the end of the tick like other verbs. So we have to queue it if the server is //overloaded - if(hsrc && hsrc != holder && DEFAULT_TRY_QUEUE_VERB(VERB_CALLBACK(src, .proc/_Topic, hsrc, href, href_list))) + if(hsrc && hsrc != holder && DEFAULT_TRY_QUEUE_VERB(VERB_CALLBACK(src, PROC_REF(_Topic), hsrc, href, href_list))) return ..() //redirect to hsrc.Topic() -///dumb workaround because byond doesnt seem to recognize the .proc/Topic() typepath for /datum/proc/Topic() from the client Topic, +///dumb workaround because byond doesnt seem to recognize the Topic() typepath for /datum/proc/Topic() from the client Topic, ///so we cant queue it without this /client/proc/_Topic(datum/hsrc, href, list/href_list) return hsrc.Topic(href, href_list) @@ -227,7 +227,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( // Instantiate stat panel stat_panel = new(src, "statbrowser") - stat_panel.subscribe(src, .proc/on_stat_panel_message) + stat_panel.subscribe(src, PROC_REF(on_stat_panel_message)) // Instantiate tgui panel tgui_panel = new(src, "browseroutput") @@ -368,7 +368,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( inline_js = file("html/statbrowser.js"), inline_css = file("html/statbrowser.css"), ) - addtimer(CALLBACK(src, .proc/check_panel_loaded), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(check_panel_loaded)), 30 SECONDS) // Initialize tgui panel tgui_panel.initialize() @@ -482,7 +482,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( // If we aren't already generating a ban cache, fire off a build request // This way hopefully any users of request_ban_cache will never need to yield if(!ban_cache_start && SSban_cache?.query_started) - INVOKE_ASYNC(GLOBAL_PROC, /proc/build_ban_cache, src) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(build_ban_cache), src) send_resources() @@ -1036,7 +1036,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( //Precache the client with all other assets slowly, so as to not block other browse() calls if (CONFIG_GET(flag/asset_simple_preload)) - addtimer(CALLBACK(SSassets.transport, /datum/asset_transport.proc/send_assets_slow, src, SSassets.transport.preload), 5 SECONDS) + addtimer(CALLBACK(SSassets.transport, TYPE_PROC_REF(/datum/asset_transport, send_assets_slow), src, SSassets.transport.preload), 5 SECONDS) #if (PRELOAD_RSC == 0) for (var/name in GLOB.vox_sounds) diff --git a/code/modules/client/preferences/README.md b/code/modules/client/preferences/README.md index 4ef49a74602..96fb5e754e6 100644 --- a/code/modules/client/preferences/README.md +++ b/code/modules/client/preferences/README.md @@ -350,7 +350,7 @@ Middleware can hijack actions by specifying `action_delegations`: ```dm /datum/preference_middleware/congratulations action_delegations = list( - "congratulate_me" = .proc/congratulate_me, + "congratulate_me" = PROC_REF(congratulate_me), ) /datum/preference_middleware/congratulations/proc/congratulate_me(list/params, mob/user) diff --git a/code/modules/client/preferences/middleware/antags.dm b/code/modules/client/preferences/middleware/antags.dm index ef5195aa7a1..3e51218edf2 100644 --- a/code/modules/client/preferences/middleware/antags.dm +++ b/code/modules/client/preferences/middleware/antags.dm @@ -1,6 +1,6 @@ /datum/preference_middleware/antags action_delegations = list( - "set_antags" = .proc/set_antags, + "set_antags" = PROC_REF(set_antags), ) /datum/preference_middleware/antags/get_ui_static_data(mob/user) diff --git a/code/modules/client/preferences/middleware/jobs.dm b/code/modules/client/preferences/middleware/jobs.dm index d227c01128b..581a1f35b8b 100644 --- a/code/modules/client/preferences/middleware/jobs.dm +++ b/code/modules/client/preferences/middleware/jobs.dm @@ -1,9 +1,9 @@ /datum/preference_middleware/jobs action_delegations = list( - "set_job_preference" = .proc/set_job_preference, - // SKYRAT EDIT - "set_job_title" = .proc/set_job_title, - // SKYRAT EDIT END + "set_job_preference" = PROC_REF(set_job_preference), + // SKYRAT EDIT + "set_job_title" = PROC_REF(set_job_title), + // SKYRAT EDIT END ) /datum/preference_middleware/jobs/proc/set_job_preference(list/params, mob/user) diff --git a/code/modules/client/preferences/middleware/keybindings.dm b/code/modules/client/preferences/middleware/keybindings.dm index 67102f1e17f..f4a1c06784e 100644 --- a/code/modules/client/preferences/middleware/keybindings.dm +++ b/code/modules/client/preferences/middleware/keybindings.dm @@ -3,9 +3,9 @@ /// Middleware to handle keybindings /datum/preference_middleware/keybindings action_delegations = list( - "reset_all_keybinds" = .proc/reset_all_keybinds, - "reset_keybinds_to_defaults" = .proc/reset_keybinds_to_defaults, - "set_keybindings" = .proc/set_keybindings, + "reset_all_keybinds" = PROC_REF(reset_all_keybinds), + "reset_keybinds_to_defaults" = PROC_REF(reset_keybinds_to_defaults), + "set_keybindings" = PROC_REF(set_keybindings), ) /datum/preference_middleware/keybindings/get_ui_static_data(mob/user) diff --git a/code/modules/client/preferences/middleware/names.dm b/code/modules/client/preferences/middleware/names.dm index 34e97f0f727..0bad6b947b5 100644 --- a/code/modules/client/preferences/middleware/names.dm +++ b/code/modules/client/preferences/middleware/names.dm @@ -2,7 +2,7 @@ /// they have. /datum/preference_middleware/names action_delegations = list( - "randomize_name" = .proc/randomize_name, + "randomize_name" = PROC_REF(randomize_name), ) /datum/preference_middleware/names/get_constant_data() diff --git a/code/modules/client/preferences/middleware/quirks.dm b/code/modules/client/preferences/middleware/quirks.dm index 6cbeab67fc6..343aff49144 100644 --- a/code/modules/client/preferences/middleware/quirks.dm +++ b/code/modules/client/preferences/middleware/quirks.dm @@ -3,8 +3,8 @@ var/tainted = FALSE action_delegations = list( - "give_quirk" = .proc/give_quirk, - "remove_quirk" = .proc/remove_quirk, + "give_quirk" = PROC_REF(give_quirk), + "remove_quirk" = PROC_REF(remove_quirk), ) /datum/preference_middleware/quirks/get_ui_static_data(mob/user) diff --git a/code/modules/client/preferences/middleware/random.dm b/code/modules/client/preferences/middleware/random.dm index c98ed0476a3..587d1184c27 100644 --- a/code/modules/client/preferences/middleware/random.dm +++ b/code/modules/client/preferences/middleware/random.dm @@ -1,8 +1,8 @@ /// Middleware for handling randomization preferences /datum/preference_middleware/random action_delegations = list( - "randomize_character" = .proc/randomize_character, - "set_random_preference" = .proc/set_random_preference, + "randomize_character" = PROC_REF(randomize_character), + "set_random_preference" = PROC_REF(set_random_preference), ) /datum/preference_middleware/random/get_character_preferences(mob/user) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index a7a56536d27..b496e16689e 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -133,7 +133,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car notadded += kb save_preferences() //Save the players pref so that new keys that were set to Unbound as default are permanently stored if(length(notadded)) - addtimer(CALLBACK(src, .proc/announce_conflict, notadded), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(announce_conflict), notadded), 5 SECONDS) /datum/preferences/proc/announce_conflict(list/notadded) to_chat(parent, "Keybinding Conflict\n\ diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 5b205ebf145..49086e701cf 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -84,7 +84,7 @@ for(var/path in subtypesof(/datum/outfit/job)) var/datum/outfit/O = path standard_outfit_options[initial(O.name)] = path - sortTim(standard_outfit_options, /proc/cmp_text_asc) + sortTim(standard_outfit_options, GLOBAL_PROC_REF(cmp_text_asc)) outfit_options = standard_outfit_options /datum/action/chameleon_outfit/Trigger(trigger_flags) @@ -179,7 +179,7 @@ /datum/action/item_action/chameleon/change/proc/select_look(mob/user) var/obj/item/picked_item - var/picked_name = tgui_input_list(user, "Select [chameleon_name] to change into", "Chameleon Settings", sort_list(chameleon_list, /proc/cmp_typepaths_asc)) + var/picked_name = tgui_input_list(user, "Select [chameleon_name] to change into", "Chameleon Settings", sort_list(chameleon_list, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(picked_name)) return if(isnull(chameleon_list[picked_name])) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 5eb464318f1..613ed3a4aa4 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -83,7 +83,7 @@ /obj/item/food/clothing/MakeEdible() . = ..() - AddComponent(/datum/component/edible, after_eat = CALLBACK(src, .proc/after_eat)) + AddComponent(/datum/component/edible, after_eat = CALLBACK(src, PROC_REF(after_eat))) /obj/item/food/clothing/proc/after_eat(mob/eater) var/obj/item/clothing/resolved_clothing = clothing.resolve() @@ -189,7 +189,7 @@ if(iscarbon(loc)) var/mob/living/carbon/C = loc C.visible_message(span_danger("The [zone_name] on [C]'s [src.name] is [break_verb] away!"), span_userdanger("The [zone_name] on your [src.name] is [break_verb] away!"), vision_distance = COMBAT_MESSAGE_RANGE) - RegisterSignal(C, COMSIG_MOVABLE_MOVED, .proc/bristle, override = TRUE) + RegisterSignal(C, COMSIG_MOVABLE_MOVED, PROC_REF(bristle), override = TRUE) zones_disabled++ body_parts_covered &= ~body_zone2cover_flags(def_zone) @@ -235,7 +235,7 @@ return if(slot_flags & slot) //Was equipped to a valid slot for this item? if(iscarbon(user) && LAZYLEN(zones_disabled)) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/bristle, override = TRUE) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(bristle), override = TRUE) for(var/trait in clothing_traits) ADD_CLOTHING_TRAIT(user, trait) if (LAZYLEN(user_vars_to_edit)) @@ -440,7 +440,7 @@ BLIND // can't see anything return ..() if(damage_flag == BOMB) //so the shred survives potential turf change from the explosion. - addtimer(CALLBACK(src, .proc/_spawn_shreds), 1) + addtimer(CALLBACK(src, PROC_REF(_spawn_shreds)), 1) deconstruct(FALSE) if(damage_flag == CONSUME) //This allows for moths to fully consume clothing, rather than damaging it like other sources like brute var/turf/current_position = get_turf(src) diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index b5d1851d19b..83167e87b1e 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -234,7 +234,7 @@ . = ..() AddComponent(/datum/component/knockoff, 25, list(BODY_ZONE_PRECISE_EYES), slot_flags) 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) @@ -618,7 +618,7 @@ if(!(slot & ITEM_SLOT_EYES)) return bigshot = user - RegisterSignal(bigshot, COMSIG_CARBON_SANITY_UPDATE, .proc/moodshift) + RegisterSignal(bigshot, COMSIG_CARBON_SANITY_UPDATE, PROC_REF(moodshift)) /obj/item/clothing/glasses/salesman/dropped(mob/living/carbon/human/user) ..() diff --git a/code/modules/clothing/gloves/_gloves.dm b/code/modules/clothing/gloves/_gloves.dm index 1a7428017d3..378d6abef2e 100644 --- a/code/modules/clothing/gloves/_gloves.dm +++ b/code/modules/clothing/gloves/_gloves.dm @@ -61,7 +61,7 @@ return balloon_alert(user, "cutting off fingertips...") - if(!do_after(user, 3 SECONDS, target=src, extra_checks = CALLBACK(src, .proc/can_cut_with, tool))) + if(!do_after(user, 3 SECONDS, target=src, extra_checks = CALLBACK(src, PROC_REF(can_cut_with), tool))) return balloon_alert(user, "cut fingertips off") qdel(src) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index d2044da76b4..1378a5535e9 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -56,8 +56,8 @@ /obj/item/clothing/gloves/color/yellow/sprayon/equipped(mob/user, slot) . = ..() - RegisterSignal(user, COMSIG_LIVING_SHOCK_PREVENTED, .proc/use_charge) - RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, .proc/use_charge) + RegisterSignal(user, COMSIG_LIVING_SHOCK_PREVENTED, PROC_REF(use_charge)) + RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(use_charge)) /obj/item/clothing/gloves/color/yellow/sprayon/proc/use_charge() SIGNAL_HANDLER diff --git a/code/modules/clothing/gloves/special.dm b/code/modules/clothing/gloves/special.dm index d5a54d88339..ad54adbdffa 100644 --- a/code/modules/clothing/gloves/special.dm +++ b/code/modules/clothing/gloves/special.dm @@ -12,8 +12,8 @@ /obj/item/clothing/gloves/cargo_gauntlet/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_EQUIPPED, .proc/on_glove_equip) - RegisterSignal(src, COMSIG_ITEM_POST_UNEQUIP, .proc/on_glove_unequip) + RegisterSignal(src, COMSIG_ITEM_EQUIPPED, PROC_REF(on_glove_equip)) + RegisterSignal(src, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(on_glove_unequip)) /// Called when the glove is equipped. Adds a component to the equipper and stores a weak reference to it. /obj/item/clothing/gloves/cargo_gauntlet/proc/on_glove_equip(datum/source, mob/equipper, slot) diff --git a/code/modules/clothing/head/frenchberet.dm b/code/modules/clothing/head/frenchberet.dm index 3a51de496cc..40d8abc5b62 100644 --- a/code/modules/clothing/head/frenchberet.dm +++ b/code/modules/clothing/head/frenchberet.dm @@ -10,7 +10,7 @@ /obj/item/clothing/head/frenchberet/equipped(mob/M, slot) . = ..() if (slot & ITEM_SLOT_HEAD) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) ADD_TRAIT(M, TRAIT_GARLIC_BREATH, type) else UnregisterSignal(M, COMSIG_MOB_SAY) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 2d92b08e58e..8ac8658f9be 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -219,7 +219,7 @@ /obj/item/clothing/head/hats/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/mind_monkey_helmet.dm b/code/modules/clothing/head/mind_monkey_helmet.dm index 77c2250b72b..c246d868830 100644 --- a/code/modules/clothing/head/mind_monkey_helmet.dm +++ b/code/modules/clothing/head/mind_monkey_helmet.dm @@ -45,7 +45,7 @@ magnification = user //this polls ghosts visible_message(span_warning("[src] powers up!")) playsound(src, 'sound/machines/ping.ogg', 30, TRUE) - RegisterSignal(magnification, COMSIG_SPECIES_LOSS, .proc/make_fall_off) + RegisterSignal(magnification, COMSIG_SPECIES_LOSS, PROC_REF(make_fall_off)) polling = TRUE var/list/candidates = poll_candidates_for_mob("Do you want to play as a mind magnified monkey?", ROLE_MONKEY_HELMET, null, 5 SECONDS, magnification, POLL_IGNORE_MONKEY_HELMET) polling = FALSE diff --git a/code/modules/clothing/head/tinfoilhat.dm b/code/modules/clothing/head/tinfoilhat.dm index f74b279e178..c8077dcdead 100644 --- a/code/modules/clothing/head/tinfoilhat.dm +++ b/code/modules/clothing/head/tinfoilhat.dm @@ -16,8 +16,8 @@ antimagic_flags = MAGIC_RESISTANCE_MIND, \ inventory_flags = ITEM_SLOT_HEAD, \ charges = 6, \ - drain_antimagic = CALLBACK(src, .proc/drain_antimagic), \ - expiration = CALLBACK(src, .proc/warp_up) \ + drain_antimagic = CALLBACK(src, PROC_REF(drain_antimagic)), \ + expiration = CALLBACK(src, PROC_REF(warp_up)) \ ) else warp_up() @@ -30,7 +30,7 @@ QDEL_NULL(paranoia) paranoia = new() - RegisterSignal(user, COMSIG_HUMAN_SUICIDE_ACT, .proc/call_suicide) + RegisterSignal(user, COMSIG_HUMAN_SUICIDE_ACT, PROC_REF(call_suicide)) user.gain_trauma(paranoia, TRAUMA_RESILIENCE_MAGIC) to_chat(user, span_warning("As you don the foiled hat, an entire world of conspiracy theories and seemingly insane ideas suddenly rush into your mind. What you once thought unbelievable suddenly seems.. undeniable. Everything is connected and nothing happens just by accident. You know too much and now they're out to get you. ")) @@ -87,7 +87,7 @@ /obj/item/clothing/head/costume/foilhat/proc/call_suicide(datum/source) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/suicide_act, source) //SIGNAL_HANDLER doesn't like things waiting; INVOKE_ASYNC bypasses that + INVOKE_ASYNC(src, PROC_REF(suicide_act), source) //SIGNAL_HANDLER doesn't like things waiting; INVOKE_ASYNC bypasses that return OXYLOSS /obj/item/clothing/head/costume/foilhat/suicide_act(mob/living/user) diff --git a/code/modules/clothing/masks/_masks.dm b/code/modules/clothing/masks/_masks.dm index ecb91664299..60cc8a64f3f 100644 --- a/code/modules/clothing/masks/_masks.dm +++ b/code/modules/clothing/masks/_masks.dm @@ -22,7 +22,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) @@ -36,7 +36,7 @@ if(M.get_item_by_slot(ITEM_SLOT_MASK) == src) if(vval) if(!modifies_speech) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) else if(modifies_speech) UnregisterSignal(M, COMSIG_MOB_SAY) return ..() diff --git a/code/modules/clothing/masks/animal_masks.dm b/code/modules/clothing/masks/animal_masks.dm index ba4fed2917f..c2013b99177 100644 --- a/code/modules/clothing/masks/animal_masks.dm +++ b/code/modules/clothing/masks/animal_masks.dm @@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( var/mob/M = loc if(M.get_item_by_slot(ITEM_SLOT_MASK) == src) if(update_speech_mod) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) to_chat(M, span_userdanger("[src] was cursed!")) M.update_worn_mask() diff --git a/code/modules/clothing/shoes/_shoes.dm b/code/modules/clothing/shoes/_shoes.dm index 0c017603fc5..7c26a57015f 100644 --- a/code/modules/clothing/shoes/_shoes.dm +++ b/code/modules/clothing/shoes/_shoes.dm @@ -80,7 +80,7 @@ . = ..() if(can_be_tied && tied == SHOES_UNTIED) our_alert_ref = WEAKREF(user.throw_alert(ALERT_SHOES_KNOT, /atom/movable/screen/alert/shoes/untied)) - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/check_trip, override=TRUE) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(check_trip), override=TRUE) /obj/item/clothing/shoes/proc/restore_offsets(mob/user) equipped_before_drop = FALSE @@ -129,7 +129,7 @@ else if(tied == SHOES_UNTIED && our_guy && user == our_guy) our_alert_ref = WEAKREF(our_guy.throw_alert(ALERT_SHOES_KNOT, /atom/movable/screen/alert/shoes/untied)) // if we're the ones unknotting our own laces, of course we know they're untied - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/check_trip, override=TRUE) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(check_trip), override=TRUE) /** * handle_tying deals with all the actual tying/untying/knotting, inferring your intent from who you are in relation to the state of the laces @@ -166,8 +166,8 @@ var/tie_time = lace_time if(HAS_TRAIT(user, TRAIT_STICKY_FINGERS)) tie_time *= 0.5 - if(do_after(user, tie_time, target = our_guy, extra_checks = CALLBACK(src, .proc/still_shoed, our_guy))) - // SKYRET EDIT END + if(do_after(user, tie_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy))) + // SKYRAT EDIT END to_chat(user, span_notice("You [tied ? "unknot" : "tie"] the laces of your [src.name].")) if(tied == SHOES_UNTIED) adjust_laces(SHOES_TIED, user) @@ -194,7 +194,7 @@ if(HAS_TRAIT(user, TRAIT_STICKY_FINGERS)) // Clowns with thieving gloves will be a menace mod_time *= 0.5 // SKYRAT EDIT END - if(do_after(user, mod_time, target = our_guy, extra_checks = CALLBACK(src, .proc/still_shoed, our_guy))) + if(do_after(user, mod_time, target = our_guy, extra_checks = CALLBACK(src, PROC_REF(still_shoed), our_guy))) to_chat(user, span_notice("You [tied ? "untie" : "knot"] the laces on [loc]'s [src.name].")) if(tied == SHOES_UNTIED) adjust_laces(SHOES_KNOTTED, user) @@ -280,11 +280,11 @@ return to_chat(user, span_notice("You begin [tied ? "untying" : "tying"] the laces on [src]...")) - // SKYRAT EDIT START + // SKYRAT EDIT STARTr var/tie_time = lace_time if(HAS_TRAIT(user, TRAIT_STICKY_FINGERS)) tie_time *= 0.5 - if(do_after(user, tie_time, target = src,extra_checks = CALLBACK(src, .proc/still_shoed, user))) + if(do_after(user, lace_time, target = src,extra_checks = CALLBACK(src, PROC_REF(still_shoed), user))) // SKYRAT EDIT END to_chat(user, span_notice("You [tied ? "untie" : "tie"] the laces on [src].")) adjust_laces(tied ? SHOES_UNTIED : SHOES_TIED, user) diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index 22b9ee78cd9..d215cb42668 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -13,7 +13,7 @@ AddElement(/datum/element/update_icon_updates_onmob, ITEM_SLOT_FEET) AddComponent(/datum/component/material_container, list(/datum/material/bananium), 100 * MINERAL_MATERIAL_AMOUNT, MATCONTAINER_EXAMINE|MATCONTAINER_ANY_INTENT|MATCONTAINER_SILENT, allowed_items=/obj/item/stack) AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75, falloff_exponent = 20) - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/on_step) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) if(always_noslip) clothing_flags |= NOSLIP diff --git a/code/modules/clothing/shoes/cowboy.dm b/code/modules/clothing/shoes/cowboy.dm index 37706d325bf..203135f5671 100644 --- a/code/modules/clothing/shoes/cowboy.dm +++ b/code/modules/clothing/shoes/cowboy.dm @@ -19,7 +19,7 @@ /obj/item/clothing/shoes/cowboy/equipped(mob/living/carbon/user, slot) . = ..() - RegisterSignal(user, COMSIG_LIVING_SLAM_TABLE, .proc/table_slam, override = TRUE) + RegisterSignal(user, COMSIG_LIVING_SLAM_TABLE, PROC_REF(table_slam), override = TRUE) if(slot & ITEM_SLOT_FEET) for(var/mob/living/occupant in contents) var/target_zone = user.get_random_valid_zone(blacklisted_parts = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM), even_weights = TRUE, bypass_warning = TRUE) @@ -40,7 +40,7 @@ /obj/item/clothing/shoes/cowboy/proc/table_slam(mob/living/source, obj/structure/table/the_table) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/handle_table_slam, source) + INVOKE_ASYNC(src, PROC_REF(handle_table_slam), source) /obj/item/clothing/shoes/cowboy/proc/handle_table_slam(mob/living/user) user.say(pick("Hot damn!", "Hoo-wee!", "Got-dang!"), spans = list(SPAN_YELL), forced=TRUE) diff --git a/code/modules/clothing/shoes/galoshes.dm b/code/modules/clothing/shoes/galoshes.dm index 2682af0e7fe..b939bebf43f 100644 --- a/code/modules/clothing/shoes/galoshes.dm +++ b/code/modules/clothing/shoes/galoshes.dm @@ -20,7 +20,7 @@ /obj/item/clothing/shoes/galoshes/dry/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/on_step) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) /obj/item/clothing/shoes/galoshes/dry/proc/on_step() SIGNAL_HANDLER diff --git a/code/modules/clothing/shoes/gunboots.dm b/code/modules/clothing/shoes/gunboots.dm index 5edb0589d7f..890e53a1723 100644 --- a/code/modules/clothing/shoes/gunboots.dm +++ b/code/modules/clothing/shoes/gunboots.dm @@ -13,12 +13,12 @@ create_storage(type = /datum/storage/pockets/shoes) - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/check_step) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(check_step)) /obj/item/clothing/shoes/gunboots/equipped(mob/user, slot) . = ..() if(slot & ITEM_SLOT_FEET) - RegisterSignal(user, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, .proc/check_kick) + RegisterSignal(user, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, PROC_REF(check_kick)) else UnregisterSignal(user, COMSIG_HUMAN_MELEE_UNARMED_ATTACK) @@ -33,7 +33,7 @@ if(!prob(shot_prob)) return - INVOKE_ASYNC(src, .proc/fire_shot) + INVOKE_ASYNC(src, PROC_REF(fire_shot)) /// Stomping on someone while wearing gunboots shoots them point blank /obj/item/clothing/shoes/gunboots/proc/check_kick(mob/living/carbon/human/kicking_person, atom/attacked_atom, proximity) @@ -42,7 +42,7 @@ return var/mob/living/attacked_living = attacked_atom if(attacked_living.body_position == LYING_DOWN) - INVOKE_ASYNC(src, .proc/fire_shot, attacked_living) + INVOKE_ASYNC(src, PROC_REF(fire_shot), attacked_living) /// Actually fire a shot. If no target is provided, just fire off in a random direction /obj/item/clothing/shoes/gunboots/proc/fire_shot(atom/target) diff --git a/code/modules/clothing/shoes/kindlekicks.dm b/code/modules/clothing/shoes/kindlekicks.dm index 0b8a65e0d33..82bcb806515 100644 --- a/code/modules/clothing/shoes/kindlekicks.dm +++ b/code/modules/clothing/shoes/kindlekicks.dm @@ -17,13 +17,13 @@ active = TRUE set_light_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255))) set_light_on(active) - addtimer(CALLBACK(src, .proc/lightUp), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(lightUp)), 0.5 SECONDS) /obj/item/clothing/shoes/kindle_kicks/proc/lightUp(mob/user) if(lightCycle < 15) set_light_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255))) lightCycle++ - addtimer(CALLBACK(src, .proc/lightUp), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(lightUp)), 0.5 SECONDS) else lightCycle = 0 active = FALSE diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index ccd651da412..bd4064b15b7 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -193,7 +193,7 @@ owner.alpha = 0 in_stealth = TRUE owner.visible_message(span_danger("[owner] is hit by [attack_text] in the chest!")) //We pretend to be hit, since blocking it would stop the message otherwise - addtimer(CALLBACK(src, .proc/end_stealth, owner), stealth_time) + addtimer(CALLBACK(src, PROC_REF(end_stealth), owner), stealth_time) reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration return TRUE diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index d515e54c954..304ec876468 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -338,7 +338,7 @@ user.visible_message(span_notice("[user] shows [user.p_their()] attorney's badge."), span_notice("You show your attorney's badge.")) /obj/item/clothing/accessory/lawyers_badge/on_uniform_equip(obj/item/clothing/under/U, mob/living/user) - RegisterSignal(user, COMSIG_LIVING_SLAM_TABLE, .proc/table_slam) + RegisterSignal(user, COMSIG_LIVING_SLAM_TABLE, PROC_REF(table_slam)) user.bubble_icon = "lawyer" /obj/item/clothing/accessory/lawyers_badge/on_uniform_dropped(obj/item/clothing/under/U, mob/living/user) @@ -347,7 +347,7 @@ /obj/item/clothing/accessory/lawyers_badge/proc/table_slam(mob/living/source, obj/structure/table/the_table) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/handle_table_slam, source) + INVOKE_ASYNC(src, PROC_REF(handle_table_slam), source) /obj/item/clothing/accessory/lawyers_badge/proc/handle_table_slam(mob/living/user) user.say("Objection!!", spans = list(SPAN_YELL), forced=TRUE) @@ -452,7 +452,7 @@ /obj/item/clothing/accessory/allergy_dogtag/on_uniform_equip(obj/item/clothing/under/U, user) . = ..() - RegisterSignal(U,COMSIG_PARENT_EXAMINE,.proc/on_examine) + RegisterSignal(U,COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /obj/item/clothing/accessory/allergy_dogtag/on_uniform_dropped(obj/item/clothing/under/U, user) . = ..() diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 87c4ce1dff4..5563cdd8773 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -39,7 +39,7 @@ return scanning = TRUE balloon_alert(user, "printing report...") - addtimer(CALLBACK(src, .proc/PrintReport), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(PrintReport)), 10 SECONDS) /obj/item/detective_scanner/proc/PrintReport() // Create our paper diff --git a/code/modules/economy/holopay.dm b/code/modules/economy/holopay.dm index 4f601c89929..7a0de846fc4 100644 --- a/code/modules/economy/holopay.dm +++ b/code/modules/economy/holopay.dm @@ -203,10 +203,10 @@ return TRUE /obj/structure/holopay/proc/track(atom/movable/thing) - RegisterSignal(thing, COMSIG_MOVABLE_MOVED, .proc/handle_move) + RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) var/list/locations = get_nested_locs(thing, include_turf = FALSE) for(var/atom/movable/location in locations) - RegisterSignal(location, COMSIG_MOVABLE_MOVED, .proc/handle_move) + RegisterSignal(location, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) /obj/structure/holopay/proc/untrack(atom/movable/thing) UnregisterSignal(thing, COMSIG_MOVABLE_MOVED) diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 0623eeb62a5..9549c4b3d44 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -136,7 +136,7 @@ Runs the event triggering = TRUE if(!triggering) - RegisterSignal(SSdcs, COMSIG_GLOB_RANDOM_EVENT, .proc/stop_random_event) + RegisterSignal(SSdcs, COMSIG_GLOB_RANDOM_EVENT, PROC_REF(stop_random_event)) E.cancel_event = TRUE return E diff --git a/code/modules/events/fake_virus.dm b/code/modules/events/fake_virus.dm index b64080c22ac..a0dbfe1aef6 100644 --- a/code/modules/events/fake_virus.dm +++ b/code/modules/events/fake_virus.dm @@ -27,7 +27,7 @@ for(var/i in 1 to rand(1,defacto_min)) var/mob/living/carbon/human/onecoughman = pick(fake_virus_victims) if(prob(25))//1/4 odds to get a spooky message instead of coughing out loud - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, onecoughman, span_warning("[pick("Your head hurts.", "Your head pounds.")]")), rand(30,150)) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), onecoughman, span_warning("[pick("Your head hurts.", "Your head pounds.")]")), rand(30,150)) else addtimer(CALLBACK(onecoughman, .mob/proc/emote, pick("cough", "sniff", "sneeze")), rand(30,150))//deliver the message with a slightly randomized time interval so there arent multiple people coughing at the exact same time fake_virus_victims -= onecoughman diff --git a/code/modules/events/ghost_role/_ghost_role.dm b/code/modules/events/ghost_role/_ghost_role.dm index eb1b3b768f1..6106a0cf81a 100644 --- a/code/modules/events/ghost_role/_ghost_role.dm +++ b/code/modules/events/ghost_role/_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/ghost_role/fugitive_event.dm b/code/modules/events/ghost_role/fugitive_event.dm index 2d6a5657d06..c25bec3849f 100644 --- a/code/modules/events/ghost_role/fugitive_event.dm +++ b/code/modules/events/ghost_role/fugitive_event.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 diff --git a/code/modules/events/ghost_role/pirates.dm b/code/modules/events/ghost_role/pirates.dm index 372452a9dad..15bd07d751e 100644 --- a/code/modules/events/ghost_role/pirates.dm +++ b/code/modules/events/ghost_role/pirates.dm @@ -101,8 +101,8 @@ threat.content = "Greetings, this is the [ship_name]. Due to recent Imperial regulatory violations, your station has been fined [payoff] credits. Failure to comply might result in lethal debt recovery. Novaya Rossiyskaya Imperiya Enforcer out." threat.possible_answers = list("Submit to audit and pay the fine.", "Imperial regulations? What a load of bollocks.") //SKYRAT EDIT ADDITION END - threat.answer_callback = CALLBACK(GLOBAL_PROC, .proc/pirates_answered, threat, payoff, ship_name, initial_send_time, response_max_time, ship_template) - addtimer(CALLBACK(GLOBAL_PROC, .proc/spawn_pirates, threat, ship_template, FALSE), response_max_time) + threat.answer_callback = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(pirates_answered), threat, payoff, ship_name, initial_send_time, response_max_time, ship_template) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(spawn_pirates), threat, ship_template, FALSE), response_max_time) SScommunications.send_message(threat,unique = TRUE) /proc/pirates_answered(datum/comm_message/threat, payoff, ship_name, initial_send_time, response_max_time, ship_template) @@ -488,7 +488,7 @@ status_report = "Sending... " pad.visible_message(span_notice("[pad] starts charging up.")) pad.icon_state = pad.warmup_state - sending_timer = addtimer(CALLBACK(src,.proc/send),warmup_time, TIMER_STOPPABLE) + sending_timer = addtimer(CALLBACK(src, PROC_REF(send)),warmup_time, TIMER_STOPPABLE) /obj/machinery/computer/piratepad_control/proc/stop_sending(custom_report) if(!sending) diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index aa16be5506b..21cdc82316f 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -87,7 +87,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 SSpoints_of_interest.make_point_of_interest(src) - RegisterSignal(src, COMSIG_ATOM_ENTERING, .proc/on_entering_atom) + RegisterSignal(src, COMSIG_ATOM_ENTERING, PROC_REF(on_entering_atom)) if(special_target) SSmove_manager.home_onto(src, special_target) diff --git a/code/modules/events/scrubber_clog.dm b/code/modules/events/scrubber_clog.dm index cb1b62b53bc..12d3cbc838f 100644 --- a/code/modules/events/scrubber_clog.dm +++ b/code/modules/events/scrubber_clog.dm @@ -34,7 +34,7 @@ kill() CRASH("Unable to find suitable scrubber.") - RegisterSignal(scrubber, COMSIG_PARENT_QDELETING, .proc/scrubber_move) + RegisterSignal(scrubber, COMSIG_PARENT_QDELETING, PROC_REF(scrubber_move)) spawned_mob = get_mob() end_when = rand(300, 600) @@ -123,7 +123,7 @@ kill() CRASH("Unable to find suitable scrubber.") - RegisterSignal(scrubber, COMSIG_PARENT_QDELETING, .proc/scrubber_move) + RegisterSignal(scrubber, COMSIG_PARENT_QDELETING, PROC_REF(scrubber_move)) scrubber.clog() scrubber.produce_mob(spawned_mob, living_mobs) diff --git a/code/modules/events/shuttle_insurance.dm b/code/modules/events/shuttle_insurance.dm index 55c137beb9a..fa01f09eadc 100644 --- a/code/modules/events/shuttle_insurance.dm +++ b/code/modules/events/shuttle_insurance.dm @@ -40,7 +40,7 @@ /datum/round_event/shuttle_insurance/start() insurance_message = new("Shuttle Insurance", "Hey, pal, this is the [ship_name]. Can't help but notice you're rocking a wild and crazy shuttle there with NO INSURANCE! Crazy. What if something happened to it, huh?! We've done a quick evaluation on your rates in this sector and we're offering [insurance_evaluation] to cover for your shuttle in case of any disaster.", list("Purchase Insurance.","Reject Offer.")) - insurance_message.answer_callback = CALLBACK(src,.proc/answered) + insurance_message.answer_callback = CALLBACK(src, PROC_REF(answered)) SScommunications.send_message(insurance_message, unique = TRUE) /datum/round_event/shuttle_insurance/proc/answered() diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 1fb6a367a70..a6a728b029c 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -446,7 +446,7 @@ . = ..() add_atom_colour("#ffffff", FIXED_COLOUR_PRIORITY) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/atmos_sensitive, mapload) diff --git a/code/modules/events/wizard/embeddies.dm b/code/modules/events/wizard/embeddies.dm index 67d7122352b..234a9d346f6 100644 --- a/code/modules/events/wizard/embeddies.dm +++ b/code/modules/events/wizard/embeddies.dm @@ -47,7 +47,7 @@ GLOBAL_DATUM(global_funny_embedding, /datum/global_funny_embedding) /datum/global_funny_embedding/New() . = ..() //second operation takes MUCH longer, so lets set up signals first. - RegisterSignal(SSdcs, COMSIG_GLOB_NEW_ITEM, .proc/on_new_item_in_existence) + RegisterSignal(SSdcs, COMSIG_GLOB_NEW_ITEM, PROC_REF(on_new_item_in_existence)) handle_current_items() /datum/global_funny_embedding/Destroy(force) diff --git a/code/modules/events/wizard/fakeexplosion.dm b/code/modules/events/wizard/fakeexplosion.dm index 4368f5dcc93..78612ecf863 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/play_cinematic, /datum/cinematic/nuke/fake, world), 10 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(play_cinematic), /datum/cinematic/nuke/fake, world), 10 SECONDS) diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index eec68e7f2d9..e7a7d12bad6 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -44,7 +44,7 @@ /obj/item/greentext/Initialize(mapload) . = ..() SSpoints_of_interest.make_point_of_interest(src) - roundend_callback = CALLBACK(src, .proc/check_winner) + roundend_callback = CALLBACK(src, PROC_REF(check_winner)) SSticker.OnRoundend(roundend_callback) /obj/item/greentext/equipped(mob/user, slot, initial = FALSE) diff --git a/code/modules/events/wizard/rpgloot.dm b/code/modules/events/wizard/rpgloot.dm index a616c7206d6..6ac65a944f5 100644 --- a/code/modules/events/wizard/rpgloot.dm +++ b/code/modules/events/wizard/rpgloot.dm @@ -60,7 +60,7 @@ GLOBAL_DATUM(rpgloot_controller, /datum/rpgloot_controller) /datum/rpgloot_controller/New() . = ..() //second operation takes MUCH longer, so lets set up signals first. - RegisterSignal(SSdcs, COMSIG_GLOB_NEW_ITEM, .proc/on_new_item_in_existence) + RegisterSignal(SSdcs, COMSIG_GLOB_NEW_ITEM, PROC_REF(on_new_item_in_existence)) handle_current_items() ///signal sent by a new item being created. diff --git a/code/modules/events/wizard/rpgtitles.dm b/code/modules/events/wizard/rpgtitles.dm index 5d40ed541a9..90cc543009d 100644 --- a/code/modules/events/wizard/rpgtitles.dm +++ b/code/modules/events/wizard/rpgtitles.dm @@ -16,8 +16,8 @@ GLOBAL_DATUM(rpgtitle_controller, /datum/rpgtitle_controller) /datum/rpgtitle_controller/New() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/on_crewmember_join) - RegisterSignal(SSdcs, COMSIG_GLOB_MOB_LOGGED_IN, .proc/on_mob_login) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(on_crewmember_join)) + RegisterSignal(SSdcs, COMSIG_GLOB_MOB_LOGGED_IN, PROC_REF(on_mob_login)) handle_current_jobs() /datum/rpgtitle_controller/Destroy(force) diff --git a/code/modules/experisci/destructive_scanner.dm b/code/modules/experisci/destructive_scanner.dm index faad2b27994..596e230a15a 100644 --- a/code/modules/experisci/destructive_scanner.dm +++ b/code/modules/experisci/destructive_scanner.dm @@ -22,7 +22,7 @@ AddComponent(/datum/component/experiment_handler, \ allowed_experiments = list(/datum/experiment/scanning),\ config_mode = EXPERIMENT_CONFIG_CLICK, \ - start_experiment_callback = CALLBACK(src, .proc/activate)) + start_experiment_callback = CALLBACK(src, PROC_REF(activate))) ///Activates the machine; checks if it can actually scan, then starts. /obj/machinery/destructive_scanner/proc/activate() @@ -49,7 +49,7 @@ update_icon() playsound(src, 'sound/machines/destructive_scanner/TubeDown.ogg', 100) use_power(idle_power_usage) - addtimer(CALLBACK(src, .proc/start_scanning, aggressive), 1.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_scanning), aggressive), 1.2 SECONDS) ///Starts scanning the fancy scanning effects /obj/machinery/destructive_scanner/proc/start_scanning(aggressive) @@ -58,7 +58,7 @@ else playsound(src, 'sound/machines/destructive_scanner/ScanSafe.ogg', 100) use_power(active_power_usage) - addtimer(CALLBACK(src, .proc/finish_scanning, aggressive), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(finish_scanning), aggressive), 6 SECONDS) ///Performs the actual scan, happens once the tube effects are done @@ -67,7 +67,7 @@ scanning = FALSE update_icon() playsound(src, 'sound/machines/destructive_scanner/TubeUp.ogg', 100) - addtimer(CALLBACK(src, .proc/open, aggressive), 1.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(open), aggressive), 1.2 SECONDS) ///Opens the machine to let out any contents. If the scan had mobs it'll gib them. /obj/machinery/destructive_scanner/proc/open(aggressive) diff --git a/code/modules/experisci/experiment/handlers/experiment_handler.dm b/code/modules/experisci/experiment/handlers/experiment_handler.dm index bd6c0e47685..888b252f7e6 100644 --- a/code/modules/experisci/experiment/handlers/experiment_handler.dm +++ b/code/modules/experisci/experiment/handlers/experiment_handler.dm @@ -50,23 +50,23 @@ src.start_experiment_callback = start_experiment_callback if(isitem(parent)) - RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, .proc/try_run_handheld_experiment) - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/ignored_handheld_experiment_attempt) + RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(try_run_handheld_experiment)) + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(ignored_handheld_experiment_attempt)) if(istype(parent, /obj/machinery/destructive_scanner)) - RegisterSignal(parent, COMSIG_MACHINERY_DESTRUCTIVE_SCAN, .proc/try_run_destructive_experiment) + RegisterSignal(parent, COMSIG_MACHINERY_DESTRUCTIVE_SCAN, PROC_REF(try_run_destructive_experiment)) if(istype(parent, /obj/machinery/computer/operating)) - RegisterSignal(parent, COMSIG_OPERATING_COMPUTER_DISSECTION_COMPLETE, .proc/try_run_dissection_experiment) + RegisterSignal(parent, COMSIG_OPERATING_COMPUTER_DISSECTION_COMPLETE, PROC_REF(try_run_dissection_experiment)) // Determine UI display mode switch(config_mode) if(EXPERIMENT_CONFIG_ATTACKSELF) - RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, .proc/configure_experiment) + RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(configure_experiment)) if(EXPERIMENT_CONFIG_ALTCLICK) - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/configure_experiment) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(configure_experiment)) if(EXPERIMENT_CONFIG_CLICK) - RegisterSignal(parent, COMSIG_ATOM_UI_INTERACT, .proc/configure_experiment_click) + RegisterSignal(parent, COMSIG_ATOM_UI_INTERACT, PROC_REF(configure_experiment_click)) if(EXPERIMENT_CONFIG_UI) - RegisterSignal(parent, COMSIG_UI_ACT, .proc/ui_handle_experiment) + RegisterSignal(parent, COMSIG_UI_ACT, PROC_REF(ui_handle_experiment)) // Auto connect to the first visible techweb (useful for always active handlers) // Note this won't work at the moment for non-machines that have been included @@ -90,7 +90,7 @@ SIGNAL_HANDLER if (!should_run_handheld_experiment(source, target, user, params)) return - INVOKE_ASYNC(src, .proc/try_run_handheld_experiment_async, source, target, user, params) + INVOKE_ASYNC(src, PROC_REF(try_run_handheld_experiment_async), source, target, user, params) return COMPONENT_CANCEL_ATTACK_CHAIN /** @@ -225,7 +225,7 @@ SIGNAL_HANDLER switch(action) if("open_experiments") - INVOKE_ASYNC(src, .proc/configure_experiment, null, usr) + INVOKE_ASYNC(src, PROC_REF(configure_experiment), null, usr) /** * Attempts to show the user the experiment configuration panel @@ -235,7 +235,7 @@ */ /datum/component/experiment_handler/proc/configure_experiment(datum/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) /** * Attempts to show the user the experiment configuration panel diff --git a/code/modules/experisci/experiment/physical_experiments.dm b/code/modules/experisci/experiment/physical_experiments.dm index b8d55d5e388..6b88e19e4a3 100644 --- a/code/modules/experisci/experiment/physical_experiments.dm +++ b/code/modules/experisci/experiment/physical_experiments.dm @@ -11,7 +11,7 @@ linked_experiment_handler.announce_message("Object is not made out of the correct materials.") return FALSE - RegisterSignal(currently_scanned_atom, COMSIG_ATOM_BULLET_ACT, .proc/check_experiment) + RegisterSignal(currently_scanned_atom, COMSIG_ATOM_BULLET_ACT, PROC_REF(check_experiment)) linked_experiment_handler.announce_message("Experiment ready to start.") return TRUE @@ -43,7 +43,7 @@ linked_experiment_handler.announce_message("Incorrect object for experiment.") return FALSE - RegisterSignal(currently_scanned_atom, COMSIG_ARCADE_PRIZEVEND, .proc/win_arcade) + RegisterSignal(currently_scanned_atom, COMSIG_ARCADE_PRIZEVEND, PROC_REF(win_arcade)) linked_experiment_handler.announce_message("Experiment ready to start.") return TRUE diff --git a/code/modules/experisci/handheld_scanner.dm b/code/modules/experisci/handheld_scanner.dm index 5e5059ff570..a1bd3a25765 100644 --- a/code/modules/experisci/handheld_scanner.dm +++ b/code/modules/experisci/handheld_scanner.dm @@ -36,7 +36,7 @@ playsound(src, 'sound/machines/destructive_scanner/ScanDangerous.ogg', 40) user.emote("scream") - addtimer(CALLBACK(src, .proc/make_meat_toilet, user), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(make_meat_toilet), user), 5 SECONDS) return MANUAL_SUICIDE /obj/item/experi_scanner/proc/make_meat_toilet(mob/living/carbon/user) diff --git a/code/modules/explorer_drone/adventure.dm b/code/modules/explorer_drone/adventure.dm index dd2751aa87b..caf3b4c88ea 100644 --- a/code/modules/explorer_drone/adventure.dm +++ b/code/modules/explorer_drone/adventure.dm @@ -321,7 +321,7 @@ GLOBAL_LIST_EMPTY(explorer_drone_adventure_db_entries) CRASH("Invalid delay in adventure [name]") SEND_SIGNAL(src,COMSIG_ADVENTURE_DELAY_START,delay_time,delay_message) delayed_action = list(delay_time,delay_message) - addtimer(CALLBACK(src,.proc/finish_delay,exit_id),delay_time) + addtimer(CALLBACK(src, PROC_REF(finish_delay),exit_id),delay_time) return navigate_to_node(exit_id) diff --git a/code/modules/explorer_drone/control_console.dm b/code/modules/explorer_drone/control_console.dm index 8e50c3420e6..1935bfb9c14 100644 --- a/code/modules/explorer_drone/control_console.dm +++ b/code/modules/explorer_drone/control_console.dm @@ -19,8 +19,8 @@ end_drone_control() controlled_drone = drone controlled_drone.controlled = TRUE - RegisterSignal(controlled_drone,COMSIG_PARENT_QDELETING,.proc/drone_destroyed) - RegisterSignal(controlled_drone,COMSIG_EXODRONE_STATUS_CHANGED,.proc/on_exodrone_status_changed) + RegisterSignal(controlled_drone,COMSIG_PARENT_QDELETING, PROC_REF(drone_destroyed)) + RegisterSignal(controlled_drone,COMSIG_EXODRONE_STATUS_CHANGED, PROC_REF(on_exodrone_status_changed)) update_icon() /obj/machinery/computer/exodrone_control_console/proc/on_exodrone_status_changed() diff --git a/code/modules/explorer_drone/exodrone.dm b/code/modules/explorer_drone/exodrone.dm index 00628f7dfe7..77ae8b53479 100644 --- a/code/modules/explorer_drone/exodrone.dm +++ b/code/modules/explorer_drone/exodrone.dm @@ -105,7 +105,7 @@ GLOBAL_LIST_EMPTY(exodrone_launchers) distance_to_travel = max(abs(target_site.distance - location.distance),1) travel_target = target_site travel_time = travel_cost_coeff*distance_to_travel - travel_timer_id = addtimer(CALLBACK(src,.proc/finish_travel),travel_time,TIMER_STOPPABLE) + travel_timer_id = addtimer(CALLBACK(src, PROC_REF(finish_travel)),travel_time,TIMER_STOPPABLE) /// Travel cleanup /obj/item/exodrone/proc/finish_travel() @@ -230,10 +230,10 @@ GLOBAL_LIST_EMPTY(exodrone_launchers) /obj/item/exodrone/proc/start_adventure(datum/adventure/adventure) current_adventure = adventure - RegisterSignal(current_adventure,COMSIG_ADVENTURE_FINISHED,.proc/resolve_adventure) - RegisterSignal(current_adventure,COMSIG_ADVENTURE_QUALITY_INIT,.proc/add_tool_qualities) - RegisterSignal(current_adventure,COMSIG_ADVENTURE_DELAY_START,.proc/adventure_delay_start) - RegisterSignal(current_adventure,COMSIG_ADVENTURE_DELAY_END,.proc/adventure_delay_end) + RegisterSignal(current_adventure,COMSIG_ADVENTURE_FINISHED, PROC_REF(resolve_adventure)) + RegisterSignal(current_adventure,COMSIG_ADVENTURE_QUALITY_INIT, PROC_REF(add_tool_qualities)) + RegisterSignal(current_adventure,COMSIG_ADVENTURE_DELAY_START, PROC_REF(adventure_delay_start)) + RegisterSignal(current_adventure,COMSIG_ADVENTURE_DELAY_END, PROC_REF(adventure_delay_end)) set_status(EXODRONE_ADVENTURE) current_adventure.start_adventure() diff --git a/code/modules/explorer_drone/exploration_events/resource.dm b/code/modules/explorer_drone/exploration_events/resource.dm index 8617fbd1238..d95981c6667 100644 --- a/code/modules/explorer_drone/exploration_events/resource.dm +++ b/code/modules/explorer_drone/exploration_events/resource.dm @@ -39,7 +39,7 @@ amount-- if(delay > 0) drone.set_busy(delay_message,delay) - addtimer(CALLBACK(src,.proc/delay_finished,WEAKREF(drone)),delay) + addtimer(CALLBACK(src, PROC_REF(delay_finished),WEAKREF(drone)),delay) else finish_event(drone) diff --git a/code/modules/explorer_drone/loot.dm b/code/modules/explorer_drone/loot.dm index 894c6f7edb5..96cb91f80ae 100644 --- a/code/modules/explorer_drone/loot.dm +++ b/code/modules/explorer_drone/loot.dm @@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(adventure_loot_generator_index,generate_generator_index()) to_chat(user,span_notice("You begin to charge [src]")) inhand_icon_state = "firelance_charging" user.update_held_items() - if(do_after(user,windup_time,interaction_key="firelance",extra_checks = CALLBACK(src, .proc/windup_checks))) + if(do_after(user,windup_time,interaction_key="firelance",extra_checks = CALLBACK(src, PROC_REF(windup_checks)))) var/turf/start_turf = get_turf(user) var/turf/last_turf = get_ranged_target_turf(start_turf,user.dir,melt_range) start_turf.Beam(last_turf,icon_state="solar_beam",time=1 SECONDS) diff --git a/code/modules/explorer_drone/manager.dm b/code/modules/explorer_drone/manager.dm index 7632b15bc76..74a972216a4 100644 --- a/code/modules/explorer_drone/manager.dm +++ b/code/modules/explorer_drone/manager.dm @@ -55,7 +55,7 @@ if(!temp_adventure) feedback_message = "Instantiating adventure failed. Check runtime logs for details." return TRUE - RegisterSignal(temp_adventure,COMSIG_ADVENTURE_FINISHED,.proc/resolve_adventure) + RegisterSignal(temp_adventure,COMSIG_ADVENTURE_FINISHED, PROC_REF(resolve_adventure)) temp_adventure.start_adventure() feedback_message = "Adventure started" return TRUE diff --git a/code/modules/explorer_drone/scanner_array.dm b/code/modules/explorer_drone/scanner_array.dm index 968beb9d3cf..3cac95cd906 100644 --- a/code/modules/explorer_drone/scanner_array.dm +++ b/code/modules/explorer_drone/scanner_array.dm @@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) if(EXOSCAN_DEEP) scan_power = GLOB.exoscanner_controller.get_scan_power(target) scan_time = (BASE_DEEP_SCAN_TIME*target.distance)/scan_power - scan_timer = addtimer(CALLBACK(src,.proc/resolve_scan),scan_time,TIMER_STOPPABLE) + scan_timer = addtimer(CALLBACK(src, PROC_REF(resolve_scan)),scan_time,TIMER_STOPPABLE) /// Short description for in progress scan /datum/exoscan/proc/ui_description() @@ -172,7 +172,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) /obj/machinery/computer/exoscanner_control/proc/create_scan(scan_type,target) var/datum/exoscan/scan = GLOB.exoscanner_controller.create_scan(scan_type,target) if(scan) - RegisterSignal(scan, COMSIG_EXOSCAN_INTERRUPTED, .proc/scan_failed) + RegisterSignal(scan, COMSIG_EXOSCAN_INTERRUPTED, PROC_REF(scan_failed)) /obj/machinery/computer/exoscanner_control/proc/scan_failed() SIGNAL_HANDLER @@ -198,7 +198,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) /obj/machinery/exoscanner/Initialize(mapload) . = ..() - RegisterSignal(GLOB.exoscanner_controller,list(COMSIG_EXOSCAN_STARTED,COMSIG_EXOSCAN_FINISHED),.proc/scan_change) + RegisterSignal(GLOB.exoscanner_controller,list(COMSIG_EXOSCAN_STARTED,COMSIG_EXOSCAN_FINISHED), PROC_REF(scan_change)) update_readiness() /obj/machinery/exoscanner/proc/scan_change() @@ -263,7 +263,7 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) if(length(GLOB.exoscanner_controller.tracked_dishes) <= 0 || (target && GLOB.exoscanner_controller.get_scan_power(target) <= 0)) return current_scan = new(scan_type,target) - RegisterSignal(current_scan,COMSIG_PARENT_QDELETING,.proc/cleanup_current_scan) + RegisterSignal(current_scan,COMSIG_PARENT_QDELETING, PROC_REF(cleanup_current_scan)) SEND_SIGNAL(src,COMSIG_EXOSCAN_STARTED,current_scan) return current_scan diff --git a/code/modules/fishing/aquarium/aquarium.dm b/code/modules/fishing/aquarium/aquarium.dm index 2773a75cb3d..b4dc4de3124 100644 --- a/code/modules/fishing/aquarium/aquarium.dm +++ b/code/modules/fishing/aquarium/aquarium.dm @@ -43,7 +43,7 @@ /obj/structure/aquarium/Initialize(mapload) . = ..() update_appearance() - RegisterSignal(src,COMSIG_PARENT_ATTACKBY, .proc/feed_feedback) + RegisterSignal(src,COMSIG_PARENT_ATTACKBY, PROC_REF(feed_feedback)) /obj/structure/aquarium/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs) . = ..() diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index d90e6ec3879..160fb436d1c 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -103,8 +103,8 @@ . = ..() if(fillet_type) AddElement(/datum/element/processable, TOOL_KNIFE, fillet_type, 1, 5) - AddComponent(/datum/component/aquarium_content, .proc/get_aquarium_animation, list(COMSIG_FISH_STATUS_CHANGED,COMSIG_FISH_STIRRED)) - RegisterSignal(src, COMSIG_ATOM_TEMPORARY_ANIMATION_START, .proc/on_temp_animation) + AddComponent(/datum/component/aquarium_content, PROC_REF(get_aquarium_animation), list(COMSIG_FISH_STATUS_CHANGED,COMSIG_FISH_STIRRED)) + RegisterSignal(src, COMSIG_ATOM_TEMPORARY_ANIMATION_START, PROC_REF(on_temp_animation)) check_environment_after_movement() if(status != FISH_DEAD) @@ -146,8 +146,8 @@ /obj/item/fish/proc/on_aquarium_insertion(obj/structure/aquarium) if(isnull(last_feeding)) //Fish start fed. last_feeding = world.time - RegisterSignal(aquarium, COMSIG_ATOM_EXITED, .proc/aquarium_exited) - RegisterSignal(aquarium, COMSIG_PARENT_ATTACKBY, .proc/attack_reaction) + RegisterSignal(aquarium, COMSIG_ATOM_EXITED, PROC_REF(aquarium_exited)) + RegisterSignal(aquarium, COMSIG_PARENT_ATTACKBY, PROC_REF(attack_reaction)) /obj/item/fish/proc/aquarium_exited(datum/source, atom/movable/gone, direction) SIGNAL_HANDLER @@ -344,7 +344,7 @@ /// Refreshes flopping animation after temporary animation finishes /obj/item/fish/proc/on_temp_animation(datum/source, animation_duration) if(animation_duration > 0) - addtimer(CALLBACK(src, .proc/refresh_flopping), animation_duration) + addtimer(CALLBACK(src, PROC_REF(refresh_flopping)), animation_duration) /obj/item/fish/proc/refresh_flopping() if(flopping) diff --git a/code/modules/fishing/fishing_minigame.dm b/code/modules/fishing/fishing_minigame.dm index b8901bbd882..1811c4d2f17 100644 --- a/code/modules/fishing/fishing_minigame.dm +++ b/code/modules/fishing/fishing_minigame.dm @@ -75,10 +75,10 @@ /// Create fishing line visuals fishing_line = used_rod.create_fishing_line(lure, target_py = 5) // If fishing line breaks los / rod gets dropped / deleted - RegisterSignal(fishing_line, COMSIG_FISHING_LINE_SNAPPED, .proc/interrupt) + RegisterSignal(fishing_line, COMSIG_FISHING_LINE_SNAPPED, PROC_REF(interrupt)) ADD_TRAIT(user, TRAIT_GONE_FISHING, REF(src)) user.add_mood_event("fishing", /datum/mood_event/fishing) - RegisterSignal(user, COMSIG_MOB_CLICKON, .proc/handle_click) + RegisterSignal(user, COMSIG_MOB_CLICKON, PROC_REF(handle_click)) start_baiting_phase() to_chat(user, span_notice("You start fishing...")) playsound(lure, 'sound/effects/splash.ogg', 100) @@ -128,7 +128,7 @@ animate(pixel_y = -1, time = 1 SECONDS, flags = ANIMATION_RELATIVE) //Setup next phase var/wait_time = rand(1 SECONDS, 30 SECONDS) - next_phase_timer = addtimer(CALLBACK(src, .proc/start_biting_phase), wait_time, TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_biting_phase)), wait_time, TIMER_STOPPABLE) /datum/fishing_challenge/proc/start_biting_phase() phase = BITING_PHASE @@ -139,7 +139,7 @@ animate(pixel_y = -3, time = 5, flags = ANIMATION_RELATIVE) // Setup next phase var/wait_time = rand(3 SECONDS, 6 SECONDS) - next_phase_timer = addtimer(CALLBACK(src, .proc/start_baiting_phase), wait_time, TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_baiting_phase)), wait_time, TIMER_STOPPABLE) /datum/fishing_challenge/proc/start_minigame_phase() phase = MINIGAME_PHASE diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index d9900243ef7..76c25eda11f 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -107,10 +107,10 @@ var/beam_color = line?.line_color || default_line_color var/datum/beam/fishing_line/fishing_line_beam = new(user, target, icon_state = "fishing_line", beam_color = beam_color, override_target_pixel_y = target_py) fishing_line_beam.lefthand = user.get_held_index_of_item(src) % 2 == 1 - RegisterSignal(fishing_line_beam, COMSIG_BEAM_BEFORE_DRAW, .proc/check_los) - RegisterSignal(fishing_line_beam, COMSIG_PARENT_QDELETING, .proc/clear_line) + RegisterSignal(fishing_line_beam, COMSIG_BEAM_BEFORE_DRAW, PROC_REF(check_los)) + RegisterSignal(fishing_line_beam, COMSIG_PARENT_QDELETING, PROC_REF(clear_line)) fishing_lines += fishing_line_beam - INVOKE_ASYNC(fishing_line_beam, /datum/beam/.proc/Start) + INVOKE_ASYNC(fishing_line_beam, TYPE_PROC_REF(/datum/beam/, Start)) user.update_held_items() return fishing_line_beam @@ -137,7 +137,7 @@ return currently_hooked_item = target_atom hooked_item_fishing_line = create_fishing_line(target_atom) - RegisterSignal(hooked_item_fishing_line, COMSIG_FISHING_LINE_SNAPPED, .proc/clear_hooked_item) + RegisterSignal(hooked_item_fishing_line, COMSIG_FISHING_LINE_SNAPPED, PROC_REF(clear_hooked_item)) /// Checks what can be hooked /obj/item/fishing_rod/proc/can_be_hooked(atom/movable/target) @@ -444,7 +444,7 @@ /datum/beam/fishing_line/Start() update_offsets(origin.dir) . = ..() - RegisterSignal(origin, COMSIG_ATOM_DIR_CHANGE, .proc/handle_dir_change) + RegisterSignal(origin, COMSIG_ATOM_DIR_CHANGE, PROC_REF(handle_dir_change)) /datum/beam/fishing_line/Destroy() UnregisterSignal(origin, COMSIG_ATOM_DIR_CHANGE) @@ -453,7 +453,7 @@ /datum/beam/fishing_line/proc/handle_dir_change(atom/movable/source, olddir, newdir) SIGNAL_HANDLER update_offsets(newdir) - INVOKE_ASYNC(src, /datum/beam/.proc/redrawing) + INVOKE_ASYNC(src, TYPE_PROC_REF(/datum/beam/, redrawing)) /datum/beam/fishing_line/proc/update_offsets(user_dir) switch(user_dir) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index dc9ffc631c8..4ef3e49a0fd 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -64,6 +64,6 @@ dream_fragments.Cut(1,2) to_chat(src, span_notice("... [next_message] ...")) if(LAZYLEN(dream_fragments)) - addtimer(CALLBACK(src, .proc/dream_sequence, dream_fragments), rand(10,30)) + addtimer(CALLBACK(src, PROC_REF(dream_sequence), dream_fragments), rand(10,30)) else dreaming = FALSE diff --git a/code/modules/food_and_drinks/machinery/coffeemaker.dm b/code/modules/food_and_drinks/machinery/coffeemaker.dm index 53605efe03a..9943eb85091 100644 --- a/code/modules/food_and_drinks/machinery/coffeemaker.dm +++ b/code/modules/food_and_drinks/machinery/coffeemaker.dm @@ -322,7 +322,7 @@ playsound(src, 'sound/machines/coffeemaker_brew.ogg', 20, vary = TRUE) toggle_steam() use_power(active_power_usage * time * 0.1) // .1 needed here to convert time (in deciseconds) to seconds such that watts * seconds = joules - addtimer(CALLBACK(src, .proc/stop_operating), time / speed) + addtimer(CALLBACK(src, PROC_REF(stop_operating)), time / speed) /obj/machinery/coffeemaker/proc/stop_operating() brewing = FALSE diff --git a/code/modules/food_and_drinks/machinery/deep_fryer.dm b/code/modules/food_and_drinks/machinery/deep_fryer.dm index ea4434d16d5..9c826e1f397 100644 --- a/code/modules/food_and_drinks/machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/machinery/deep_fryer.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( visible_message(span_userdanger("[src] starts glowing... Oh no...")) playsound(src, 'sound/effects/pray_chaplain.ogg', 100) add_filter("entropic_ray", 10, list("type" = "rays", "size" = 35, "color" = COLOR_VIVID_YELLOW)) - addtimer(CALLBACK(src, .proc/blow_up), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(blow_up)), 5 SECONDS) frying = new /obj/item/food/deepfryholder(src, frying_item) ADD_TRAIT(frying, TRAIT_FOOD_CHEF_MADE, REF(user)) icon_state = "fryer_on" diff --git a/code/modules/food_and_drinks/machinery/food_cart.dm b/code/modules/food_and_drinks/machinery/food_cart.dm index 624235af823..d51042f8549 100644 --- a/code/modules/food_and_drinks/machinery/food_cart.dm +++ b/code/modules/food_and_drinks/machinery/food_cart.dm @@ -23,10 +23,10 @@ cart_table = new(src) cart_tent = new(src) packed_things = list(cart_table, cart_smartfridge, cart_tent, cart_griddle) //middle, left, left, right - RegisterSignal(cart_griddle, COMSIG_PARENT_QDELETING, .proc/lost_part) - RegisterSignal(cart_smartfridge, COMSIG_PARENT_QDELETING, .proc/lost_part) - RegisterSignal(cart_table, COMSIG_PARENT_QDELETING, .proc/lost_part) - RegisterSignal(cart_tent, COMSIG_PARENT_QDELETING, .proc/lost_part) + RegisterSignal(cart_griddle, COMSIG_PARENT_QDELETING, PROC_REF(lost_part)) + RegisterSignal(cart_smartfridge, COMSIG_PARENT_QDELETING, PROC_REF(lost_part)) + RegisterSignal(cart_table, COMSIG_PARENT_QDELETING, PROC_REF(lost_part)) + RegisterSignal(cart_tent, COMSIG_PARENT_QDELETING, PROC_REF(lost_part)) /obj/machinery/food_cart/Destroy() if(cart_griddle) @@ -75,7 +75,7 @@ var/turf/T = get_step(grabbed_turf, turn(SOUTH, angle)) var/obj/thing = packed_things[iteration] thing.forceMove(T) - RegisterSignal(thing, COMSIG_MOVABLE_MOVED, .proc/lost_part) + RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(lost_part)) iteration++ unpacked = TRUE diff --git a/code/modules/food_and_drinks/machinery/gibber.dm b/code/modules/food_and_drinks/machinery/gibber.dm index d6965b5f6c9..66acec1ca26 100644 --- a/code/modules/food_and_drinks/machinery/gibber.dm +++ b/code/modules/food_and_drinks/machinery/gibber.dm @@ -203,7 +203,7 @@ mob_occupant.ghostize() set_occupant(null) qdel(mob_occupant) - addtimer(CALLBACK(src, .proc/make_meat, skin, allmeat, meat_produced, gibtype, diseases), gibtime) + addtimer(CALLBACK(src, PROC_REF(make_meat), skin, allmeat, meat_produced, gibtype, diseases), gibtime) /obj/machinery/gibber/proc/make_meat(obj/item/stack/sheet/animalhide/skin, list/obj/item/food/meat/slab/allmeat, meat_produced, gibtype, list/datum/disease/diseases) playsound(src.loc, 'sound/effects/splat.ogg', 50, TRUE) diff --git a/code/modules/food_and_drinks/machinery/griddle.dm b/code/modules/food_and_drinks/machinery/griddle.dm index f07fbb00a8a..e7db23898be 100644 --- a/code/modules/food_and_drinks/machinery/griddle.dm +++ b/code/modules/food_and_drinks/machinery/griddle.dm @@ -27,8 +27,8 @@ grill_loop = new(src, FALSE) if(isnum(variant)) variant = rand(1,3) - RegisterSignal(src, COMSIG_ATOM_EXPOSE_REAGENT, .proc/on_expose_reagent) - RegisterSignal(src, COMSIG_STORAGE_DUMP_CONTENT, .proc/on_storage_dump) + RegisterSignal(src, COMSIG_ATOM_EXPOSE_REAGENT, PROC_REF(on_expose_reagent)) + RegisterSignal(src, COMSIG_STORAGE_DUMP_CONTENT, PROC_REF(on_storage_dump)) /obj/machinery/griddle/Destroy() QDEL_NULL(grill_loop) @@ -98,9 +98,9 @@ item_to_grill.vis_flags |= VIS_INHERIT_PLANE SEND_SIGNAL(item_to_grill, COMSIG_ITEM_GRILL_PLACED_ON, user) - RegisterSignal(item_to_grill, COMSIG_MOVABLE_MOVED, .proc/ItemMoved) - RegisterSignal(item_to_grill, COMSIG_ITEM_GRILLED, .proc/GrillCompleted) - RegisterSignal(item_to_grill, COMSIG_PARENT_QDELETING, .proc/ItemRemovedFromGrill) + RegisterSignal(item_to_grill, COMSIG_MOVABLE_MOVED, PROC_REF(ItemMoved)) + RegisterSignal(item_to_grill, COMSIG_ITEM_GRILLED, PROC_REF(GrillCompleted)) + RegisterSignal(item_to_grill, COMSIG_PARENT_QDELETING, PROC_REF(ItemRemovedFromGrill)) update_grill_audio() update_appearance() diff --git a/code/modules/food_and_drinks/machinery/grill.dm b/code/modules/food_and_drinks/machinery/grill.dm index 11a94fb7534..6d74e6b7751 100644 --- a/code/modules/food_and_drinks/machinery/grill.dm +++ b/code/modules/food_and_drinks/machinery/grill.dm @@ -68,7 +68,7 @@ return else if(!grilled_item && user.transferItemToLoc(I, src)) grilled_item = I - RegisterSignal(grilled_item, COMSIG_ITEM_GRILLED, .proc/GrillCompleted) + RegisterSignal(grilled_item, COMSIG_ITEM_GRILLED, PROC_REF(GrillCompleted)) to_chat(user, span_notice("You put the [grilled_item] on [src].")) update_appearance() grill_loop.start() diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm index 6cca3dde57f..08c7f5db0bb 100644 --- a/code/modules/food_and_drinks/machinery/microwave.dm +++ b/code/modules/food_and_drinks/machinery/microwave.dm @@ -445,7 +445,7 @@ return time-- use_power(active_power_usage) - addtimer(CALLBACK(src, .proc/loop, type, time, wait, cooker), wait) + addtimer(CALLBACK(src, PROC_REF(loop), type, time, wait, cooker), wait) /obj/machinery/microwave/power_change() . = ..() @@ -505,7 +505,7 @@ /obj/machinery/microwave/proc/open() open = TRUE update_appearance() - addtimer(CALLBACK(src, .proc/close), 0.8 SECONDS) + addtimer(CALLBACK(src, PROC_REF(close)), 0.8 SECONDS) /obj/machinery/microwave/proc/close() open = FALSE @@ -529,7 +529,7 @@ //We want there to be some chance of them getting a working microwave (eventually). if(prob(95)) //The microwave should turn off asynchronously from any other microwaves that initialize at the same time. Keep in mind this will not turn off, since there is nothing to call the proc that ends this microwave's looping - addtimer(CALLBACK(src, .proc/wzhzhzh), rand(0.5 SECONDS, 3 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(wzhzhzh)), rand(0.5 SECONDS, 3 SECONDS)) #undef MICROWAVE_NORMAL #undef MICROWAVE_MUCK diff --git a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm index 79400c29121..be112bf5b95 100644 --- a/code/modules/food_and_drinks/machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/machinery/monkeyrecycler.dm @@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) use_power(active_power_usage) stored_matter += cube_production addtimer(VARSET_CALLBACK(src, pixel_x, base_pixel_x)) - addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, user, span_notice("The machine now has [stored_matter] monkey\s worth of material stored."))) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), user, span_notice("The machine now has [stored_matter] monkey\s worth of material stored."))) /obj/machinery/monkey_recycler/interact(mob/user) if(stored_matter >= 1) diff --git a/code/modules/food_and_drinks/machinery/oven.dm b/code/modules/food_and_drinks/machinery/oven.dm index 3d0d22e11fb..a93e69bd8de 100644 --- a/code/modules/food_and_drinks/machinery/oven.dm +++ b/code/modules/food_and_drinks/machinery/oven.dm @@ -105,7 +105,7 @@ oven_tray.pixel_y = OVEN_TRAY_Y_OFFSET oven_tray.pixel_x = OVEN_TRAY_X_OFFSET - RegisterSignal(used_tray, COMSIG_MOVABLE_MOVED, .proc/on_tray_moved) + RegisterSignal(used_tray, COMSIG_MOVABLE_MOVED, PROC_REF(on_tray_moved)) update_baking_audio() update_appearance() diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm index 6bb48f2174d..d0bfc8be72b 100644 --- a/code/modules/food_and_drinks/plate.dm +++ b/code/modules/food_and_drinks/plate.dm @@ -46,8 +46,8 @@ vis_contents += item_to_plate item_to_plate.flags_1 |= IS_ONTOP_1 item_to_plate.vis_flags |= VIS_INHERIT_PLANE - RegisterSignal(item_to_plate, COMSIG_MOVABLE_MOVED, .proc/ItemMoved) - RegisterSignal(item_to_plate, COMSIG_PARENT_QDELETING, .proc/ItemMoved) + RegisterSignal(item_to_plate, COMSIG_MOVABLE_MOVED, PROC_REF(ItemMoved)) + RegisterSignal(item_to_plate, COMSIG_PARENT_QDELETING, PROC_REF(ItemMoved)) update_appearance() ///This proc cleans up any signals on the item when it is removed from a plate, and ensures it has the correct state again. diff --git a/code/modules/food_and_drinks/restaurant/custom_order.dm b/code/modules/food_and_drinks/restaurant/custom_order.dm index 1ac565cb898..583c9ad2034 100644 --- a/code/modules/food_and_drinks/restaurant/custom_order.dm +++ b/code/modules/food_and_drinks/restaurant/custom_order.dm @@ -91,7 +91,7 @@ if(wanted_flavors.len > 1 && length(unique_list) == 1) icecream_name = "[make_tuple(wanted_flavors.len)] [wanted_flavors[1]] ice cream ([initial(cone_type.name)])" else - sortTim(wanted_flavors, cmp = /proc/cmp_text_asc) + sortTim(wanted_flavors, cmp = GLOBAL_PROC_REF(cmp_text_asc)) icecream_name = "[english_list(wanted_flavors)] ice cream ([initial(cone_type.name)])" /datum/custom_order/icecream/get_order_line(datum/venue/our_venue) diff --git a/code/modules/forensics/_forensics.dm b/code/modules/forensics/_forensics.dm index 70d7699b3bb..28f576cae45 100644 --- a/code/modules/forensics/_forensics.dm +++ b/code/modules/forensics/_forensics.dm @@ -45,7 +45,7 @@ qdel(src) return - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/clean_act) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_act)) src.parent = WEAKREF(parent) src.fingerprints = fingerprints diff --git a/code/modules/hallucination/_hallucination.dm b/code/modules/hallucination/_hallucination.dm index d193adbf27a..b4c9d6bf981 100644 --- a/code/modules/hallucination/_hallucination.dm +++ b/code/modules/hallucination/_hallucination.dm @@ -23,7 +23,7 @@ return src.hallucinator = hallucinator - RegisterSignal(hallucinator, COMSIG_PARENT_QDELETING, .proc/target_deleting) + RegisterSignal(hallucinator, COMSIG_PARENT_QDELETING, PROC_REF(target_deleting)) GLOB.all_ongoing_hallucinations += src /// Signal proc for [COMSIG_PARENT_QDELETING], if the mob hallucinating us is deletes, we should delete too. @@ -121,8 +121,8 @@ who_sees_us = list() for(var/mob/seer as anything in mobs_which_see_us) - RegisterSignal(seer, COMSIG_MOB_LOGIN, .proc/show_image_to) - RegisterSignal(seer, COMSIG_PARENT_QDELETING, .proc/remove_seer) + RegisterSignal(seer, COMSIG_MOB_LOGIN, PROC_REF(show_image_to)) + RegisterSignal(seer, COMSIG_PARENT_QDELETING, PROC_REF(remove_seer)) who_sees_us += seer show_image_to(seer) @@ -218,7 +218,7 @@ stack_trace("[type] was created without a parent hallucination.") return INITIALIZE_HINT_QDEL - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/parent_deleting) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(parent_deleting)) src.parent = parent /obj/effect/client_image_holder/hallucination/Destroy(force) diff --git a/code/modules/hallucination/battle.dm b/code/modules/hallucination/battle.dm index f02e4a2019e..6bcea2fe465 100644 --- a/code/modules/hallucination/battle.dm +++ b/code/modules/hallucination/battle.dm @@ -36,19 +36,19 @@ // Shortly after shooting our shot, it plays a hit (or miss) sound. var/next_hit_sound = rand(0.5 SECONDS, 1 SECONDS) if(prob(50)) - addtimer(CALLBACK(hallucinator, /mob/.proc/playsound_local, source, hit_person_sound, 25, TRUE), next_hit_sound) + addtimer(CALLBACK(hallucinator, TYPE_PROC_REF(/mob/, playsound_local), source, hit_person_sound, 25, TRUE), next_hit_sound) hits++ else - addtimer(CALLBACK(hallucinator, /mob/.proc/playsound_local, source, hit_wall_sound, 25, TRUE), next_hit_sound) + addtimer(CALLBACK(hallucinator, TYPE_PROC_REF(/mob/, playsound_local), source, hit_wall_sound, 25, TRUE), next_hit_sound) // If we scored enough hits, we have a chance to knock them down and stop the hallucination early. if(hits >= number_of_hits_to_end && prob(chance_to_fall)) - addtimer(CALLBACK(hallucinator, /mob/.proc/playsound_local, source, SFX_BODYFALL, 25, TRUE), next_hit_sound) + addtimer(CALLBACK(hallucinator, TYPE_PROC_REF(/mob/, playsound_local), source, SFX_BODYFALL, 25, TRUE), next_hit_sound) qdel(src) // Or, if we do have shots left, keep it going. else if(--shots_left > 0) - addtimer(CALLBACK(src, .proc/fire_loop, source, shots_left, hits), rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 6)) + addtimer(CALLBACK(src, PROC_REF(fire_loop), source, shots_left, hits), rand(CLICK_CD_RANGE, CLICK_CD_RANGE + 6)) // Otherwise, if we have no shots left, stop the hallucination. else @@ -83,7 +83,7 @@ hallucinator.playsound_local(source, 'sound/weapons/egloves.ogg', 40, TRUE) hallucinator.playsound_local(source, SFX_BODYFALL, 25, TRUE) - addtimer(CALLBACK(src, .proc/fake_cuff, source), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(fake_cuff), source), 2 SECONDS) return TRUE /// Plays a fake cable-cuff sound and deletes the hallucination. @@ -103,7 +103,7 @@ hallucinator.playsound_local(source, 'sound/weapons/egloves.ogg', 40, TRUE) hallucinator.playsound_local(source, SFX_BODYFALL, 25, TRUE) - addtimer(CALLBACK(src, .proc/harmbaton_loop, source, rand(5, 12)), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(harmbaton_loop), source, rand(5, 12)), 2 SECONDS) return TRUE /// The main sound loop for harmbatonning. @@ -116,7 +116,7 @@ qdel(src) else - addtimer(CALLBACK(src, .proc/harmbaton_loop, source, hits_remaing), rand(CLICK_CD_MELEE, CLICK_CD_MELEE + 4)) + addtimer(CALLBACK(src, PROC_REF(harmbaton_loop), source, hits_remaing), rand(CLICK_CD_MELEE, CLICK_CD_MELEE + 4)) /// A hallucination of someone unsheathing an energy sword, going to town, and sheathing it again. /datum/hallucination/battle/e_sword @@ -125,7 +125,7 @@ var/turf/source = random_far_turf() hallucinator.playsound_local(source, 'sound/weapons/saberon.ogg', 15, 1) - addtimer(CALLBACK(src, .proc/stab_loop, source, rand(4, 8)), CLICK_CD_MELEE) + addtimer(CALLBACK(src, PROC_REF(stab_loop), source, rand(4, 8)), CLICK_CD_MELEE) return TRUE /// The main sound loop of someone being esworded. @@ -144,13 +144,13 @@ if(stabs_remaining == 4) hallucinator.playsound_local(source, SFX_BODYFALL, 25, TRUE) - addtimer(CALLBACK(src, .proc/stab_loop, source, stabs_remaining - 1), rand(CLICK_CD_MELEE, CLICK_CD_MELEE + 6)) + addtimer(CALLBACK(src, PROC_REF(stab_loop), source, stabs_remaining - 1), rand(CLICK_CD_MELEE, CLICK_CD_MELEE + 6)) /// A hallucination of a syndicate bomb ticking down. /datum/hallucination/battle/bomb /datum/hallucination/battle/bomb/start() - addtimer(CALLBACK(src, .proc/fake_tick, random_far_turf(), rand(3, 11)), 1.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(fake_tick), random_far_turf(), rand(3, 11)), 1.5 SECONDS) return TRUE /// The loop of the (fake) bomb ticking down. @@ -163,4 +163,4 @@ qdel(src) else - addtimer(CALLBACK(src, .proc/fake_tick, source, ticks_remaining), 1.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(fake_tick), source, ticks_remaining), 1.5 SECONDS) diff --git a/code/modules/hallucination/body.dm b/code/modules/hallucination/body.dm index 53c2dd26319..aeaca25178f 100644 --- a/code/modules/hallucination/body.dm +++ b/code/modules/hallucination/body.dm @@ -98,7 +98,7 @@ return ..() /datum/hallucination/body/staticguy/queue_cleanup() - RegisterSignal(hallucinator, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(hallucinator, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) del_timerid = QDEL_IN(src, rand(2 MINUTES, 3 MINUTES)) return TRUE @@ -175,8 +175,8 @@ /datum/hallucination/body/weird/freezer/queue_cleanup() QDEL_IN(src, 12 SECONDS) //The freezer stays on screen while you're frozen - addtimer(CALLBACK(src, .proc/freeze_player), 1 SECONDS) // You barely have a moment to react before you're frozen - addtimer(CALLBACK(src, .proc/freeze_intimidate), 11.8 SECONDS) + addtimer(CALLBACK(src, PROC_REF(freeze_player)), 1 SECONDS) // You barely have a moment to react before you're frozen + addtimer(CALLBACK(src, PROC_REF(freeze_intimidate)), 11.8 SECONDS) hallucinator.cause_hallucination(/datum/hallucination/fake_sound/weird/radio_static, "freezer hallucination") return TRUE diff --git a/code/modules/hallucination/bolted_airlocks.dm b/code/modules/hallucination/bolted_airlocks.dm index 1cf5f03b967..9977365efcd 100644 --- a/code/modules/hallucination/bolted_airlocks.dm +++ b/code/modules/hallucination/bolted_airlocks.dm @@ -83,7 +83,7 @@ return INITIALIZE_HINT_QDEL src.airlock = airlock - RegisterSignal(airlock, COMSIG_PARENT_QDELETING, .proc/on_airlock_deleted) + RegisterSignal(airlock, COMSIG_PARENT_QDELETING, PROC_REF(on_airlock_deleted)) // We need to grab these for our image before we run our parent's parent initialize src.image_icon = airlock.overlays_file src.image_state = "lights_[AIRLOCK_LIGHT_BOLTS]" diff --git a/code/modules/hallucination/bubblegum_attack.dm b/code/modules/hallucination/bubblegum_attack.dm index 52796c8dea6..921bf09b361 100644 --- a/code/modules/hallucination/bubblegum_attack.dm +++ b/code/modules/hallucination/bubblegum_attack.dm @@ -49,7 +49,7 @@ to_chat(hallucinator, pick(hallucination_lines)) var/obj/effect/client_image_holder/hallucination/bubblegum/fake_bubbles = new(wall_source, hallucinator, src) - addtimer(CALLBACK(src, .proc/charge_loop, fake_bubbles, target_landing_turf), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(charge_loop), fake_bubbles, target_landing_turf), 1 SECONDS) return TRUE /** @@ -89,7 +89,7 @@ QDEL_IN(src, 3 SECONDS) else - addtimer(CALLBACK(src, .proc/charge_loop, fake_bubbles, landing_turf), 0.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(charge_loop), fake_bubbles, landing_turf), 0.2 SECONDS) /// Fake bubblegum hallucination effect for the oh yeah hallucination /obj/effect/client_image_holder/hallucination/bubblegum diff --git a/code/modules/hallucination/fake_chat.dm b/code/modules/hallucination/fake_chat.dm index 07221e4b776..54054a416cd 100644 --- a/code/modules/hallucination/fake_chat.dm +++ b/code/modules/hallucination/fake_chat.dm @@ -75,7 +75,7 @@ // Display the message if(!is_radio && !plus_runechat) var/image/speech_overlay = image('icons/mob/effects/talk.dmi', speaker, "default0", layer = ABOVE_MOB_LAYER) - INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, speech_overlay, list(hallucinator.client), 30) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), speech_overlay, list(hallucinator.client), 30) if(plus_runechat) hallucinator.create_chat_message(speaker, understood_language, chosen, spans) diff --git a/code/modules/hallucination/fake_death.dm b/code/modules/hallucination/fake_death.dm index aa02499eae8..369fbf6eeeb 100644 --- a/code/modules/hallucination/fake_death.dm +++ b/code/modules/hallucination/fake_death.dm @@ -65,9 +65,9 @@ "you too?", ) - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, hallucinator, span_deadsay("DEAD: [who_is_salting.name] says, \"[pick(dead_chat_salt)]\"")), delay) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), hallucinator, span_deadsay("DEAD: [who_is_salting.name] says, \"[pick(dead_chat_salt)]\"")), delay) - addtimer(CALLBACK(src, .proc/wake_up), delay + rand(7 SECONDS, 9 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(wake_up)), delay + rand(7 SECONDS, 9 SECONDS)) return TRUE /datum/hallucination/death/proc/wake_up() diff --git a/code/modules/hallucination/fake_sound.dm b/code/modules/hallucination/fake_sound.dm index 609c88f8d0a..1ec6da8fcae 100644 --- a/code/modules/hallucination/fake_sound.dm +++ b/code/modules/hallucination/fake_sound.dm @@ -102,7 +102,7 @@ qdel(src) else - addtimer(CALLBACK(src, .proc/mech_walk), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(mech_walk)), 1 SECONDS) /datum/hallucination/fake_sound/normal/wall_deconstruction sound_type = 'sound/items/welder.ogg' diff --git a/code/modules/hallucination/hazard.dm b/code/modules/hallucination/hazard.dm index dc8f6df865f..0d8419661ff 100644 --- a/code/modules/hallucination/hazard.dm +++ b/code/modules/hallucination/hazard.dm @@ -34,8 +34,8 @@ /obj/effect/client_image_holder/hallucination/danger/Initialize(mapload, list/mobs_which_see_us, datum/hallucination/parent) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/atom_touched_holder, - COMSIG_ATOM_EXITED = .proc/atom_touched_holder, + COMSIG_ATOM_ENTERED = PROC_REF(atom_touched_holder), + COMSIG_ATOM_EXITED = PROC_REF(atom_touched_holder), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -77,7 +77,7 @@ to_chat(afflicted, span_userdanger("You fall into the chasm!")) afflicted.visible_message(span_warning("[afflicted] falls to the ground suddenly!"), ignored_mobs = afflicted) afflicted.Paralyze(4 SECONDS) - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, afflicted, span_notice("...It's surprisingly shallow.")), 1.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), afflicted, span_notice("...It's surprisingly shallow.")), 1.5 SECONDS) QDEL_IN(src, 3 SECONDS) /obj/effect/client_image_holder/hallucination/danger/anomaly diff --git a/code/modules/hallucination/inhand_fake_item.dm b/code/modules/hallucination/inhand_fake_item.dm index 199fb138c72..ad1ce65b28b 100644 --- a/code/modules/hallucination/inhand_fake_item.dm +++ b/code/modules/hallucination/inhand_fake_item.dm @@ -129,7 +129,7 @@ stack_trace("[type] was created without a parent hallucination.") return INITIALIZE_HINT_QDEL - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/parent_deleting) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(parent_deleting)) src.parent = parent ADD_TRAIT(src, TRAIT_NODROP, INNATE_TRAIT) diff --git a/code/modules/hallucination/nearby_fake_item.dm b/code/modules/hallucination/nearby_fake_item.dm index c69556cfffa..4864594c9a5 100644 --- a/code/modules/hallucination/nearby_fake_item.dm +++ b/code/modules/hallucination/nearby_fake_item.dm @@ -43,7 +43,7 @@ if(generated_image) hallucinator.client?.images += generated_image - addtimer(CALLBACK(src, .proc/remove_image, who_has_the_item), rand(15 SECONDS, 25 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(remove_image), who_has_the_item), rand(15 SECONDS, 25 SECONDS)) return TRUE return FALSE diff --git a/code/modules/hallucination/on_fire.dm b/code/modules/hallucination/on_fire.dm index bc3696f8c0e..21b901fa62b 100644 --- a/code/modules/hallucination/on_fire.dm +++ b/code/modules/hallucination/on_fire.dm @@ -43,7 +43,7 @@ to_chat(hallucinator, span_userdanger("You're set on fire!")) hallucinator.throw_alert(ALERT_FIRE, /atom/movable/screen/alert/fire, override = TRUE) times_to_lower_stamina = rand(5, 10) - addtimer(CALLBACK(src, .proc/start_expanding), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_expanding)), 2 SECONDS) return TRUE /datum/hallucination/fire/Destroy() diff --git a/code/modules/hallucination/screwy_health_doll.dm b/code/modules/hallucination/screwy_health_doll.dm index 94863d3590e..56bfff4385b 100644 --- a/code/modules/hallucination/screwy_health_doll.dm +++ b/code/modules/hallucination/screwy_health_doll.dm @@ -51,9 +51,9 @@ var/obj/item/bodypart/picked = specific_limb || pick(human_mob.bodyparts) if(!(picked in bodyparts)) - RegisterSignal(picked, list(COMSIG_PARENT_QDELETING, COMSIG_BODYPART_REMOVED), .proc/remove_bodypart) - RegisterSignal(picked, COMSIG_BODYPART_UPDATING_HEALTH_HUD, .proc/on_bodypart_hud_update) - RegisterSignal(picked, COMSIG_BODYPART_CHECKED_FOR_INJURY, .proc/on_bodypart_checked) + RegisterSignal(picked, list(COMSIG_PARENT_QDELETING, COMSIG_BODYPART_REMOVED), PROC_REF(remove_bodypart)) + RegisterSignal(picked, COMSIG_BODYPART_UPDATING_HEALTH_HUD, PROC_REF(on_bodypart_hud_update)) + RegisterSignal(picked, COMSIG_BODYPART_CHECKED_FOR_INJURY, PROC_REF(on_bodypart_checked)) bodyparts[picked] = clamp(severity || rand(1, 5), 1, 5) hallucinator.update_health_hud() diff --git a/code/modules/hallucination/shock.dm b/code/modules/hallucination/shock.dm index 2572e2f9b6d..32fc17fce1d 100644 --- a/code/modules/hallucination/shock.dm +++ b/code/modules/hallucination/shock.dm @@ -41,8 +41,8 @@ hallucinator.do_jitter_animation(300) // Maximum jitter hallucinator.adjust_jitter(20 SECONDS) - addtimer(CALLBACK(src, .proc/reset_shock_animation), 4 SECONDS) - addtimer(CALLBACK(src, .proc/shock_drop), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_shock_animation)), 4 SECONDS) + addtimer(CALLBACK(src, PROC_REF(shock_drop)), 2 SECONDS) QDEL_IN(src, 4 SECONDS) return TRUE diff --git a/code/modules/hallucination/station_message.dm b/code/modules/hallucination/station_message.dm index 8ce29944506..30b537afbc7 100644 --- a/code/modules/hallucination/station_message.dm +++ b/code/modules/hallucination/station_message.dm @@ -104,7 +104,7 @@ /datum/hallucination/station_message/clock_cult_ark/start() hallucinator.playsound_local(hallucinator, 'sound/machines/clockcult/ark_deathrattle.ogg', 50, FALSE, pressure_affected = FALSE) hallucinator.playsound_local(hallucinator, 'sound/effects/clockcult_gateway_disrupted.ogg', 50, FALSE, pressure_affected = FALSE) - addtimer(CALLBACK(src, .proc/play_distant_explosion_sound), 2.7 SECONDS) + addtimer(CALLBACK(src, PROC_REF(play_distant_explosion_sound)), 2.7 SECONDS) return TRUE // does not call parent to finish up the sound in a few seconds /datum/hallucination/station_message/clock_cult_ark/proc/play_distant_explosion_sound() diff --git a/code/modules/hallucination/stray_bullet.dm b/code/modules/hallucination/stray_bullet.dm index 561c9a5ca9d..b68e41f18d3 100644 --- a/code/modules/hallucination/stray_bullet.dm +++ b/code/modules/hallucination/stray_bullet.dm @@ -58,7 +58,7 @@ return INITIALIZE_HINT_QDEL src.parent = parent - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/parent_deleting) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(parent_deleting)) /obj/projectile/hallucination/Destroy() @@ -166,7 +166,7 @@ parent.hallucinator.client?.images |= blood animate(blood, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = 5) - addtimer(CALLBACK(src, .proc/clean_up_blood, blood), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(clean_up_blood), blood), 0.5 SECONDS) /obj/projectile/hallucination/proc/clean_up_blood(image/blood) parent.hallucinator.client?.images -= blood @@ -180,7 +180,7 @@ hit_effect.pixel_x = hit_atom.pixel_x + rand(-4,4) hit_effect.pixel_y = hit_atom.pixel_y + rand(-4,4) parent.hallucinator.client.images |= hit_effect - addtimer(CALLBACK(src, .proc/clean_up_hit, hit_effect), is_wall ? hit_duration_wall : hit_duration) + addtimer(CALLBACK(src, PROC_REF(clean_up_hit), hit_effect), is_wall ? hit_duration_wall : hit_duration) /obj/projectile/hallucination/proc/clean_up_hit(image/hit_effect) parent.hallucinator.client?.images -= hit_effect @@ -244,7 +244,7 @@ forced = "hulk (hallucinating)", ) else if((afflicted.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(afflicted, TRAIT_STUNIMMUNE)) - addtimer(CALLBACK(afflicted, /mob/living/carbon.proc/do_jitter_animation, 20), 0.5 SECONDS) + addtimer(CALLBACK(afflicted, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 20), 0.5 SECONDS) /obj/projectile/hallucination/disabler name = "disabler beam" diff --git a/code/modules/hallucination/xeno_attack.dm b/code/modules/hallucination/xeno_attack.dm index 9cae5550467..0d8b15490d9 100644 --- a/code/modules/hallucination/xeno_attack.dm +++ b/code/modules/hallucination/xeno_attack.dm @@ -16,7 +16,7 @@ feedback_details += "Vent Coords: ([xeno_attack_source.x], [xeno_attack_source.y], [xeno_attack_source.z])" var/obj/effect/client_image_holder/hallucination/xeno/fake_xeno = new(xeno_attack_source, hallucinator, src) - addtimer(CALLBACK(src, .proc/leap_at_target, fake_xeno, xeno_attack_source), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(leap_at_target), fake_xeno, xeno_attack_source), 1 SECONDS) return TRUE /// Leaps from the vent to the hallucinator. @@ -29,7 +29,7 @@ fake_xeno.set_leaping() fake_xeno.throw_at(hallucinator, 7, 1, spin = FALSE, diagonals_first = TRUE) - addtimer(CALLBACK(src, .proc/leap_back_to_pump, fake_xeno), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(leap_back_to_pump), fake_xeno), 1 SECONDS) /// Leaps from the hallucinator back to the vent. /datum/hallucination/xeno_attack/proc/leap_back_to_pump(obj/effect/client_image_holder/hallucination/xeno/fake_xeno, turf/attack_source) @@ -41,7 +41,7 @@ fake_xeno.set_leaping() fake_xeno.throw_at(attack_source, 7, 1, spin = FALSE, diagonals_first = TRUE) - addtimer(CALLBACK(src, .proc/begin_crawling, fake_xeno), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(begin_crawling), fake_xeno), 1 SECONDS) /// Mimics ventcrawling into the vent. /datum/hallucination/xeno_attack/proc/begin_crawling(obj/effect/client_image_holder/hallucination/xeno/fake_xeno) @@ -52,7 +52,7 @@ return to_chat(hallucinator, span_notice("[fake_xeno.name] begins climbing into the ventilation system...")) - addtimer(CALLBACK(src, .proc/disappear, fake_xeno), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(disappear), fake_xeno), 3 SECONDS) /// Disappears into the vent, ending the hallucination. /datum/hallucination/xeno_attack/proc/disappear(obj/effect/client_image_holder/hallucination/xeno/fake_xeno) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 6ff2d2e8441..3ad306c7143 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -730,7 +730,7 @@ /datum/holiday/xmas/celebrate() . = ..() - SSticker.OnRoundstart(CALLBACK(src, .proc/roundstart_celebrate)) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(roundstart_celebrate))) GLOB.maintenance_loot += list( list( /obj/item/toy/xmas_cracker = 3, diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index a5369724847..baa2a1f1588 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -273,7 +273,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf spawned -= holo_atom continue - RegisterSignal(holo_atom, COMSIG_PARENT_QDELETING, .proc/remove_from_holo_lists) + RegisterSignal(holo_atom, COMSIG_PARENT_QDELETING, PROC_REF(remove_from_holo_lists)) holo_atom.flags_1 |= HOLOGRAM_1 if(isholoeffect(holo_atom))//activates holo effects and transfers them from the spawned list into the effects list @@ -283,10 +283,10 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf var/atom/holo_effect_product = holo_effect.activate(src)//change name if(istype(holo_effect_product)) spawned += holo_effect_product // we want mobs or objects spawned via holoeffects to be tracked as objects - RegisterSignal(holo_effect_product, COMSIG_PARENT_QDELETING, .proc/remove_from_holo_lists) + RegisterSignal(holo_effect_product, COMSIG_PARENT_QDELETING, PROC_REF(remove_from_holo_lists)) if(islist(holo_effect_product)) for(var/atom/atom_product as anything in holo_effect_product) - RegisterSignal(atom_product, COMSIG_PARENT_QDELETING, .proc/remove_from_holo_lists) + RegisterSignal(atom_product, COMSIG_PARENT_QDELETING, PROC_REF(remove_from_holo_lists)) continue if(isobj(holo_atom)) @@ -368,7 +368,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf if(toggleOn) if(last_program && (last_program != offline_program)) - addtimer(CALLBACK(src,.proc/load_program, last_program, TRUE), 25) + addtimer(CALLBACK(src, PROC_REF(load_program), last_program, TRUE), 25) active = TRUE else last_program = program @@ -377,7 +377,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf /obj/machinery/computer/holodeck/power_change() . = ..() - INVOKE_ASYNC(src, .proc/toggle_power, !machine_stat) + INVOKE_ASYNC(src, PROC_REF(toggle_power), !machine_stat) ///shuts down the holodeck and force loads the offline_program /obj/machinery/computer/holodeck/proc/emergency_shutdown() diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index 12fe2af5e76..258aeba52d5 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -65,7 +65,7 @@ // these vars are not really standardized but all would theoretically create stuff on death for(var/v in list("butcher_results","corpse","weapon1","weapon2","blood_volume") & our_mob.vars) our_mob.vars[v] = null - RegisterSignal(our_mob, COMSIG_PARENT_QDELETING, .proc/handle_mob_delete) + RegisterSignal(our_mob, COMSIG_PARENT_QDELETING, PROC_REF(handle_mob_delete)) return our_mob /obj/effect/holodeck_effect/mobspawner/deactivate(obj/machinery/computer/holodeck/HC) diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index d29a0e5f77b..eb05b42f37d 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -37,7 +37,7 @@ /obj/item/toy/cards/deck/syndicate/holographic/Initialize(mapload, obj/machinery/computer/holodeck/holodeck) src.holodeck = holodeck - RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/handle_card_delete) + RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(handle_card_delete)) . = ..() /obj/item/toy/cards/deck/syndicate/holographic/proc/handle_card_delete(datum/source) diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index 1d69da0f0ce..6238e82156d 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -148,7 +148,7 @@ /turf/open/floor/holofloor/carpet/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_appearance)), 1) /turf/open/floor/holofloor/carpet/update_icon(updates=ALL) . = ..() diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index 7b523f31606..e9206c99a4a 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -49,7 +49,7 @@ to_chat(user, span_warning("[I] is stuck to your hand!")) return TRUE to_chat(user, span_notice("You place [I] into [src] to start the fermentation process.")) - addtimer(CALLBACK(src, .proc/makeWine, fruit), rand(80, 120) * speed_multiplier) + addtimer(CALLBACK(src, PROC_REF(makeWine), fruit), rand(80, 120) * speed_multiplier) return TRUE if(I) if(I.is_refillable()) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 822b4afa387..521c41103a5 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -84,7 +84,7 @@ /obj/item/food/grown/MakeLeaveTrash() if(trash_type) - AddElement(/datum/element/food_trash, trash_type, FOOD_TRASH_OPENABLE, /obj/item/food/grown/.proc/generate_trash) + AddElement(/datum/element/food_trash, trash_type, FOOD_TRASH_OPENABLE, TYPE_PROC_REF(/obj/item/food/grown/, generate_trash)) return /// Generates a piece of trash based on our plant item. Used by [/datum/element/food_trash]. diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index aa91d712272..7cbbb06b292 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -30,7 +30,7 @@ /obj/item/food/grown/banana/MakeEdible() . = ..() - AddComponent(/datum/component/edible, check_liked = CALLBACK(src, .proc/check_liked)) + AddComponent(/datum/component/edible, check_liked = CALLBACK(src, PROC_REF(check_liked))) /obj/item/food/grown/banana/Initialize(mapload) . = ..() @@ -180,7 +180,7 @@ animate(src, time = 1, pixel_z = 12, easing = ELASTIC_EASING) animate(time = 1, pixel_z = 0, easing = BOUNCE_EASING) - addtimer(CALLBACK(src, .proc/explosive_ripening), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(explosive_ripening)), 3 SECONDS) for(var/i in 1 to 32) animate(color = (i % 2) ? "#ffffff": "#ff6739", time = 1, easing = QUAD_EASING) diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index eb9dbd60d43..b20de0f7a68 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -70,7 +70,7 @@ /obj/item/food/grown/holymelon/MakeEdible() . = ..() - AddComponent(/datum/component/edible, check_liked = CALLBACK(src, .proc/check_holyness)) + AddComponent(/datum/component/edible, check_liked = CALLBACK(src, PROC_REF(check_holyness))) /* * Callback to be used with the edible component. diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 38229ed89be..6010ca14c64 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -64,9 +64,9 @@ /obj/item/seeds/replicapod/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT), .proc/on_reagent_add) - RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, .proc/on_reagent_del) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT), PROC_REF(on_reagent_add)) + RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, PROC_REF(on_reagent_del)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles the seeds' reagents datum getting deleted. /obj/item/seeds/replicapod/proc/on_reagents_del(datum/reagents/reagents) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 1527aa7e098..469fdae7af7 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -448,7 +448,7 @@ /obj/item/cultivator/rake/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index 4c00b6ce80a..b5dd3040890 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -715,7 +715,7 @@ set_weedlevel(0, update_icon = FALSE) var/message = span_warning("[oldPlantName] suddenly mutates into [myseed.plantname]!") - addtimer(CALLBACK(src, .proc/after_mutation, message), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(after_mutation), message), 0.5 SECONDS) /obj/machinery/hydroponics/proc/polymorph() // Polymorph a plant into another plant if(!myseed || plant_status == HYDROTRAY_PLANT_DEAD) @@ -732,7 +732,7 @@ set_weedlevel(0, update_icon = FALSE) var/message = span_warning("[oldPlantName] suddenly polymorphs into [myseed.plantname]!") - addtimer(CALLBACK(src, .proc/after_mutation, message), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(after_mutation), message), 0.5 SECONDS) /obj/machinery/hydroponics/proc/mutateweed() // If the weeds gets the mutagent instead. Mind you, this pretty much destroys the old plant if( weedlevel > 5 ) @@ -746,7 +746,7 @@ set_weedlevel(0, update_icon = FALSE) // Reset var/message = span_warning("The mutated weeds in [src] spawn some [myseed.plantname]!") - addtimer(CALLBACK(src, .proc/after_mutation, message), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(after_mutation), message), 0.5 SECONDS) else to_chat(usr, span_warning("The few weeds in [src] seem to react, but only for a moment...")) /** @@ -1214,23 +1214,23 @@ . = ..() if(istype(parent, /obj/machinery/hydroponics)) attached_tray = parent - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_SEED, .proc/on_set_seed) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_SELFSUSTAINING, .proc/on_set_selfsustaining) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_WEEDLEVEL, .proc/on_set_weedlevel) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PESTLEVEL, .proc/on_set_pestlevel) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_WATERLEVEL, .proc/on_set_waterlevel) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PLANT_HEALTH, .proc/on_set_plant_health) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_TOXIC, .proc/on_set_toxic_level) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PLANT_STATUS, .proc/on_set_plant_status) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_ON_HARVEST, .proc/on_harvest) - RegisterSignal(attached_tray, COMSIG_HYDROTRAY_PLANT_DEATH, .proc/on_plant_death) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_SEED, PROC_REF(on_set_seed)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_SELFSUSTAINING, PROC_REF(on_set_selfsustaining)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_WEEDLEVEL, PROC_REF(on_set_weedlevel)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PESTLEVEL, PROC_REF(on_set_pestlevel)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_WATERLEVEL, PROC_REF(on_set_waterlevel)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PLANT_HEALTH, PROC_REF(on_set_plant_health)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_TOXIC, PROC_REF(on_set_toxic_level)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_SET_PLANT_STATUS, PROC_REF(on_set_plant_status)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_ON_HARVEST, PROC_REF(on_harvest)) + RegisterSignal(attached_tray, COMSIG_HYDROTRAY_PLANT_DEATH, PROC_REF(on_plant_death)) var/list/reagents_holder_signals = list( COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, ) - RegisterSignal(attached_tray, reagents_holder_signals, .proc/update_reagents_level) + RegisterSignal(attached_tray, reagents_holder_signals, PROC_REF(update_reagents_level)) /obj/item/circuit_component/hydroponics/unregister_usb_parent(atom/movable/parent) attached_tray = null diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 200972aaeb6..58dcdc83fc1 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -176,7 +176,7 @@ // Add on any bonus lines on examine if(examine_line) - RegisterSignal(our_plant, COMSIG_PARENT_EXAMINE, .proc/examine) + RegisterSignal(our_plant, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) return TRUE @@ -199,9 +199,9 @@ if(!.) return - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/squash_plant) - RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, .proc/squash_plant) - RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, .proc/squash_plant) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(squash_plant)) + RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(squash_plant)) + RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(squash_plant)) /* * Signal proc to squash the plant this trait belongs to, causing a smudge, exposing the target to reagents, and deleting it, @@ -262,7 +262,7 @@ if(!istype(our_plant, /obj/item/grown/bananapeel) && (!our_plant.reagents || !our_plant.reagents.has_reagent(/datum/reagent/lube))) stun_len /= 3 - our_plant.AddComponent(/datum/component/slippery, min(stun_len, 140), NONE, CALLBACK(src, .proc/handle_slip, our_plant)) + our_plant.AddComponent(/datum/component/slippery, min(stun_len, 140), NONE, CALLBACK(src, PROC_REF(handle_slip), our_plant)) /// On slip, sends a signal that our plant was slipped on out. /datum/plant_gene/trait/slip/proc/handle_slip(obj/item/food/grown/our_plant, mob/slipped_target) @@ -287,11 +287,11 @@ var/obj/item/seeds/our_seed = our_plant.get_plant_seed() if(our_seed.get_gene(/datum/plant_gene/trait/squash)) // If we have the squash gene, let that handle slipping - RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, .proc/zap_target) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, PROC_REF(zap_target)) else - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/zap_target) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(zap_target)) - RegisterSignal(our_plant, COMSIG_FOOD_EATEN, .proc/recharge_cells) + RegisterSignal(our_plant, COMSIG_FOOD_EATEN, PROC_REF(recharge_cells)) /* * Zaps the target with a stunning shock. @@ -431,9 +431,9 @@ var/obj/item/seeds/our_seed = our_plant.get_plant_seed() if(our_seed.get_gene(/datum/plant_gene/trait/squash)) // If we have the squash gene, let that handle slipping - RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, .proc/squash_teleport) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, PROC_REF(squash_teleport)) else - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/slip_teleport) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(slip_teleport)) /* * When squashed, makes the target teleport. @@ -524,8 +524,8 @@ return our_plant.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 - RegisterSignal(our_plant, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, .proc/on_requesting_context_from_item) - RegisterSignal(our_plant, COMSIG_PARENT_ATTACKBY, .proc/make_battery) + RegisterSignal(our_plant, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) + RegisterSignal(our_plant, COMSIG_PARENT_ATTACKBY, PROC_REF(make_battery)) /* * Signal proc for [COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM] to add context to plant batteries. @@ -600,8 +600,8 @@ if(!.) return - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/prickles_inject) - RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, .proc/prickles_inject) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(prickles_inject)) + RegisterSignal(our_plant, COMSIG_MOVABLE_IMPACT, PROC_REF(prickles_inject)) /* * Injects a target with a number of reagents from our plant. @@ -634,7 +634,7 @@ if(!.) return - RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, .proc/make_smoke) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SQUASH, PROC_REF(make_smoke)) /* * Makes a cloud of reagent smoke. @@ -682,7 +682,7 @@ mutability_flags = PLANT_GENE_REMOVABLE | PLANT_GENE_MUTATABLE | PLANT_GENE_GRAFTABLE /datum/plant_gene/trait/invasive/on_new_seed(obj/item/seeds/new_seed) - RegisterSignal(new_seed, COMSIG_SEED_ON_GROW, .proc/try_spread) + RegisterSignal(new_seed, COMSIG_SEED_ON_GROW, PROC_REF(try_spread)) /datum/plant_gene/trait/invasive/on_removed(obj/item/seeds/old_seed) UnregisterSignal(old_seed, COMSIG_SEED_ON_GROW) @@ -776,7 +776,7 @@ if(istype(grown_plant) && ispath(grown_plant.trash_type, /obj/item/grown)) return - RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, .proc/laughter) + RegisterSignal(our_plant, COMSIG_PLANT_ON_SLIP, PROC_REF(laughter)) /* * Play a sound effect from our plant. diff --git a/code/modules/hydroponics/unique_plant_genes.dm b/code/modules/hydroponics/unique_plant_genes.dm index 94c722e737f..0825350092f 100644 --- a/code/modules/hydroponics/unique_plant_genes.dm +++ b/code/modules/hydroponics/unique_plant_genes.dm @@ -19,8 +19,8 @@ antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY, \ inventory_flags = ITEM_SLOT_HANDS, \ charges = shield_uses, \ - drain_antimagic = CALLBACK(src, .proc/drain_antimagic), \ - expiration = CALLBACK(src, .proc/expire), \ + drain_antimagic = CALLBACK(src, PROC_REF(drain_antimagic)), \ + expiration = CALLBACK(src, PROC_REF(expire)), \ ) /// When the plant our gene is hosted in is drained of an anti-magic charge. @@ -51,14 +51,14 @@ if(force_multiplier) var/obj/item/seeds/our_seed = our_plant.get_plant_seed() our_plant.force = round((5 + our_seed.potency * force_multiplier), 1) - RegisterSignal(our_plant, COMSIG_ITEM_ATTACK, .proc/on_plant_attack) - RegisterSignal(our_plant, COMSIG_ITEM_AFTERATTACK, .proc/after_plant_attack) + RegisterSignal(our_plant, COMSIG_ITEM_ATTACK, PROC_REF(on_plant_attack)) + RegisterSignal(our_plant, COMSIG_ITEM_AFTERATTACK, PROC_REF(after_plant_attack)) /// Signal proc for [COMSIG_ITEM_ATTACK] that allows for effects on attack /datum/plant_gene/trait/attack/proc/on_plant_attack(obj/item/source, mob/living/target, mob/living/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/attack_effect, source, target, user) + INVOKE_ASYNC(src, PROC_REF(attack_effect), source, target, user) /* * Effects done when we hit people with our plant, ON attack. @@ -86,7 +86,7 @@ if(!(object_target.obj_flags & CAN_BE_HIT)) return - INVOKE_ASYNC(src, .proc/after_attack_effect, source, target, user) + INVOKE_ASYNC(src, PROC_REF(after_attack_effect), source, target, user) /* * Effects done when we hit people with our plant, AFTER the attack is done. @@ -172,13 +172,13 @@ return our_plant.AddElement(/datum/element/plant_backfire, cancel_action_on_backfire, traits_to_check, genes_to_check) - RegisterSignal(our_plant, COMSIG_PLANT_ON_BACKFIRE, .proc/on_backfire) + RegisterSignal(our_plant, COMSIG_PLANT_ON_BACKFIRE, PROC_REF(on_backfire)) /// Signal proc for [COMSIG_PLANT_ON_BACKFIRE] that causes the backfire effect. /datum/plant_gene/trait/backfire/proc/on_backfire(obj/item/source, mob/living/carbon/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/backfire_effect, source, user) + INVOKE_ASYNC(src, PROC_REF(backfire_effect), source, user) /** * The actual backfire effect on the user. @@ -252,7 +252,7 @@ return our_chili = WEAKREF(our_plant) - RegisterSignal(our_plant, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), .proc/stop_backfire_effect) + RegisterSignal(our_plant, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(stop_backfire_effect)) /* * Begin processing the trait on backfire. @@ -332,9 +332,9 @@ if(dangerous) our_plant.AddElement(/datum/element/plant_backfire, TRUE) - RegisterSignal(our_plant, COMSIG_PLANT_ON_BACKFIRE, .proc/early_awakening) - RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, .proc/manual_awakening) - RegisterSignal(our_plant, COMSIG_ITEM_PRE_ATTACK, .proc/pre_consumption_check) + RegisterSignal(our_plant, COMSIG_PLANT_ON_BACKFIRE, PROC_REF(early_awakening)) + RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(manual_awakening)) + RegisterSignal(our_plant, COMSIG_ITEM_PRE_ATTACK, PROC_REF(pre_consumption_check)) /* * Before we can eat our plant, check to see if it's waking up. Don't eat it if it is. @@ -399,7 +399,7 @@ */ /datum/plant_gene/trait/mob_transformation/proc/begin_awaken(obj/item/our_plant, awaken_time) awakening = TRUE - addtimer(CALLBACK(src, .proc/awaken, our_plant), awaken_time) + addtimer(CALLBACK(src, PROC_REF(awaken), our_plant), awaken_time) /* * Actually awaken the plant, spawning the mob designated by the [killer_plant] typepath. @@ -489,9 +489,9 @@ return our_plant.max_integrity = 40 // Max_integrity is lowered so they explode better, or something like that. - RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, .proc/trigger_detonation) - RegisterSignal(our_plant, COMSIG_ATOM_EX_ACT, .proc/explosion_reaction) - RegisterSignal(our_plant, COMSIG_OBJ_DECONSTRUCT, .proc/deconstruct_reaction) + RegisterSignal(our_plant, COMSIG_ITEM_ATTACK_SELF, PROC_REF(trigger_detonation)) + RegisterSignal(our_plant, COMSIG_ATOM_EX_ACT, PROC_REF(explosion_reaction)) + RegisterSignal(our_plant, COMSIG_OBJ_DECONSTRUCT, PROC_REF(deconstruct_reaction)) /* * Trigger our plant's detonation. @@ -573,7 +573,7 @@ our_plant.color = COLOR_RED playsound(our_plant.drop_location(), 'sound/weapons/armbomb.ogg', 75, TRUE, -3) - addtimer(CALLBACK(src, .proc/detonate, our_plant), rand(1 SECONDS, 6 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(detonate), our_plant), rand(1 SECONDS, 6 SECONDS)) /datum/plant_gene/trait/bomb_plant/potency_based/detonate(obj/item/our_plant) var/obj/item/seeds/our_seed = our_plant.get_plant_seed() @@ -593,9 +593,9 @@ var/datum/weakref/stinky_seed /datum/plant_gene/trait/gas_production/on_new_seed(obj/item/seeds/new_seed) - RegisterSignal(new_seed, COMSIG_SEED_ON_PLANTED, .proc/set_home_tray) - RegisterSignal(new_seed, COMSIG_SEED_ON_GROW, .proc/try_release_gas) - RegisterSignal(new_seed, COMSIG_PARENT_QDELETING, .proc/stop_gas) + RegisterSignal(new_seed, COMSIG_SEED_ON_PLANTED, PROC_REF(set_home_tray)) + RegisterSignal(new_seed, COMSIG_SEED_ON_GROW, PROC_REF(try_release_gas)) + RegisterSignal(new_seed, COMSIG_PARENT_QDELETING, PROC_REF(stop_gas)) stinky_seed = WEAKREF(new_seed) /datum/plant_gene/trait/gas_production/on_removed(obj/item/seeds/old_seed) diff --git a/code/modules/industrial_lift/crossing_signal.dm b/code/modules/industrial_lift/crossing_signal.dm index b9c1d540da8..db4ea1f5c41 100644 --- a/code/modules/industrial_lift/crossing_signal.dm +++ b/code/modules/industrial_lift/crossing_signal.dm @@ -48,7 +48,7 @@ var/datum/lift_master/tram/tram_part = tram_ref?.resolve() if(tram_part) - RegisterSignal(tram_part, COMSIG_TRAM_SET_TRAVELLING, .proc/on_tram_travelling) + RegisterSignal(tram_part, COMSIG_TRAM_SET_TRAVELLING, PROC_REF(on_tram_travelling)) /obj/machinery/crossing_signal/Destroy() . = ..() diff --git a/code/modules/industrial_lift/elevator_button.dm b/code/modules/industrial_lift/elevator_button.dm index fae1258d09d..ba97bb67001 100644 --- a/code/modules/industrial_lift/elevator_button.dm +++ b/code/modules/industrial_lift/elevator_button.dm @@ -105,7 +105,7 @@ loc.balloon_alert(activator, "elevator called") // Actually try to move the lift. This will sleep. - if(!lift.move_to_zlevel(loc.z, CALLBACK(src, .proc/check_button))) + if(!lift.move_to_zlevel(loc.z, CALLBACK(src, PROC_REF(check_button)))) loc.balloon_alert(activator, "elevator out of service!") return FALSE diff --git a/code/modules/industrial_lift/elevator_panel.dm b/code/modules/industrial_lift/elevator_panel.dm index 79494e792e6..4b1b883c96b 100644 --- a/code/modules/industrial_lift/elevator_panel.dm +++ b/code/modules/industrial_lift/elevator_panel.dm @@ -299,7 +299,7 @@ if(!lift || lift.controls_locked == LIFT_PLATFORM_LOCKED) return TRUE // We shouldn't be moving anything, update UI - INVOKE_ASYNC(lift, /datum/lift_master.proc/move_to_zlevel, desired_z, CALLBACK(src, .proc/check_panel), usr) + INVOKE_ASYNC(lift, TYPE_PROC_REF(/datum/lift_master, move_to_zlevel), desired_z, CALLBACK(src, PROC_REF(check_panel)), usr) last_move_target = desired_z return TRUE // Succcessfully initiated a move. Regardless of whether it actually works, update the UI @@ -315,7 +315,7 @@ // Open all lift doors, it's an emergency dang it! lift.update_lift_doors(action = OPEN_DOORS) - door_reset_timerid = addtimer(CALLBACK(src, .proc/reset_doors), 3 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE) + door_reset_timerid = addtimer(CALLBACK(src, PROC_REF(reset_doors)), 3 MINUTES, TIMER_UNIQUE|TIMER_STOPPABLE) return TRUE // We opened up all the doors, update the UI so the emergency button is replaced correctly if("reset_doors") diff --git a/code/modules/industrial_lift/industrial_lift.dm b/code/modules/industrial_lift/industrial_lift.dm index 2a923f6bca2..a636a1050f7 100644 --- a/code/modules/industrial_lift/industrial_lift.dm +++ b/code/modules/industrial_lift/industrial_lift.dm @@ -96,8 +96,8 @@ GLOBAL_LIST_EMPTY(lifts) ///set the movement registrations to our current turf(s) so contents moving out of our tile(s) are removed from our movement lists /obj/structure/industrial_lift/proc/set_movement_registrations(list/turfs_to_set) for(var/turf/turf_loc as anything in turfs_to_set || locs) - RegisterSignal(turf_loc, COMSIG_ATOM_EXITED, .proc/UncrossedRemoveItemFromLift) - RegisterSignal(turf_loc, list(COMSIG_ATOM_ENTERED,COMSIG_ATOM_INITIALIZED_ON), .proc/AddItemOnLift) + RegisterSignal(turf_loc, COMSIG_ATOM_EXITED, PROC_REF(UncrossedRemoveItemFromLift)) + RegisterSignal(turf_loc, list(COMSIG_ATOM_ENTERED,COMSIG_ATOM_INITIALIZED_ON), PROC_REF(AddItemOnLift)) ///unset our movement registrations from turfs that no longer contain us (or every loc if turfs_to_unset is unspecified) /obj/structure/industrial_lift/proc/unset_movement_registrations(list/turfs_to_unset) @@ -132,7 +132,7 @@ GLOBAL_LIST_EMPTY(lifts) if(isliving(new_lift_contents) && !HAS_TRAIT(new_lift_contents, TRAIT_CANNOT_BE_UNBUCKLED)) ADD_TRAIT(new_lift_contents, TRAIT_CANNOT_BE_UNBUCKLED, BUCKLED_TRAIT) LAZYADD(lift_load, new_lift_contents) - RegisterSignal(new_lift_contents, COMSIG_PARENT_QDELETING, .proc/RemoveItemFromLift) + RegisterSignal(new_lift_contents, COMSIG_PARENT_QDELETING, PROC_REF(RemoveItemFromLift)) return TRUE @@ -407,7 +407,7 @@ GLOBAL_LIST_EMPTY(lifts) collided.throw_at() //if going EAST, will turn to the NORTHEAST or SOUTHEAST and throw the ran over guy away - var/datum/callback/land_slam = new(collided, /mob/living/.proc/tram_slam_land) + var/datum/callback/land_slam = new(collided, TYPE_PROC_REF(/mob/living/, tram_slam_land)) collided.throw_at(throw_target, 200 * collision_lethality, 4 * collision_lethality, callback = land_slam) unset_movement_registrations(exited_locs) @@ -600,7 +600,7 @@ GLOBAL_LIST_EMPTY(lifts) user = user, anchor = src, choices = possible_directions, - custom_check = CALLBACK(src, .proc/can_open_lift_radial, user, starting_position), + custom_check = CALLBACK(src, PROC_REF(can_open_lift_radial), user, starting_position), require_near = TRUE, tooltips = TRUE, ) @@ -735,7 +735,7 @@ GLOBAL_LIST_EMPTY(lifts) "NORTHWEST" = image(icon = 'icons/testing/turf_analysis.dmi', icon_state = "red_arrow", dir = WEST) ) - var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, .proc/can_open_lift_radial, user, starting_position), require_near = TRUE, tooltips = FALSE) + var/result = show_radial_menu(user, src, tool_list, custom_check = CALLBACK(src, PROC_REF(can_open_lift_radial), user, starting_position), require_near = TRUE, tooltips = FALSE) if (!can_open_lift_radial(user,starting_position)) return // nice try if(!isnull(result) && result != "Cancel" && lift_master_datum.controls_locked) @@ -811,7 +811,7 @@ GLOBAL_LIST_EMPTY(lifts) for(var/atom/movable/glider as anything in lift_load) if(travelling) glider.set_glide_size(glide_size_override) - RegisterSignal(glider, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, .proc/on_changed_glide_size) + RegisterSignal(glider, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(on_changed_glide_size)) else LAZYREMOVE(changed_gliders, glider) UnregisterSignal(glider, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE) @@ -846,7 +846,7 @@ GLOBAL_LIST_EMPTY(lifts) new overlay(our_turf) turfs += our_turf - addtimer(CALLBACK(src, .proc/clear_turfs, turfs, iterations), 1) + addtimer(CALLBACK(src, PROC_REF(clear_turfs), turfs, iterations), 1) /obj/structure/industrial_lift/tram/proc/clear_turfs(list/turfs_to_clear, iterations) for(var/turf/our_old_turf as anything in turfs_to_clear) @@ -866,4 +866,4 @@ GLOBAL_LIST_EMPTY(lifts) turfs += our_turf if(iterations) - addtimer(CALLBACK(src, .proc/clear_turfs, turfs, iterations), 1) + addtimer(CALLBACK(src, PROC_REF(clear_turfs), turfs, iterations), 1) diff --git a/code/modules/industrial_lift/lift_indicator.dm b/code/modules/industrial_lift/lift_indicator.dm index e67d31a8613..b5fa4061318 100644 --- a/code/modules/industrial_lift/lift_indicator.dm +++ b/code/modules/industrial_lift/lift_indicator.dm @@ -52,7 +52,7 @@ continue lift_ref = WEAKREF(possible_match) - RegisterSignal(possible_match, COMSIG_LIFT_SET_DIRECTION, .proc/on_lift_direction) + RegisterSignal(possible_match, COMSIG_LIFT_SET_DIRECTION, PROC_REF(on_lift_direction)) /obj/machinery/lift_indicator/examine(mob/user) . = ..() diff --git a/code/modules/industrial_lift/lift_master.dm b/code/modules/industrial_lift/lift_master.dm index c8d226c8972..ba3ccf88791 100644 --- a/code/modules/industrial_lift/lift_master.dm +++ b/code/modules/industrial_lift/lift_master.dm @@ -68,7 +68,7 @@ GLOBAL_LIST_EMPTY(active_lifts_by_type) new_lift_platform.lift_master_datum = src LAZYADD(lift_platforms, new_lift_platform) - RegisterSignal(new_lift_platform, COMSIG_PARENT_QDELETING, .proc/remove_lift_platforms) + RegisterSignal(new_lift_platform, COMSIG_PARENT_QDELETING, PROC_REF(remove_lift_platforms)) check_for_landmarks(new_lift_platform) @@ -346,10 +346,10 @@ GLOBAL_LIST_EMPTY(active_lifts_by_type) playsound(prime_lift, 'sound/mecha/hydraulic.ogg', 25, vary = TRUE, frequency = clamp(hydraulic_sfx_duration / lift_move_duration, 0.33, 3)) // Move the lift after a timer - addtimer(CALLBACK(src, .proc/move_lift_vertically, direction, user), lift_move_duration, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(move_lift_vertically), direction, user), lift_move_duration, TIMER_UNIQUE) // Open doors after the set duration if supplied if(isnum(door_duration)) - addtimer(CALLBACK(src, .proc/open_lift_doors_callback), door_duration, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(open_lift_doors_callback)), door_duration, TIMER_UNIQUE) // Here on we only care about lifts going DOWN if(direction != DOWN) @@ -411,7 +411,7 @@ GLOBAL_LIST_EMPTY(active_lifts_by_type) user = user, ) - addtimer(CALLBACK(src, .proc/finish_simple_move_wrapper), lift_move_duration * 1.5) + addtimer(CALLBACK(src, PROC_REF(finish_simple_move_wrapper)), lift_move_duration * 1.5) return TRUE /** @@ -479,7 +479,7 @@ GLOBAL_LIST_EMPTY(active_lifts_by_type) if(QDELETED(src) || QDELETED(prime_lift)) return - addtimer(CALLBACK(src, .proc/open_lift_doors_callback), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(open_lift_doors_callback)), 2 SECONDS) SEND_SIGNAL(src, COMSIG_LIFT_SET_DIRECTION, 0) set_controls(LIFT_PLATFORM_UNLOCKED) return TRUE @@ -505,10 +505,10 @@ GLOBAL_LIST_EMPTY(active_lifts_by_type) switch(action) if(OPEN_DOORS) - INVOKE_ASYNC(elevator_door, /obj/machinery/door/poddoor.proc/open) + INVOKE_ASYNC(elevator_door, TYPE_PROC_REF(/obj/machinery/door/poddoor, open)) if(CLOSE_DOORS) - INVOKE_ASYNC(elevator_door, /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(elevator_door, TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) else stack_trace("Elevator lift update_lift_doors called with an improper action ([action]).") diff --git a/code/modules/industrial_lift/tram_controls.dm b/code/modules/industrial_lift/tram_controls.dm index a13a66a066a..75cd698b6ec 100644 --- a/code/modules/industrial_lift/tram_controls.dm +++ b/code/modules/industrial_lift/tram_controls.dm @@ -142,8 +142,8 @@ if (istype(shell, /obj/machinery/computer/tram_controls)) computer = shell var/datum/lift_master/tram/tram_part = computer.tram_ref?.resolve() - RegisterSignal(tram_part, COMSIG_TRAM_SET_TRAVELLING, .proc/on_tram_set_travelling) - RegisterSignal(tram_part, COMSIG_TRAM_TRAVEL, .proc/on_tram_travel) + RegisterSignal(tram_part, COMSIG_TRAM_SET_TRAVELLING, PROC_REF(on_tram_set_travelling)) + RegisterSignal(tram_part, COMSIG_TRAM_TRAVEL, PROC_REF(on_tram_travel)) /obj/item/circuit_component/tram_controls/unregister_usb_parent(atom/movable/shell) var/datum/lift_master/tram/tram_part = computer.tram_ref?.resolve() diff --git a/code/modules/industrial_lift/tram_desto.dm b/code/modules/industrial_lift/tram_desto.dm index 4ddb7704254..7b6b6ce7e26 100644 --- a/code/modules/industrial_lift/tram_desto.dm +++ b/code/modules/industrial_lift/tram_desto.dm @@ -40,7 +40,7 @@ var/datum/lift_master/tram/tram_part = tram_ref?.resolve() if(tram_part) - RegisterSignal(tram_part, COMSIG_TRAM_SET_TRAVELLING, .proc/on_tram_travelling) + RegisterSignal(tram_part, COMSIG_TRAM_SET_TRAVELLING, PROC_REF(on_tram_travelling)) /obj/machinery/destination_sign/Destroy() . = ..() diff --git a/code/modules/industrial_lift/tram_lift_master.dm b/code/modules/industrial_lift/tram_lift_master.dm index 24411883756..beaa1d9dc1e 100644 --- a/code/modules/industrial_lift/tram_lift_master.dm +++ b/code/modules/industrial_lift/tram_lift_master.dm @@ -49,7 +49,7 @@ /datum/lift_master/tram/add_lift_platforms(obj/structure/industrial_lift/new_lift_platform) . = ..() - RegisterSignal(new_lift_platform, COMSIG_MOVABLE_BUMP, .proc/gracefully_break) + RegisterSignal(new_lift_platform, COMSIG_MOVABLE_BUMP, PROC_REF(gracefully_break)) /datum/lift_master/tram/check_for_landmarks(obj/structure/industrial_lift/tram/new_lift_platform) . = ..() @@ -105,7 +105,7 @@ set_travelling(TRUE) set_controls(LIFT_PLATFORM_LOCKED) update_tram_doors(CLOSE_DOORS) - addtimer(CALLBACK(src, .proc/dispatch_tram, to_where), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(dispatch_tram), to_where), 2 SECONDS) /datum/lift_master/tram/proc/dispatch_tram(obj/effect/landmark/tram/to_where) SEND_SIGNAL(src, COMSIG_TRAM_TRAVEL, from_where, to_where) @@ -123,7 +123,7 @@ /datum/lift_master/tram/process(delta_time) if(!travel_distance) - addtimer(CALLBACK(src, .proc/unlock_controls), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(unlock_controls)), 3 SECONDS) return PROCESS_KILL else if(world.time >= next_move) var/start_time = TICK_USAGE @@ -188,10 +188,10 @@ continue switch(action) if(OPEN_DOORS) - INVOKE_ASYNC(tram_door, /obj/machinery/door/window.proc/open) + INVOKE_ASYNC(tram_door, TYPE_PROC_REF(/obj/machinery/door/window, open)) if(CLOSE_DOORS) - INVOKE_ASYNC(tram_door, /obj/machinery/door/window.proc/close) + INVOKE_ASYNC(tram_door, TYPE_PROC_REF(/obj/machinery/door/window, close)) else stack_trace("Tram doors update_tram_doors called with an improper action ([action]).") diff --git a/code/modules/instruments/instrument_data/_instrument_data.dm b/code/modules/instruments/instrument_data/_instrument_data.dm index 39d16e499f2..12a4b17062a 100644 --- a/code/modules/instruments/instrument_data/_instrument_data.dm +++ b/code/modules/instruments/instrument_data/_instrument_data.dm @@ -89,7 +89,7 @@ samples = list() for(var/key in real_samples) real_keys += text2num(key) - sortTim(real_keys, /proc/cmp_numeric_asc, associative = FALSE) + sortTim(real_keys, GLOBAL_PROC_REF(cmp_numeric_asc), associative = FALSE) for(var/i in 1 to (length(real_keys) - 1)) var/from_key = real_keys[i] diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index c0b29c966ca..cd083c65d2a 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -209,7 +209,7 @@ /obj/item/instrument/harmonica/equipped(mob/M, slot) . = ..() - RegisterSignal(M, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech)) /obj/item/instrument/harmonica/dropped(mob/M) . = ..() diff --git a/code/modules/instruments/piano_synth.dm b/code/modules/instruments/piano_synth.dm index 3f6ddc54d6b..630bf8819dd 100644 --- a/code/modules/instruments/piano_synth.dm +++ b/code/modules/instruments/piano_synth.dm @@ -33,8 +33,8 @@ /obj/item/instrument/piano_synth/headphones/Initialize(mapload) . = ..() AddElement(/datum/element/update_icon_updates_onmob) - RegisterSignal(src, COMSIG_INSTRUMENT_START, .proc/start_playing) - RegisterSignal(src, COMSIG_INSTRUMENT_END, .proc/stop_playing) + RegisterSignal(src, COMSIG_INSTRUMENT_START, PROC_REF(start_playing)) + RegisterSignal(src, COMSIG_INSTRUMENT_END, PROC_REF(stop_playing)) /** * Called by a component signal when our song starts playing. @@ -101,18 +101,18 @@ var/obj/item/instrument/piano_synth/synth /obj/item/circuit_component/synth/populate_ports() - song = add_input_port("Song", PORT_TYPE_LIST(PORT_TYPE_STRING), trigger = .proc/import_song) - play = add_input_port("Play", PORT_TYPE_SIGNAL, trigger = .proc/start_playing) - stop = add_input_port("Stop", PORT_TYPE_SIGNAL, trigger = .proc/stop_playing) - repetitions = add_input_port("Repetitions", PORT_TYPE_NUMBER, trigger = .proc/set_repetitions) - beats_per_min = add_input_port("BPM", PORT_TYPE_NUMBER, trigger = .proc/set_bpm) - selected_instrument = add_option_port("Selected Instrument", SSinstruments.synthesizer_instrument_ids, trigger = .proc/set_instrument) - volume = add_input_port("Volume", PORT_TYPE_NUMBER, trigger = .proc/set_volume) - volume_dropoff = add_input_port("Volume Dropoff Threshold", PORT_TYPE_NUMBER, trigger = .proc/set_dropoff) - note_shift = add_input_port("Note Shift", PORT_TYPE_NUMBER, trigger = .proc/set_note_shift) - sustain_mode = add_option_port("Note Sustain Mode", SSinstruments.note_sustain_modes, trigger = .proc/set_sustain_mode) - sustain_value = add_input_port("Note Sustain Value", PORT_TYPE_NUMBER, trigger = .proc/set_sustain_value) - note_decay = add_input_port("Held Note Decay", PORT_TYPE_NUMBER, trigger = .proc/set_sustain_decay) + song = add_input_port("Song", PORT_TYPE_LIST(PORT_TYPE_STRING), trigger = PROC_REF(import_song)) + play = add_input_port("Play", PORT_TYPE_SIGNAL, trigger = PROC_REF(start_playing)) + stop = add_input_port("Stop", PORT_TYPE_SIGNAL, trigger = PROC_REF(stop_playing)) + repetitions = add_input_port("Repetitions", PORT_TYPE_NUMBER, trigger = PROC_REF(set_repetitions)) + beats_per_min = add_input_port("BPM", PORT_TYPE_NUMBER, trigger = PROC_REF(set_bpm)) + selected_instrument = add_option_port("Selected Instrument", SSinstruments.synthesizer_instrument_ids, trigger = PROC_REF(set_instrument)) + volume = add_input_port("Volume", PORT_TYPE_NUMBER, trigger = PROC_REF(set_volume)) + volume_dropoff = add_input_port("Volume Dropoff Threshold", PORT_TYPE_NUMBER, trigger = PROC_REF(set_dropoff)) + note_shift = add_input_port("Note Shift", PORT_TYPE_NUMBER, trigger = PROC_REF(set_note_shift)) + sustain_mode = add_option_port("Note Sustain Mode", SSinstruments.note_sustain_modes, trigger = PROC_REF(set_sustain_mode)) + sustain_value = add_input_port("Note Sustain Value", PORT_TYPE_NUMBER, trigger = PROC_REF(set_sustain_value)) + note_decay = add_input_port("Held Note Decay", PORT_TYPE_NUMBER, trigger = PROC_REF(set_sustain_decay)) is_playing = add_output_port("Currently Playing", PORT_TYPE_NUMBER) started_playing = add_output_port("Started Playing", PORT_TYPE_SIGNAL) @@ -121,9 +121,9 @@ /obj/item/circuit_component/synth/register_shell(atom/movable/shell) . = ..() synth = shell - RegisterSignal(synth, COMSIG_INSTRUMENT_START, .proc/on_song_start) - RegisterSignal(synth, COMSIG_INSTRUMENT_END, .proc/on_song_end) - RegisterSignal(synth, COMSIG_INSTRUMENT_SHOULD_STOP_PLAYING, .proc/continue_if_autoplaying) + RegisterSignal(synth, COMSIG_INSTRUMENT_START, PROC_REF(on_song_start)) + RegisterSignal(synth, COMSIG_INSTRUMENT_END, PROC_REF(on_song_end)) + RegisterSignal(synth, COMSIG_INSTRUMENT_SHOULD_STOP_PLAYING, PROC_REF(continue_if_autoplaying)) /obj/item/circuit_component/synth/unregister_shell(atom/movable/shell) if(synth.song.music_player == src) diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index 7555ee09953..db8b88d1aa6 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -154,7 +154,7 @@ tempo = sanitize_tempo(tempo + text2num(href_list["tempo"])) else if(href_list["play"]) - INVOKE_ASYNC(src, .proc/start_playing, usr) + INVOKE_ASYNC(src, PROC_REF(start_playing), usr) else if(href_list["newline"]) var/newline = tgui_input_text(usr, "Enter your line ", parent.name) diff --git a/code/modules/interview/interview.dm b/code/modules/interview/interview.dm index 667c2ce51ac..ebabb9d942c 100644 --- a/code/modules/interview/interview.dm +++ b/code/modules/interview/interview.dm @@ -65,7 +65,7 @@ SEND_SOUND(owner, sound('sound/effects/adminhelp.ogg')) to_chat(owner, "-- Interview Update --" \ + "\n[span_adminsay("Your interview was approved, you will now be reconnected in 5 seconds.")]", confidential = TRUE) - addtimer(CALLBACK(src, .proc/reconnect_owner), 50) + addtimer(CALLBACK(src, PROC_REF(reconnect_owner)), 50) /** * Denies the interview and adds the owner to the cooldown for new interviews. @@ -80,7 +80,7 @@ GLOB.interviews.cooldown_ckeys |= owner_ckey log_admin_private("[key_name(denied_by)] has denied interview #[id] for [owner_ckey][!owner ? "(DC)": ""].") message_admins(span_adminnotice("[key_name(denied_by)] has denied [link_self()] for [owner_ckey][!owner ? "(DC)": ""].")) - addtimer(CALLBACK(GLOB.interviews, /datum/interview_manager.proc/release_from_cooldown, owner_ckey), 180) + addtimer(CALLBACK(GLOB.interviews, TYPE_PROC_REF(/datum/interview_manager, release_from_cooldown), owner_ckey), 180) if (owner) SEND_SOUND(owner, sound('sound/effects/adminhelp.ogg')) to_chat(owner, "-- Interview Update --" \ diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 82c9b6766f4..c93bd4a576c 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -214,7 +214,7 @@ /datum/job/proc/announce_head(mob/living/carbon/human/H, channels, job_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: /datum/job/proc/announce_head(mob/living/carbon/human/H, 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, job_title, channels), 1)) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, .proc/_addtimer, CALLBACK(pick(GLOB.announcement_systems), /obj/machinery/announcement_system/proc/announce, "NEWHEAD", H.real_name, H.job, channels), 1)) + SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_addtimer), CALLBACK(pick(GLOB.announcement_systems), /obj/machinery/announcement_system/proc/announce, "NEWHEAD", H.real_name, job_title, channels), 1)) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - Original: 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/player) diff --git a/code/modules/jobs/job_types/mime.dm b/code/modules/jobs/job_types/mime.dm index 6309ad48ef9..0e520249f1e 100644 --- a/code/modules/jobs/job_types/mime.dm +++ b/code/modules/jobs/job_types/mime.dm @@ -99,7 +99,7 @@ "Invisible Chair" = image(icon = 'icons/mob/actions/actions_mime.dmi', icon_state = "invisible_chair"), "Invisible Box" = image(icon = 'icons/mob/actions/actions_mime.dmi', icon_state = "invisible_box") ) - var/picked_spell = show_radial_menu(user, src, spell_icons, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/picked_spell = show_radial_menu(user, src, spell_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) var/datum/action/cooldown/spell/picked_spell_type switch(picked_spell) if("Invisible Wall") diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 43adc444c1c..8a1dcbd6634 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -28,7 +28,7 @@ /datum/job/prisoner/New() . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/add_pref_crime) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(add_pref_crime)) /datum/job/prisoner/proc/add_pref_crime(datum/source, mob/living/crewmember, rank) SIGNAL_HANDLER diff --git a/code/modules/library/bookcase.dm b/code/modules/library/bookcase.dm index 463956fae29..04475a9709f 100644 --- a/code/modules/library/bookcase.dm +++ b/code/modules/library/bookcase.dm @@ -35,7 +35,7 @@ update_appearance() if(SSlibrary.initialized) - INVOKE_ASYNC(src, .proc/load_shelf) + INVOKE_ASYNC(src, PROC_REF(load_shelf)) else SSlibrary.shelves_to_load += src diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 048e4507880..d142433fc99 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -56,7 +56,7 @@ /obj/machinery/computer/libraryconsole/Initialize(mapload) . = ..() category = DEFAULT_SEARCH_CATAGORY - INVOKE_ASYNC(src, .proc/update_db_info) + INVOKE_ASYNC(src, PROC_REF(update_db_info)) /obj/machinery/computer/libraryconsole/ui_interact(mob/user, datum/tgui/ui) . = ..() @@ -108,14 +108,14 @@ if(!prevent_db_spam()) say("Database cables refreshing. Please wait a moment.") return - INVOKE_ASYNC(src, .proc/update_db_info) + INVOKE_ASYNC(src, PROC_REF(update_db_info)) return TRUE if("switch_page") if(!prevent_db_spam()) say("Database cables refreshing. Please wait a moment.") return search_page = sanitize_page_input(params["page"], search_page, page_count) - INVOKE_ASYNC(src, .proc/update_db_info) + INVOKE_ASYNC(src, PROC_REF(update_db_info)) return TRUE if("clear_data") //The cap just walked in on your browsing, quick! delete it! if(!prevent_db_spam()) @@ -125,7 +125,7 @@ author = initial(author) category = DEFAULT_SEARCH_CATAGORY search_page = 0 - INVOKE_ASYNC(src, .proc/update_db_info) + INVOKE_ASYNC(src, PROC_REF(update_db_info)) return TRUE ///Checks if the machine is alloweed to make another db request yet. TRUE if so, FALSE otherwise @@ -475,7 +475,7 @@ if(!(upload_category in SSlibrary.upload_categories)) //Nice try upload_category = DEFAULT_UPLOAD_CATAGORY - INVOKE_ASYNC(src, .proc/upload_from_scanner, upload_category) + INVOKE_ASYNC(src, PROC_REF(upload_from_scanner), upload_category) return TRUE if("news_post") if(!GLOB.news_network) @@ -497,14 +497,14 @@ return TRUE if("print_book") var/id = params["book_id"] - attempt_print(CALLBACK(src, .proc/print_book, id)) + attempt_print(CALLBACK(src, PROC_REF(print_book), id)) return TRUE if("print_bible") - attempt_print(CALLBACK(src, .proc/print_bible)) + attempt_print(CALLBACK(src, PROC_REF(print_bible))) return TRUE if("print_poster") var/poster_name = params["poster_name"] - attempt_print(CALLBACK(src, .proc/print_poster, poster_name)) + attempt_print(CALLBACK(src, PROC_REF(print_poster), poster_name)) return TRUE if("lore_spawn") if(obj_flags & EMAGGED && can_spawn_lore) @@ -788,7 +788,7 @@ busy = TRUE playsound(src, 'sound/machines/printer.ogg', 50) flick("binder1", src) - addtimer(CALLBACK(src, .proc/bind_book, draw_from), 4.1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(bind_book), draw_from), 4.1 SECONDS) /obj/machinery/bookbinder/proc/bind_book(obj/item/paper/draw_from) busy = FALSE diff --git a/code/modules/library/skill_learning/skill_station.dm b/code/modules/library/skill_learning/skill_station.dm index ac4f324685e..61832579df8 100644 --- a/code/modules/library/skill_learning/skill_station.dm +++ b/code/modules/library/skill_learning/skill_station.dm @@ -114,7 +114,7 @@ CRASH("Unusual error - [usr] attempted to start implanting of [inserted_skillchip] when the interface state should not have allowed it.") working = TRUE - work_timer = addtimer(CALLBACK(src,.proc/implant),SKILLCHIP_IMPLANT_TIME,TIMER_STOPPABLE) + work_timer = addtimer(CALLBACK(src, PROC_REF(implant)),SKILLCHIP_IMPLANT_TIME,TIMER_STOPPABLE) update_appearance() /// Finish implanting. @@ -141,7 +141,7 @@ CRASH("Unusual error - [usr] attempted to start removal of [to_be_removed] when the interface state should not have allowed it.") working = TRUE - work_timer = addtimer(CALLBACK(src,.proc/remove_skillchip,to_be_removed),SKILLCHIP_REMOVAL_TIME,TIMER_STOPPABLE) + work_timer = addtimer(CALLBACK(src, PROC_REF(remove_skillchip),to_be_removed),SKILLCHIP_REMOVAL_TIME,TIMER_STOPPABLE) update_appearance() /// Finish removal. diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index 0ad9c4e3669..23858096319 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -80,7 +80,7 @@ LAZYADD(new_atom_host.light_sources, src) if(ismovable(new_atom_host) && new_atom_host == source_atom) - RegisterSignal(new_atom_host, COMSIG_MOVABLE_MOVED, .proc/update_host_lights) + RegisterSignal(new_atom_host, COMSIG_MOVABLE_MOVED, PROC_REF(update_host_lights)) return TRUE ///remove this light source from old_atom_host's light_sources list, unsetting movement registrations diff --git a/code/modules/mafia/controller.dm b/code/modules/mafia/controller.dm index 2702a1f0236..894c415b281 100644 --- a/code/modules/mafia/controller.dm +++ b/code/modules/mafia/controller.dm @@ -177,10 +177,10 @@ if(turn == 1) send_message(span_notice("The selected map is [current_map.name]!
    [current_map.description]")) send_message("Day [turn] started! There is no voting on the first day. Say hello to everybody!") - next_phase_timer = addtimer(CALLBACK(src,.proc/check_trial, FALSE),first_day_phase_period,TIMER_STOPPABLE) //no voting period = no votes = instant night + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(check_trial), FALSE),first_day_phase_period,TIMER_STOPPABLE) //no voting period = no votes = instant night else send_message("Day [turn] started! Voting will start in 1 minute.") - next_phase_timer = addtimer(CALLBACK(src,.proc/start_voting_phase),day_phase_period,TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(start_voting_phase)),day_phase_period,TIMER_STOPPABLE) SStgui.update_uis(src) @@ -193,7 +193,7 @@ */ /datum/mafia_controller/proc/start_voting_phase() phase = MAFIA_PHASE_VOTING - next_phase_timer = addtimer(CALLBACK(src, .proc/check_trial, TRUE),voting_phase_period,TIMER_STOPPABLE) //be verbose! + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(check_trial), TRUE),voting_phase_period,TIMER_STOPPABLE) //be verbose! send_message("Voting started! Vote for who you want to see on trial today.") SStgui.update_uis(src) @@ -225,7 +225,7 @@ on_trial = loser on_trial.body.forceMove(get_turf(town_center_landmark)) phase = MAFIA_PHASE_JUDGEMENT - next_phase_timer = addtimer(CALLBACK(src, .proc/lynch),judgement_phase_period,TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(lynch)),judgement_phase_period,TIMER_STOPPABLE) reset_votes("Day") else if(verbose) @@ -254,13 +254,13 @@ if(judgement_guilty_votes.len > judgement_innocent_votes.len) //strictly need majority guilty to lynch send_message(span_red("Guilty wins majority, [on_trial.body.real_name] has been lynched.")) on_trial.kill(src,lynch = TRUE) - addtimer(CALLBACK(src, .proc/send_home, on_trial),judgement_lynch_period) + addtimer(CALLBACK(src, PROC_REF(send_home), on_trial),judgement_lynch_period) else send_message(span_green("Innocent wins majority, [on_trial.body.real_name] has been spared.")) on_trial.body.forceMove(get_turf(on_trial.assigned_landmark)) on_trial = null //day votes are already cleared, so this will skip the trial and check victory/lockdown/whatever else - next_phase_timer = addtimer(CALLBACK(src, .proc/check_trial, FALSE),judgement_lynch_period,TIMER_STOPPABLE)// small pause to see the guy dead, no verbosity since we already did this + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(check_trial), FALSE),judgement_lynch_period,TIMER_STOPPABLE)// small pause to see the guy dead, no verbosity since we already did this /** * Teenie helper proc to move players back to their home. @@ -375,7 +375,7 @@ for(var/datum/mafia_role/R in all_roles) R.reveal_role(src) phase = MAFIA_PHASE_VICTORY_LAP - next_phase_timer = addtimer(CALLBACK(src,.proc/end_game),victory_lap_period,TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(end_game)),victory_lap_period,TIMER_STOPPABLE) /** * Cleans up the game, resetting variables back to the beginning and removing the map with the generator. @@ -416,9 +416,9 @@ if(D.id != "mafia") //so as to not trigger shutters on station, lol continue if(close) - INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/close) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, close)) else - INVOKE_ASYNC(D, /obj/machinery/door/poddoor.proc/open) + INVOKE_ASYNC(D, TYPE_PROC_REF(/obj/machinery/door/poddoor, open)) /** * The actual start of night for players. Mostly info is given at the start of the night as the end of the night is when votes and actions are submitted and tried. @@ -431,7 +431,7 @@ phase = MAFIA_PHASE_NIGHT send_message("Night [turn] started! Lockdown will end in 45 seconds.") SEND_SIGNAL(src,COMSIG_MAFIA_SUNDOWN) - next_phase_timer = addtimer(CALLBACK(src, .proc/resolve_night),night_phase_period,TIMER_STOPPABLE) + next_phase_timer = addtimer(CALLBACK(src, PROC_REF(resolve_night)),night_phase_period,TIMER_STOPPABLE) SStgui.update_uis(src) /** @@ -531,7 +531,7 @@ tally[votes[vote_type][votee]] = 1 else tally[votes[vote_type][votee]] += 1 - sortTim(tally,/proc/cmp_numeric_dsc,associative=TRUE) + sortTim(tally, GLOBAL_PROC_REF(cmp_numeric_dsc),associative=TRUE) return length(tally) ? tally[1] : null /** @@ -575,7 +575,7 @@ ADD_TRAIT(H, TRAIT_CANNOT_CRYSTALIZE, MAFIA_TRAIT) H.equipOutfit(player_outfit) H.status_flags |= GODMODE - RegisterSignal(H,COMSIG_ATOM_UPDATE_OVERLAYS,.proc/display_votes) + RegisterSignal(H,COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(display_votes)) var/datum/action/innate/mafia_panel/mafia_panel = new(null,src) mafia_panel.Grant(H) var/client/player_client = GLOB.directory[role.player_key] diff --git a/code/modules/mafia/roles.dm b/code/modules/mafia/roles.dm index f7569c77765..24df15bb91b 100644 --- a/code/modules/mafia/roles.dm +++ b/code/modules/mafia/roles.dm @@ -159,7 +159,7 @@ /datum/mafia_role/detective/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/investigate) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(investigate)) /datum/mafia_role/detective/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -219,7 +219,7 @@ /datum/mafia_role/psychologist/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/therapy_reveal) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(therapy_reveal)) /datum/mafia_role/psychologist/validate_action_target(datum/mafia_controller/game, action, datum/mafia_role/target) . = ..() @@ -259,7 +259,7 @@ /datum/mafia_role/chaplain/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/commune) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(commune)) /datum/mafia_role/chaplain/validate_action_target(datum/mafia_controller/game, action, datum/mafia_role/target) . = ..() @@ -298,8 +298,8 @@ /datum/mafia_role/md/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/protect) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/end_protection) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(protect)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(end_protection)) /datum/mafia_role/md/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -326,7 +326,7 @@ if(!target.can_action(game, src, "medical assistance")) return - RegisterSignal(target,COMSIG_MAFIA_ON_KILL,.proc/prevent_kill) + RegisterSignal(target,COMSIG_MAFIA_ON_KILL, PROC_REF(prevent_kill)) add_note("N[game.turn] - Protected [target.body.real_name]") /datum/mafia_role/md/proc/prevent_kill(datum/source,datum/mafia_controller/game,datum/mafia_role/attacker,lynch) @@ -361,8 +361,8 @@ /datum/mafia_role/officer/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/defend) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/end_defense) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(defend)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(end_defense)) /datum/mafia_role/officer/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -389,7 +389,7 @@ if(!target.can_action(game, src, "security patrol")) return if(target) - RegisterSignal(target,COMSIG_MAFIA_ON_KILL,.proc/retaliate) + RegisterSignal(target,COMSIG_MAFIA_ON_KILL, PROC_REF(retaliate)) add_note("N[game.turn] - Defended [target.body.real_name]") /datum/mafia_role/officer/proc/retaliate(datum/source,datum/mafia_controller/game,datum/mafia_role/attacker,lynch) @@ -426,8 +426,8 @@ /datum/mafia_role/lawyer/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/roleblock) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/release) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(roleblock)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(release)) /datum/mafia_role/lawyer/proc/roleblock(datum/mafia_controller/game) SIGNAL_HANDLER @@ -510,7 +510,7 @@ /datum/mafia_role/hos/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/execute) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(execute)) /datum/mafia_role/hos/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -542,7 +542,7 @@ target.reveal_role(game, verbose = TRUE) if(target.team == MAFIA_TEAM_TOWN) to_chat(body,span_userdanger("You have killed an innocent crewmember. You will die tomorrow night.")) - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/internal_affairs) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(internal_affairs)) role_flags |= ROLE_VULNERABLE /datum/mafia_role/hos/proc/internal_affairs(datum/mafia_controller/game) @@ -574,8 +574,8 @@ /datum/mafia_role/warden/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/night_start) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/night_end) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(night_start)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(night_end)) /datum/mafia_role/warden/handle_action(datum/mafia_controller/game, action, datum/mafia_role/target) . = ..() @@ -596,7 +596,7 @@ if(protection_status == WARDEN_WILL_LOCKDOWN) to_chat(body,span_danger("Any and all visitors are going to eat buckshot tonight.")) - RegisterSignal(src,COMSIG_MAFIA_ON_VISIT,.proc/self_defense) + RegisterSignal(src,COMSIG_MAFIA_ON_VISIT, PROC_REF(self_defense)) /datum/mafia_role/warden/proc/night_end(datum/mafia_controller/game) SIGNAL_HANDLER @@ -635,7 +635,7 @@ /datum/mafia_role/mafia/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/mafia_text) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(mafia_text)) /datum/mafia_role/mafia/proc/mafia_text(datum/mafia_controller/source) SIGNAL_HANDLER @@ -656,7 +656,7 @@ /datum/mafia_role/mafia/thoughtfeeder/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE,.proc/investigate) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_ACTION_PHASE, PROC_REF(investigate)) /datum/mafia_role/mafia/thoughtfeeder/validate_action_target(datum/mafia_controller/game,action,datum/mafia_role/target) . = ..() @@ -703,8 +703,8 @@ /datum/mafia_role/traitor/New(datum/mafia_controller/game) . = ..() - RegisterSignal(src,COMSIG_MAFIA_ON_KILL,.proc/nightkill_immunity) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_KILL_PHASE,.proc/try_to_kill) + RegisterSignal(src,COMSIG_MAFIA_ON_KILL, PROC_REF(nightkill_immunity)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_KILL_PHASE, PROC_REF(try_to_kill)) /datum/mafia_role/traitor/check_total_victory(alive_town, alive_mafia) //serial killers just want teams dead, they cannot be stopped by killing roles anyways return alive_town + alive_mafia <= 1 @@ -765,8 +765,8 @@ /datum/mafia_role/nightmare/New(datum/mafia_controller/game) . = ..() - RegisterSignal(src,COMSIG_MAFIA_ON_KILL,.proc/flickering_immunity) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_KILL_PHASE,.proc/flicker_or_hunt) + RegisterSignal(src,COMSIG_MAFIA_ON_KILL, PROC_REF(flickering_immunity)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_KILL_PHASE, PROC_REF(flicker_or_hunt)) /datum/mafia_role/nightmare/check_total_victory(alive_town, alive_mafia) //nightmares just want teams dead return alive_town + alive_mafia <= 1 @@ -853,9 +853,9 @@ /datum/mafia_role/fugitive/New(datum/mafia_controller/game) . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/night_start) - RegisterSignal(game,COMSIG_MAFIA_NIGHT_END,.proc/night_end) - RegisterSignal(game,COMSIG_MAFIA_GAME_END,.proc/survived) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(night_start)) + RegisterSignal(game,COMSIG_MAFIA_NIGHT_END, PROC_REF(night_end)) + RegisterSignal(game,COMSIG_MAFIA_GAME_END, PROC_REF(survived)) /datum/mafia_role/fugitive/handle_action(datum/mafia_controller/game, action, datum/mafia_role/target) . = ..() @@ -876,7 +876,7 @@ if(protection_status == FUGITIVE_WILL_PRESERVE) to_chat(body,span_danger("Your preparations are complete. Nothing could kill you tonight!")) - RegisterSignal(src,COMSIG_MAFIA_ON_KILL,.proc/prevent_death) + RegisterSignal(src,COMSIG_MAFIA_ON_KILL, PROC_REF(prevent_death)) /datum/mafia_role/fugitive/proc/night_end(datum/mafia_controller/game) SIGNAL_HANDLER @@ -920,7 +920,7 @@ /datum/mafia_role/obsessed/New(datum/mafia_controller/game) //note: obsession is always a townie . = ..() - RegisterSignal(game,COMSIG_MAFIA_SUNDOWN,.proc/find_obsession) + RegisterSignal(game,COMSIG_MAFIA_SUNDOWN, PROC_REF(find_obsession)) /datum/mafia_role/obsessed/proc/find_obsession(datum/mafia_controller/game) SIGNAL_HANDLER @@ -936,7 +936,7 @@ //if you still don't have an obsession you're playing a single player game like i can't help your dumb ass to_chat(body, span_userdanger("Your obsession is [obsession.body.real_name]! Get them lynched to win!")) add_note("N[game.turn] - I vowed to watch my obsession, [obsession.body.real_name], hang!") //it'll always be N1 but whatever - RegisterSignal(obsession,COMSIG_MAFIA_ON_KILL,.proc/check_victory) + RegisterSignal(obsession,COMSIG_MAFIA_ON_KILL, PROC_REF(check_victory)) UnregisterSignal(game,COMSIG_MAFIA_SUNDOWN) /datum/mafia_role/obsessed/proc/check_victory(datum/source,datum/mafia_controller/game,datum/mafia_role/attacker,lynch) @@ -966,7 +966,7 @@ /datum/mafia_role/clown/New(datum/mafia_controller/game) . = ..() - RegisterSignal(src,COMSIG_MAFIA_ON_KILL,.proc/prank) + RegisterSignal(src,COMSIG_MAFIA_ON_KILL, PROC_REF(prank)) /datum/mafia_role/clown/proc/prank(datum/source,datum/mafia_controller/game,datum/mafia_role/attacker,lynch) SIGNAL_HANDLER diff --git a/code/modules/mapfluff/ruins/lavalandruin_code/biodome_winter.dm b/code/modules/mapfluff/ruins/lavalandruin_code/biodome_winter.dm index 5aac6cf3180..1149e5af4fe 100644 --- a/code/modules/mapfluff/ruins/lavalandruin_code/biodome_winter.dm +++ b/code/modules/mapfluff/ruins/lavalandruin_code/biodome_winter.dm @@ -32,7 +32,7 @@ if(ismovable(hit_atom) && !caught && (!thrown_by || thrown_by && COOLDOWN_FINISHED(src, freeze_cooldown))) freeze_hit_atom(hit_atom) if(thrown_by && !caught) - addtimer(CALLBACK(src, /atom/movable.proc/throw_at, thrown_by, throw_range+2, throw_speed, null, TRUE), 1) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, throw_range+2, throw_speed, null, TRUE), 1) /obj/item/freeze_cube/proc/freeze_hit_atom(atom/movable/hit_atom) playsound(src, 'sound/effects/glassbr3.ogg', 50, TRUE) diff --git a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm index 5ce3a0899a8..1257956d91e 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/ash_walker_den.dm @@ -66,7 +66,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/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm index 0c85138bb6b..04c88057e99 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/necropolis_gate.dm @@ -47,7 +47,7 @@ add_overlay(dais_overlay) var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -251,7 +251,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) . = ..() icon_state = "[tile_key][rand(1, tile_random_sprite_max)]" var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -274,7 +274,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate) switch(fall_on_cross) if(COLLAPSE_ON_CROSS, DESTROY_ON_CROSS) if((I && I.w_class >= WEIGHT_CLASS_BULKY) || (L && !(L.movement_type & FLYING) && L.mob_size >= MOB_SIZE_HUMAN)) //too heavy! too big! aaah! - INVOKE_ASYNC(src, .proc/collapse) + INVOKE_ASYNC(src, PROC_REF(collapse)) if(UNIQUE_EFFECT) crossed_effect(AM) @@ -293,7 +293,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/mapfluff/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm index 043879f5f83..acb351813cf 100644 --- a/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/mapfluff/ruins/objects_and_mobs/sin_ruins.dm @@ -33,7 +33,7 @@ icon_screen = "slots_screen_working" update_appearance() playsound(src, 'sound/lavaland/cursed_slot_machine.ogg', 50, FALSE) - addtimer(CALLBACK(src, .proc/determine_victor, user), 50) + addtimer(CALLBACK(src, PROC_REF(determine_victor), user), 50) /obj/structure/cursed_slot_machine/proc/determine_victor(mob/living/user) icon_screen = "slots_screen" @@ -65,7 +65,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/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm index b47e5a365ff..d187f2d099a 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm @@ -25,7 +25,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) /obj/item/hilbertshotel/Initialize(mapload) . = ..() //Load templates - INVOKE_ASYNC(src, .proc/prepare_rooms) + INVOKE_ASYNC(src, PROC_REF(prepare_rooms)) /obj/item/hilbertshotel/proc/prepare_rooms() hotelRoomTemp = new() @@ -346,12 +346,12 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) var/datum/action/peephole_cancel/PHC = new user.overlay_fullscreen("remote_view", /atom/movable/screen/fullscreen/impaired, 1) PHC.Grant(user) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, /atom/.proc/check_eye, user) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/, check_eye), user) /turf/closed/indestructible/hoteldoor/check_eye(mob/user) if(get_dist(get_turf(src), get_turf(user)) >= 2) for(var/datum/action/peephole_cancel/PHC in user.actions) - INVOKE_ASYNC(PHC, /datum/action/peephole_cancel.proc/Trigger) + INVOKE_ASYNC(PHC, TYPE_PROC_REF(/datum/action/peephole_cancel, Trigger)) /datum/action/peephole_cancel name = "Cancel View" diff --git a/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm b/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm index 1c754575de9..4c2fd8952c1 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm @@ -147,10 +147,10 @@ if(!occupant || !mod_unit || busy) return set_busy(TRUE, "[initial(icon_state)]_raising") - addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_active"), 2.5 SECONDS) - addtimer(CALLBACK(src, .proc/play_install_sound), 2.5 SECONDS) - addtimer(CALLBACK(src, .proc/set_busy, TRUE, "[initial(icon_state)]_falling"), 5 SECONDS) - addtimer(CALLBACK(src, .proc/complete_process), 7.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_active"), 2.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(play_install_sound)), 2.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(set_busy), TRUE, "[initial(icon_state)]_falling"), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(complete_process)), 7.5 SECONDS) /obj/machinery/mod_installer/proc/complete_process() set_busy(FALSE) @@ -183,7 +183,7 @@ if(!state_open) return FALSE ..() - addtimer(CALLBACK(src, .proc/start_process), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_process)), 1 SECONDS) return TRUE /obj/machinery/mod_installer/relaymove(mob/living/user, direction) diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index d622e205247..9f442c05cb7 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -728,7 +728,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) /obj/effect/mapping_helpers/circuit_spawner/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/spawn_circuit) + INVOKE_ASYNC(src, PROC_REF(spawn_circuit)) /obj/effect/mapping_helpers/circuit_spawner/proc/spawn_circuit() var/list/errors = list() diff --git a/code/modules/mapping/modular_map_loader/modular_map_loader.dm b/code/modules/mapping/modular_map_loader/modular_map_loader.dm index d753c4a439e..f5b336960f2 100644 --- a/code/modules/mapping/modular_map_loader/modular_map_loader.dm +++ b/code/modules/mapping/modular_map_loader/modular_map_loader.dm @@ -15,7 +15,7 @@ INITIALIZE_IMMEDIATE(/obj/modular_map_root) /obj/modular_map_root/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/load_map) + INVOKE_ASYNC(src, PROC_REF(load_map)) /// Randonly selects a map file from the TOML config specified in config_file, loads it, then deletes itself. /obj/modular_map_root/proc/load_map() diff --git a/code/modules/meteors/meteors.dm b/code/modules/meteors/meteors.dm index d1759656aab..2a13d542045 100644 --- a/code/modules/meteors/meteors.dm +++ b/code/modules/meteors/meteors.dm @@ -169,7 +169,7 @@ GLOBAL_LIST_INIT(meteorsD, list(/obj/effect/meteor/medium=15, /obj/effect/meteor if(!new_loop) return - RegisterSignal(new_loop, COMSIG_PARENT_QDELETING, .proc/handle_stopping) + RegisterSignal(new_loop, COMSIG_PARENT_QDELETING, PROC_REF(handle_stopping)) ///Deals with what happens when we stop moving, IE we die /obj/effect/meteor/proc/handle_stopping() diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index e849b653aef..985397e73ba 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -358,7 +358,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/computer/auxiliary_base, 32) return anti_spam_cd = 1 - addtimer(CALLBACK(src, .proc/clear_cooldown), 50) + addtimer(CALLBACK(src, PROC_REF(clear_cooldown)), 50) var/turf/landing_spot = get_turf(src) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 613b4f5c947..3c369fac091 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -219,7 +219,7 @@ /obj/item/clothing/suit/hooded/cloak/godslayer/equipped(mob/user, slot) . = ..() if(slot & ITEM_SLOT_OCLOTHING) - RegisterSignal(user, COMSIG_MOB_STATCHANGE, .proc/resurrect) + RegisterSignal(user, COMSIG_MOB_STATCHANGE, PROC_REF(resurrect)) return UnregisterSignal(user, COMSIG_MOB_STATCHANGE) diff --git a/code/modules/mining/equipment/kheiral_cuffs.dm b/code/modules/mining/equipment/kheiral_cuffs.dm index 30553187402..e1412d55515 100644 --- a/code/modules/mining/equipment/kheiral_cuffs.dm +++ b/code/modules/mining/equipment/kheiral_cuffs.dm @@ -25,7 +25,7 @@ /obj/item/kheiral_cuffs/Initialize(mapload) . = ..() update_icon(UPDATE_OVERLAYS) - RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, .proc/check_z) + RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(check_z)) check_z(new_turf = loc) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index f794eb7e5b6..325c05f3912 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -144,7 +144,7 @@ destabilizer.fire() charged = FALSE update_appearance() - addtimer(CALLBACK(src, .proc/Recharge), charge_time) + addtimer(CALLBACK(src, PROC_REF(Recharge)), charge_time) /obj/item/kinetic_crusher/proc/Recharge() if(!charged) @@ -359,7 +359,7 @@ continue playsound(L, 'sound/magic/fireball.ogg', 20, TRUE) new /obj/effect/temp_visual/fire(L.loc) - addtimer(CALLBACK(src, .proc/pushback, L, user), 1) //no free backstabs, we push AFTER module stuff is done + addtimer(CALLBACK(src, PROC_REF(pushback), L, user), 1) //no free backstabs, we push AFTER module stuff is done L.adjustFireLoss(bonus_value, forced = TRUE) /obj/item/crusher_trophy/tail_spike/proc/pushback(mob/living/target, mob/living/user) @@ -423,7 +423,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/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 76c9a56405f..2115961eaec 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -224,7 +224,7 @@ "Shovel" = image(icon = icon, icon_state = "trench_tool_shovel"), "Pick" = image(icon = icon, icon_state = "trench_tool_pick"), ) - 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) || !tool_result) return switch(tool_result) diff --git a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm index 9c15616e7db..76723344832 100644 --- a/code/modules/mining/equipment/monster_organs/brimdust_sac.dm +++ b/code/modules/mining/equipment/monster_organs/brimdust_sac.dm @@ -124,8 +124,8 @@ dust_overlay = mutable_appearance('icons/effects/weather_effects.dmi', "ash_storm") dust_overlay.blend_mode = BLEND_INSET_OVERLAY owner.add_overlay(dust_overlay) - RegisterSignal(owner, COMSIG_COMPONENT_CLEAN_ACT, .proc/on_cleaned) - RegisterSignal(owner, COMSIG_MOB_APPLY_DAMAGE, .proc/on_take_damage) + RegisterSignal(owner, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_cleaned)) + RegisterSignal(owner, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_take_damage)) /datum/status_effect/stacking/brimdust_coating/on_remove() . = ..() @@ -146,7 +146,7 @@ if(!COOLDOWN_FINISHED(src, explosion_cooldown)) return owner.visible_message(span_boldwarning("The brimstone dust surrounding [owner] ignites!")) - addtimer(CALLBACK(src, .proc/explode), 0.25 SECONDS) + addtimer(CALLBACK(src, PROC_REF(explode)), 0.25 SECONDS) COOLDOWN_START(src, explosion_cooldown, delay_between_explosions) /** diff --git a/code/modules/mining/equipment/monster_organs/monster_organ.dm b/code/modules/mining/equipment/monster_organs/monster_organ.dm index 0562c416d67..0cdc4cb19d3 100644 --- a/code/modules/mining/equipment/monster_organs/monster_organ.dm +++ b/code/modules/mining/equipment/monster_organs/monster_organ.dm @@ -60,7 +60,7 @@ /obj/item/organ/internal/monster_core/Initialize(mapload) . = ..() - decay_timer = addtimer(CALLBACK(src, .proc/go_inert), time_to_decay, TIMER_STOPPABLE) + decay_timer = addtimer(CALLBACK(src, PROC_REF(go_inert)), time_to_decay, TIMER_STOPPABLE) /obj/item/organ/internal/monster_core/Destroy(force, silent) deltimer(decay_timer) diff --git a/code/modules/mining/equipment/monster_organs/rush_gland.dm b/code/modules/mining/equipment/monster_organs/rush_gland.dm index c450ebe2d98..84b08de0ddf 100644 --- a/code/modules/mining/equipment/monster_organs/rush_gland.dm +++ b/code/modules/mining/equipment/monster_organs/rush_gland.dm @@ -42,8 +42,8 @@ /datum/status_effect/lobster_rush/on_apply() . = ..() - RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, .proc/on_move) - RegisterSignal(owner, COMSIG_MOVABLE_BUMP, .proc/on_bump) + RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(on_move)) + RegisterSignal(owner, COMSIG_MOVABLE_BUMP, PROC_REF(on_bump)) ADD_TRAIT(owner, TRAIT_IGNORESLOWDOWN, TRAIT_STATUS_EFFECT(id)) owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/lobster_rush) to_chat(owner, span_notice("You feel your blood pumping!")) diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index 2f1e7731bc8..2ce50dcd7b2 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -76,9 +76,9 @@ if(mode == RESONATOR_MODE_MATRIX) icon_state = "shield2" name = "resonance matrix" - RegisterSignal(src, COMSIG_ATOM_ENTERED, .proc/burst) + RegisterSignal(src, COMSIG_ATOM_ENTERED, PROC_REF(burst)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/burst, + COMSIG_ATOM_ENTERED = PROC_REF(burst), ) AddElement(/datum/element/connect_loc, loc_connections) . = ..() @@ -92,7 +92,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(parent_resonator) diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index dc70a9d18c9..beaa8b5c880 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -112,4 +112,4 @@ L.Paralyze(60) if(ishuman(L)) shake_camera(L, 20, 1) - addtimer(CALLBACK(L, /mob/living/carbon.proc/vomit), 20) + addtimer(CALLBACK(L, TYPE_PROC_REF(/mob/living/carbon, vomit)), 20) diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 04b73e91d6b..4641a6aba0f 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)) //ignore no-value sheets and x/fifty subtypes continue sheet_list += list(list("ore" = initial(sheet.name), "value" = initial(sheet.point_value))) - GLOB.labor_sheet_values = sort_list(sheet_list, /proc/cmp_sheet_list) + GLOB.labor_sheet_values = sort_list(sheet_list, GLOBAL_PROC_REF(cmp_sheet_list)) /obj/machinery/mineral/labor_claim_console/Destroy() QDEL_NULL(security_radio) diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index 29c9e089282..94c2a82568b 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -181,7 +181,7 @@ for(var/t in RANGE_TURFS(1, source)) new /obj/effect/temp_visual/hierophant/blast/visual(t, user, TRUE) for(var/mob/living/L in range(1, source)) - INVOKE_ASYNC(src, .proc/teleport_mob, source, L, T, user) + INVOKE_ASYNC(src, PROC_REF(teleport_mob), source, L, T, user) sleep(0.6 SECONDS) //at this point the blasts detonate if(beacon) beacon.icon_state = "hierophant_tele_off" @@ -315,7 +315,7 @@ butcher_sound = null, \ disabled = null, \ can_be_blunt = TRUE, \ - butcher_callback = CALLBACK(src, .proc/consume), \ + butcher_callback = CALLBACK(src, PROC_REF(consume)), \ ) AddElement(/datum/element/radiation_protected_clothing) AddComponent(/datum/component/gags_recolorable) @@ -373,10 +373,10 @@ /obj/item/soulscythe/Initialize(mapload) . = ..() soul = new(src) - RegisterSignal(soul, COMSIG_LIVING_RESIST, .proc/on_resist) - RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED, .proc/on_attack) - RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED_SECONDARY, .proc/on_secondary_attack) - RegisterSignal(src, COMSIG_ATOM_INTEGRITY_CHANGED, .proc/on_integrity_change) + RegisterSignal(soul, COMSIG_LIVING_RESIST, PROC_REF(on_resist)) + RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED, PROC_REF(on_attack)) + RegisterSignal(soul, COMSIG_MOB_ATTACK_RANGED_SECONDARY, PROC_REF(on_secondary_attack)) + RegisterSignal(src, COMSIG_ATOM_INTEGRITY_CHANGED, PROC_REF(on_integrity_change)) /obj/item/soulscythe/examine(mob/user) . = ..() @@ -477,7 +477,7 @@ if(isturf(loc)) return - INVOKE_ASYNC(src, .proc/break_out) + INVOKE_ASYNC(src, PROC_REF(break_out)) /obj/item/soulscythe/proc/break_out() if(!use_blood(10)) @@ -503,16 +503,16 @@ if(!COOLDOWN_FINISHED(src, attack_cooldown) || !isturf(loc)) return if(get_dist(source, attacked_atom) > 1) - INVOKE_ASYNC(src, .proc/shoot_target, attacked_atom) + INVOKE_ASYNC(src, PROC_REF(shoot_target), attacked_atom) else - INVOKE_ASYNC(src, .proc/slash_target, attacked_atom) + INVOKE_ASYNC(src, PROC_REF(slash_target), attacked_atom) /obj/item/soulscythe/proc/on_secondary_attack(mob/living/source, atom/attacked_atom, modifiers) SIGNAL_HANDLER if(!COOLDOWN_FINISHED(src, attack_cooldown) || !isturf(loc)) return - INVOKE_ASYNC(src, .proc/charge_target, attacked_atom) + INVOKE_ASYNC(src, PROC_REF(charge_target), attacked_atom) /obj/item/soulscythe/proc/shoot_target(atom/attacked_atom) if(!use_blood(15)) @@ -540,7 +540,7 @@ COOLDOWN_START(src, attack_cooldown, 1 SECONDS) animate(src) SpinAnimation(5) - addtimer(CALLBACK(src, .proc/reset_spin), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_spin)), 1 SECONDS) visible_message(span_danger("[src] slashes [attacked_atom]!"), span_notice("You slash [attacked_atom]!")) playsound(src, 'sound/weapons/bladeslice.ogg', 50, TRUE) do_attack_animation(attacked_atom, ATTACK_EFFECT_SLASH) @@ -858,7 +858,7 @@ w_class_on = w_class, \ attack_verb_continuous_on = list("cleaves", "swipes", "slashes", "chops"), \ attack_verb_simple_on = list("cleave", "swipe", "slash", "chop")) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/melee/cleaving_saw/examine(mob/user) . = ..() @@ -1026,9 +1026,9 @@ targeted_turfs += target_turf balloon_alert(user, "you aim at [target_turf]...") new /obj/effect/temp_visual/telegraphing/thunderbolt(target_turf) - addtimer(CALLBACK(src, .proc/throw_thunderbolt, target_turf, power_boosted), 1.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(throw_thunderbolt), target_turf, power_boosted), 1.5 SECONDS) thunder_charges-- - addtimer(CALLBACK(src, .proc/recharge), thunder_charge_time) + addtimer(CALLBACK(src, PROC_REF(recharge)), thunder_charge_time) user.log_message("fired the staff of storms at [AREACOORD(target_turf)].", LOG_ATTACK) /obj/item/storm_staff/proc/recharge(mob/user) diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 9d55a2efad9..11ddb2395e7 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -169,7 +169,7 @@ ADD_TRAIT(user, TRAIT_NODEATH, CLOTHING_TRAIT) ADD_TRAIT(user, TRAIT_NOHARDCRIT, CLOTHING_TRAIT) ADD_TRAIT(user, TRAIT_NOCRITDAMAGE, CLOTHING_TRAIT) - RegisterSignal(user, COMSIG_CARBON_HEALTH_UPDATE, .proc/check_health) + RegisterSignal(user, COMSIG_CARBON_HEALTH_UPDATE, PROC_REF(check_health)) icon_state = "memento_mori_active" active_owner = user @@ -282,7 +282,7 @@ /obj/effect/wisp/orbit(atom/thing, radius, clockwise, rotation_speed, rotation_segments, pre_rotation, lockinorbit) . = ..() if(ismob(thing)) - RegisterSignal(thing, COMSIG_MOB_UPDATE_SIGHT, .proc/update_user_sight) + RegisterSignal(thing, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight)) var/mob/being = thing being.update_sight() to_chat(thing, span_notice("The wisp enhances your vision.")) @@ -436,7 +436,7 @@ user_ref = WEAKREF(user) - addtimer(CALLBACK(src, .proc/dissipate), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(dissipate)), 10 SECONDS) /obj/effect/immortality_talisman/proc/dissipate() qdel(src) @@ -599,8 +599,8 @@ . = ..() if(slot & ITEM_SLOT_GLOVES) tool_behaviour = TOOL_MINING - RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/rocksmash) - RegisterSignal(user, COMSIG_MOVABLE_BUMP, .proc/rocksmash) + RegisterSignal(user, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(rocksmash)) + RegisterSignal(user, COMSIG_MOVABLE_BUMP, PROC_REF(rocksmash)) else stopmining(user) @@ -821,11 +821,11 @@ living_scanned.set_jitter_if_lower(100 SECONDS) to_chat(living_scanned, span_warning("You've been staggered!")) living_scanned.add_filter("scan", 2, list("type" = "outline", "color" = COLOR_YELLOW, "size" = 1)) - addtimer(CALLBACK(living_scanned, /atom/.proc/remove_filter, "scan"), 30 SECONDS) + addtimer(CALLBACK(living_scanned, TYPE_PROC_REF(/atom/, remove_filter), "scan"), 30 SECONDS) owner.playsound_local(get_turf(owner), 'sound/magic/smoke.ogg', 50, TRUE) owner.balloon_alert(owner, "[living_scanned] scanned") - addtimer(CALLBACK(src, .proc/send_cooldown_end_message, cooldown_time)) + addtimer(CALLBACK(src, PROC_REF(send_cooldown_end_message), cooldown_time)) StartCooldown() return TRUE @@ -921,13 +921,13 @@ var/list/input_list = list() var/list/combo_strings = list() var/static/list/combo_list = list( - ATTACK_STRIKE = list(COMBO_STEPS = list(LEFT_SLASH, LEFT_SLASH, RIGHT_SLASH), COMBO_PROC = .proc/strike), - ATTACK_SLICE = list(COMBO_STEPS = list(RIGHT_SLASH, LEFT_SLASH, LEFT_SLASH), COMBO_PROC = .proc/slice), - ATTACK_DASH = list(COMBO_STEPS = list(LEFT_SLASH, RIGHT_SLASH, RIGHT_SLASH), COMBO_PROC = .proc/dash), - ATTACK_CUT = list(COMBO_STEPS = list(RIGHT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = .proc/cut), - ATTACK_CLOAK = list(COMBO_STEPS = list(LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH), COMBO_PROC = .proc/cloak), - ATTACK_SHATTER = list(COMBO_STEPS = list(RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = .proc/shatter), - ) + ATTACK_STRIKE = list(COMBO_STEPS = list(LEFT_SLASH, LEFT_SLASH, RIGHT_SLASH), COMBO_PROC = PROC_REF(strike)), + ATTACK_SLICE = list(COMBO_STEPS = list(RIGHT_SLASH, LEFT_SLASH, LEFT_SLASH), COMBO_PROC = PROC_REF(slice)), + ATTACK_DASH = list(COMBO_STEPS = list(LEFT_SLASH, RIGHT_SLASH, RIGHT_SLASH), COMBO_PROC = PROC_REF(dash)), + ATTACK_CUT = list(COMBO_STEPS = list(RIGHT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = PROC_REF(cut)), + ATTACK_CLOAK = list(COMBO_STEPS = list(LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH), COMBO_PROC = PROC_REF(cloak)), + ATTACK_SHATTER = list(COMBO_STEPS = list(RIGHT_SLASH, LEFT_SLASH, RIGHT_SLASH, LEFT_SLASH), COMBO_PROC = PROC_REF(shatter)), + ) /obj/item/cursed_katana/Initialize(mapload) . = ..() @@ -975,7 +975,7 @@ reset_inputs(null, TRUE) return TRUE else - timerid = addtimer(CALLBACK(src, .proc/reset_inputs, user, FALSE), 5 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(reset_inputs), user, FALSE), 5 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) return ..() /obj/item/cursed_katana/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) @@ -1003,7 +1003,7 @@ span_notice("You hilt strike [target]!")) to_chat(target, span_userdanger("You've been struck by [user]!")) playsound(src, 'sound/weapons/genhit3.ogg', 50, TRUE) - RegisterSignal(target, COMSIG_MOVABLE_IMPACT, .proc/strike_throw_impact) + RegisterSignal(target, COMSIG_MOVABLE_IMPACT, PROC_REF(strike_throw_impact)) var/atom/throw_target = get_edge_target_turf(target, user.dir) target.throw_at(throw_target, 5, 3, user, FALSE, gentle = TRUE) target.apply_damage(damage = 17, bare_wound_bonus = 10) @@ -1049,8 +1049,9 @@ playsound(src, 'sound/magic/smoke.ogg', 50, TRUE) if(ishostile(target)) var/mob/living/simple_animal/hostile/hostile_target = target - hostile_target.LoseTarget() - addtimer(CALLBACK(src, .proc/uncloak, user), 5 SECONDS, TIMER_UNIQUE) + if(hostile_target.target == user) + hostile_target.LoseTarget() + addtimer(CALLBACK(src, PROC_REF(uncloak), user), 5 SECONDS, TIMER_UNIQUE) /obj/item/cursed_katana/proc/uncloak(mob/user) user.alpha = 255 @@ -1101,7 +1102,7 @@ shattered = TRUE moveToNullspace() balloon_alert(user, "katana shattered") - addtimer(CALLBACK(src, .proc/coagulate, user), 45 SECONDS) + addtimer(CALLBACK(src, PROC_REF(coagulate), user), 45 SECONDS) /obj/item/cursed_katana/proc/coagulate(mob/user) balloon_alert(user, "katana coagulated") diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 44efcad0e1f..1f6de708617 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -24,7 +24,7 @@ /obj/machinery/mineral/proc/register_input_turf() input_turf = get_step(src, input_dir) if(input_turf) // make sure there is actually a turf - RegisterSignal(input_turf, list(COMSIG_ATOM_INITIALIZED_ON, COMSIG_ATOM_ENTERED), .proc/pickup_item) + RegisterSignal(input_turf, list(COMSIG_ATOM_INITIALIZED_ON, COMSIG_ATOM_ENTERED), PROC_REF(pickup_item)) /// Unregisters signals that are registered the machine's input turf, if it has one. /obj/machinery/mineral/proc/unregister_input_turf() diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index 9ece938f545..66ab8ec2931 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -147,7 +147,7 @@ if(!console_notify_timer) // gives 5 seconds for a load of ores to be sucked up by the ORM before it sends out request console notifications. This should be enough time for most deposits that people make - console_notify_timer = addtimer(CALLBACK(src, .proc/send_console_message), 5 SECONDS) + console_notify_timer = addtimer(CALLBACK(src, PROC_REF(send_console_message)), 5 SECONDS) /obj/machinery/mineral/ore_redemption/default_unfasten_wrench(mob/user, obj/item/I) . = ..() diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 54d6845881f..4dc083af1e1 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -194,7 +194,7 @@ option.info = span_boldnotice(current_set.description) items[set_name] = option - var/selection = show_radial_menu(redeemer, src, items, custom_check = CALLBACK(src, .proc/check_menu, voucher, redeemer), radius = 38, require_near = TRUE, tooltips = TRUE) + var/selection = show_radial_menu(redeemer, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), voucher, redeemer), radius = 38, require_near = TRUE, tooltips = TRUE) if(!selection) return diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 2e183773d71..f744682a367 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -305,7 +305,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ else user.visible_message(span_warning("[user] strikes \the [src], causing a chain reaction!"), span_danger("You strike \the [src], causing a chain reaction.")) log_bomber(user, "has primed a", src, "for detonation", notify_admins) - det_timer = addtimer(CALLBACK(src, .proc/detonate, notify_admins), det_time, TIMER_STOPPABLE) + det_timer = addtimer(CALLBACK(src, PROC_REF(detonate), notify_admins), det_time, TIMER_STOPPABLE) /obj/item/gibtonite/proc/detonate(notify_admins) if(primed) @@ -372,7 +372,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ if (!attack_self(user)) user.visible_message(span_suicide("[user] couldn't flip \the [src]!")) return SHAME - addtimer(CALLBACK(src, .proc/manual_suicide, user), 10)//10 = time takes for flip animation + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 10)//10 = time takes for flip animation return MANUAL_SUICIDE_NONLETHAL /obj/item/coin/proc/manual_suicide(mob/living/user) diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index 4e24cb6fc96..89f1ae5260a 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -31,7 +31,7 @@ //SKYRAT EDIT ADDITION var/soft_player_cap = CONFIG_GET(number/player_soft_cap) if(soft_player_cap >= TGS_CLIENT_COUNT) - INVOKE_ASYNC(src, .proc/connect_to_second_server) + INVOKE_ASYNC(src, PROC_REF(connect_to_second_server)) //SKYRAT EDIT END var/spc = CONFIG_GET(number/soft_popcap) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 48db6ac0f48..adb89342e3b 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -938,7 +938,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp client.perspective = EYE_PERSPECTIVE if(is_secret_level(mob_eye.z) && !client?.holder) set_sight(null) //we dont want ghosts to see through walls in secret areas - RegisterSignal(mob_eye, COMSIG_MOVABLE_Z_CHANGED, .proc/on_observing_z_changed) + RegisterSignal(mob_eye, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(on_observing_z_changed)) if(mob_eye.hud_used) client.screen = list() LAZYOR(mob_eye.observers, src) diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm index dd31f6c085d..6ea9a55bed7 100644 --- a/code/modules/mob/dead/observer/orbit.dm +++ b/code/modules/mob/dead/observer/orbit.dm @@ -23,7 +23,7 @@ GLOBAL_DATUM_INIT(orbit_menu, /datum/orbit_menu, new) var/auto_observe = params["auto_observe"] var/atom/poi = SSpoints_of_interest.get_poi_atom_by_ref(ref) - if((ismob(poi) && !SSpoints_of_interest.is_valid_poi(poi, CALLBACK(src, .proc/validate_mob_poi))) \ + if((ismob(poi) && !SSpoints_of_interest.is_valid_poi(poi, CALLBACK(src, PROC_REF(validate_mob_poi)))) \ || !SSpoints_of_interest.is_valid_poi(poi) ) to_chat(usr, span_notice("That point of interest is no longer valid.")) @@ -40,7 +40,7 @@ GLOBAL_DATUM_INIT(orbit_menu, /datum/orbit_menu, new) return TRUE /datum/orbit_menu/ui_static_data(mob/user) - var/list/new_mob_pois = SSpoints_of_interest.get_mob_pois(CALLBACK(src, .proc/validate_mob_poi), append_dead_role = FALSE) + var/list/new_mob_pois = SSpoints_of_interest.get_mob_pois(CALLBACK(src, PROC_REF(validate_mob_poi)), append_dead_role = FALSE) var/list/new_other_pois = SSpoints_of_interest.get_other_pois() var/list/alive = list() diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index f15cd065767..f03720d717e 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -428,7 +428,7 @@ set name = "quick-equip" set hidden = TRUE - DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/execute_quick_equip)) + DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(execute_quick_equip))) ///proc extender of [/mob/verb/quick_equip] used to make the verb queuable if the server is overloaded /mob/proc/execute_quick_equip() diff --git a/code/modules/mob/living/basic/farm_animals/cow/_cow.dm b/code/modules/mob/living/basic/farm_animals/cow/_cow.dm index 9250e418e3b..2efe81029ad 100644 --- a/code/modules/mob/living/basic/farm_animals/cow/_cow.dm +++ b/code/modules/mob/living/basic/farm_animals/cow/_cow.dm @@ -40,7 +40,7 @@ tip_time = 0.5 SECONDS, \ untip_time = 0.5 SECONDS, \ self_right_time = rand(25 SECONDS, 50 SECONDS), \ - post_tipped_callback = CALLBACK(src, .proc/after_cow_tipped)) + post_tipped_callback = CALLBACK(src, PROC_REF(after_cow_tipped))) AddElement(/datum/element/pet_bonus, "moos happily!") AddElement(/datum/element/swabable, CELL_LINE_TABLE_COW, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) udder_component() @@ -62,7 +62,7 @@ var/static/list/food_types if(!food_types) food_types = src.food_types.Copy() - AddComponent(/datum/component/tameable, food_types = food_types, tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = food_types, tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, PROC_REF(tamed))) AddElement(/datum/element/basic_eating, 10, food_types) /mob/living/basic/cow/proc/tamed(mob/living/tamer) @@ -77,7 +77,7 @@ * tipper - the mob who tipped us */ /mob/living/basic/cow/proc/after_cow_tipped(mob/living/carbon/tipper) - addtimer(CALLBACK(src, .proc/set_tip_react_blackboard, tipper), rand(10 SECONDS, 20 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(set_tip_react_blackboard), tipper), rand(10 SECONDS, 20 SECONDS)) /* * We've been waiting long enough, we're going to tell our AI to begin pleading. diff --git a/code/modules/mob/living/basic/farm_animals/cow/cow_moonicorn.dm b/code/modules/mob/living/basic/farm_animals/cow/cow_moonicorn.dm index 5897597c2f6..d5a1250144d 100644 --- a/code/modules/mob/living/basic/farm_animals/cow/cow_moonicorn.dm +++ b/code/modules/mob/living/basic/farm_animals/cow/cow_moonicorn.dm @@ -35,7 +35,7 @@ if(!food_types) food_types = src.food_types.Copy() AddElement(/datum/element/basic_eating, 10, food_types) - AddComponent(/datum/component/tameable, food_types = food_types, tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = food_types, tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/basic/cow/moonicorn/tamed(mob/living/tamer) . = ..() diff --git a/code/modules/mob/living/basic/farm_animals/pig.dm b/code/modules/mob/living/basic/farm_animals/pig.dm index 5f21f905ba9..42bf1d546e8 100644 --- a/code/modules/mob/living/basic/farm_animals/pig.dm +++ b/code/modules/mob/living/basic/farm_animals/pig.dm @@ -34,7 +34,7 @@ ///wrapper for the tameable component addition so you can have non tamable cow subtypes /mob/living/basic/pig/proc/make_tameable() - AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/carrot), tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/carrot), tame_chance = 25, bonus_tame_chance = 15, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/basic/pig/proc/tamed(mob/living/tamer) can_buckle = TRUE diff --git a/code/modules/mob/living/basic/farm_animals/sheep.dm b/code/modules/mob/living/basic/farm_animals/sheep.dm index 54580063066..b28c35b334b 100644 --- a/code/modules/mob/living/basic/farm_animals/sheep.dm +++ b/code/modules/mob/living/basic/farm_animals/sheep.dm @@ -43,7 +43,7 @@ item_harvest_time = 5 SECONDS, \ item_harvest_sound = 'sound/surgery/scalpel1.ogg', \ ) - RegisterSignal(src, COMSIG_LIVING_CULT_SACRIFICED, .proc/on_sacrificed) + RegisterSignal(src, COMSIG_LIVING_CULT_SACRIFICED, PROC_REF(on_sacrificed)) /mob/living/basic/sheep/update_overlays() . = ..() @@ -65,7 +65,7 @@ to_chat(cultist, span_cultitalic("This feels a bit too cliché, don't you think?")) cult_converted = TRUE - INVOKE_ASYNC(src, /atom/movable.proc/say, "BAAAAAAAAH!") + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), "BAAAAAAAAH!") update_appearance(UPDATE_ICON) return STOP_SACRIFICE diff --git a/code/modules/mob/living/basic/vermin/cockroach.dm b/code/modules/mob/living/basic/vermin/cockroach.dm index 25467e0825c..905f9a3be18 100644 --- a/code/modules/mob/living/basic/vermin/cockroach.dm +++ b/code/modules/mob/living/basic/vermin/cockroach.dm @@ -120,7 +120,7 @@ /mob/living/basic/cockroach/hauberoach/Initialize(mapload) . = ..() AddComponent(/datum/component/caltrop, min_damage = 10, max_damage = 15, flags = (CALTROP_BYPASS_SHOES | CALTROP_SILENT)) - AddComponent(/datum/component/squashable, squash_chance = 100, squash_damage = 1, squash_callback = /mob/living/basic/cockroach/hauberoach/.proc/on_squish) + AddComponent(/datum/component/squashable, squash_chance = 100, squash_damage = 1, squash_callback = TYPE_PROC_REF(/mob/living/basic/cockroach/hauberoach, on_squish)) ///Proc used to override the squashing behavior of the normal cockroach. /mob/living/basic/cockroach/hauberoach/proc/on_squish(mob/living/cockroach, mob/living/living_target) diff --git a/code/modules/mob/living/basic/vermin/mouse.dm b/code/modules/mob/living/basic/vermin/mouse.dm index 8409c20b6cb..b2df748810e 100644 --- a/code/modules/mob/living/basic/vermin/mouse.dm +++ b/code/modules/mob/living/basic/vermin/mouse.dm @@ -50,7 +50,7 @@ AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg' = 1), 100, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) //as quiet as a mouse or whatever var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm index 68b7ec552d8..6d08cf55692 100644 --- a/code/modules/mob/living/brain/posibrain.dm +++ b/code/modules/mob/living/brain/posibrain.dm @@ -70,7 +70,7 @@ GLOBAL_VAR(posibrain_notify_cooldown) next_ask = world.time + ask_delay searching = TRUE update_appearance() - addtimer(CALLBACK(src, .proc/check_success), ask_delay) + addtimer(CALLBACK(src, PROC_REF(check_success)), ask_delay) /obj/item/mmi/posibrain/AltClick(mob/living/user) if(!istype(user) || !user.canUseTopic(src, be_close = TRUE)) diff --git a/code/modules/mob/living/carbon/alien/adult/adult.dm b/code/modules/mob/living/carbon/alien/adult/adult.dm index 6492e0e6279..700f9fef6e0 100644 --- a/code/modules/mob/living/carbon/alien/adult/adult.dm +++ b/code/modules/mob/living/carbon/alien/adult/adult.dm @@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(strippable_alien_humanoid_items, create_strippable_list(list( span_userdanger("[src] is attempting to devour you!")) playsound(lucky_winner, 'sound/creatures/alien_eat.ogg', 100) - if(!do_mob(src, lucky_winner, devour_time, extra_checks = CALLBACK(src, .proc/can_consume, lucky_winner))) + if(!do_mob(src, lucky_winner, devour_time, extra_checks = CALLBACK(src, PROC_REF(can_consume), lucky_winner))) return TRUE if(!can_consume(lucky_winner)) return TRUE diff --git a/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm b/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm index 31f92b9dc3c..701558c7a60 100644 --- a/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/adult/caste/hunter.dm @@ -50,7 +50,7 @@ body_position_pixel_y_offset = -32 update_icons() ADD_TRAIT(src, TRAIT_MOVE_FLOATING, LEAPING_TRAIT) //Throwing itself doesn't protect mobs against lava (because gulag). - throw_at(A, MAX_ALIEN_LEAP_DIST, 1, src, FALSE, TRUE, callback = CALLBACK(src, .proc/leap_end)) + throw_at(A, MAX_ALIEN_LEAP_DIST, 1, src, FALSE, TRUE, callback = CALLBACK(src, PROC_REF(leap_end))) /mob/living/carbon/alien/adult/hunter/proc/leap_end() leaping = FALSE diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index fde88ac4cb3..ff99019a6fd 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -122,7 +122,7 @@ recent_queen_death = TRUE owner.throw_alert(ALERT_XENO_NOQUEEN, /atom/movable/screen/alert/alien_vulnerable) - addtimer(CALLBACK(src, .proc/clear_queen_death), QUEEN_DEATH_DEBUFF_DURATION) + addtimer(CALLBACK(src, PROC_REF(clear_queen_death)), QUEEN_DEATH_DEBUFF_DURATION) /obj/item/organ/internal/alien/hivenode/proc/clear_queen_death() @@ -198,11 +198,11 @@ qdel(thing) /obj/item/organ/internal/stomach/alien/proc/consume_thing(atom/movable/thing) - RegisterSignal(thing, COMSIG_MOVABLE_MOVED, .proc/content_moved) - RegisterSignal(thing, COMSIG_PARENT_QDELETING, .proc/content_deleted) + RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(content_moved)) + RegisterSignal(thing, COMSIG_PARENT_QDELETING, PROC_REF(content_deleted)) if(isliving(thing)) var/mob/living/lad = thing - RegisterSignal(thing, COMSIG_LIVING_DEATH, .proc/content_died) + RegisterSignal(thing, COMSIG_LIVING_DEATH, PROC_REF(content_died)) if(lad.stat == DEAD) qdel(lad) return @@ -225,7 +225,7 @@ UnregisterSignal(source, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING)) /obj/item/organ/internal/stomach/alien/Insert(mob/living/carbon/stomach_owner, special = FALSE, drop_if_replaced = TRUE) - RegisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE, .proc/something_moved) + RegisterSignal(stomach_owner, COMSIG_ATOM_RELAYMOVE, PROC_REF(something_moved)) return ..() /obj/item/organ/internal/stomach/alien/Remove(mob/living/carbon/stomach_owner, special = FALSE) 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 1da88655509..3909fbb5d76 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -59,12 +59,12 @@ if(stage >= 6) return if(++stage < 6) - INVOKE_ASYNC(src, .proc/RefreshInfectionImage) + INVOKE_ASYNC(src, PROC_REF(RefreshInfectionImage)) var/slowdown = 1 if(ishuman(owner)) var/mob/living/carbon/human/baby_momma = owner slowdown = baby_momma.reagents.has_reagent(/datum/reagent/medicine/spaceacillin) ? 2 : 1 // spaceacillin doubles the time it takes to grow - addtimer(CALLBACK(src, .proc/advance_embryo_stage), growth_time*slowdown) + addtimer(CALLBACK(src, PROC_REF(advance_embryo_stage)), growth_time*slowdown) /obj/item/organ/internal/body_egg/alien_embryo/egg_process() if(stage == 6 && prob(50)) @@ -89,7 +89,7 @@ if(!candidates.len || !owner) bursting = FALSE stage = 5 // If no ghosts sign up for the Larva, let's regress our growth by one minute, we will try again! - addtimer(CALLBACK(src, .proc/advance_embryo_stage), growth_time) + addtimer(CALLBACK(src, PROC_REF(advance_embryo_stage)), growth_time) return var/mob/dead/observer/ghost = pick(candidates) diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 9154e64176f..d6e4e1a6e61 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -39,12 +39,12 @@ /obj/item/clothing/mask/facehugger/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/atmos_sensitive, mapload) - RegisterSignal(src, COMSIG_LIVING_TRYING_TO_PULL, .proc/react_to_mob) + RegisterSignal(src, COMSIG_LIVING_TRYING_TO_PULL, PROC_REF(react_to_mob)) /obj/item/clothing/mask/facehugger/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir) ..() @@ -112,7 +112,7 @@ return if(stat == CONSCIOUS) icon_state = "[base_icon_state]_thrown" - addtimer(CALLBACK(src, .proc/clear_throw_icon_state), 15) + addtimer(CALLBACK(src, PROC_REF(clear_throw_icon_state)), 15) /obj/item/clothing/mask/facehugger/proc/clear_throw_icon_state() if(icon_state == "[base_icon_state]_thrown") @@ -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 @@ -238,7 +238,7 @@ icon_state = "[base_icon_state]_inactive" worn_icon_state = "[base_icon_state]_inactive" - addtimer(CALLBACK(src, .proc/GoActive), rand(MIN_ACTIVE_TIME, MAX_ACTIVE_TIME)) + addtimer(CALLBACK(src, PROC_REF(GoActive)), rand(MIN_ACTIVE_TIME, MAX_ACTIVE_TIME)) /obj/item/clothing/mask/facehugger/proc/Die() if(stat == DEAD) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 124b9a97ec6..f6081f53035 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -9,8 +9,8 @@ GLOB.carbon_list += src var/static/list/loc_connections = list( - COMSIG_CARBON_DISARM_PRESHOVE = .proc/disarm_precollide, - COMSIG_CARBON_DISARM_COLLIDE = .proc/disarm_collision, + COMSIG_CARBON_DISARM_PRESHOVE = PROC_REF(disarm_precollide), + COMSIG_CARBON_DISARM_COLLIDE = PROC_REF(disarm_collision), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -389,7 +389,7 @@ switch(rand(1,100)+modifier) //91-100=Nothing special happens if(-INFINITY to 0) //attack yourself - INVOKE_ASYNC(I, /obj/item.proc/attack, src, src) + INVOKE_ASYNC(I, TYPE_PROC_REF(/obj/item, attack), src, src) if(1 to 30) //throw it at yourself I.throw_impact(src) if(31 to 60) //Throw object in facing direction @@ -1104,7 +1104,7 @@ for(var/i in artpaths) var/datum/martial_art/M = i artnames[initial(M.name)] = M - var/result = input(usr, "Choose the martial art to teach","JUDO CHOP") as null|anything in sort_list(artnames, /proc/cmp_typepaths_asc) + var/result = input(usr, "Choose the martial art to teach","JUDO CHOP") as null|anything in sort_list(artnames, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!usr) return if(QDELETED(src)) @@ -1120,7 +1120,7 @@ if(!check_rights(NONE)) return var/list/traumas = subtypesof(/datum/brain_trauma) - var/result = input(usr, "Choose the brain trauma to apply","Traumatize") as null|anything in sort_list(traumas, /proc/cmp_typepaths_asc) + var/result = input(usr, "Choose the brain trauma to apply","Traumatize") as null|anything in sort_list(traumas, GLOBAL_PROC_REF(cmp_typepaths_asc)) if(!usr) return if(QDELETED(src)) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 6d05fe73de9..52049034be2 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -444,7 +444,7 @@ do_jitter_animation(300) adjust_jitter(20 SECONDS) adjust_stutter(4 SECONDS) - addtimer(CALLBACK(src, .proc/secondary_shock, should_stun), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(secondary_shock), should_stun), 2 SECONDS) return shock_damage ///Called slightly after electrocute act to apply a secondary stun. @@ -819,8 +819,8 @@ grasped_part = grasping_part grasped_part.grasped_by = src grasped_part.refresh_bleed_rate() - RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/qdel_void) - RegisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING), .proc/qdel_void) + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(qdel_void)) + RegisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING), PROC_REF(qdel_void)) user.visible_message(span_danger("[user] grasps at [user.p_their()] [grasped_part.name], trying to stop the bleeding."), span_notice("You grab hold of your [grasped_part.name] tightly."), vision_distance=COMBAT_MESSAGE_RANGE) playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1) diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm index fa3ddfcf1fb..8dc49313495 100644 --- a/code/modules/mob/living/carbon/death.dm +++ b/code/modules/mob/living/carbon/death.dm @@ -5,7 +5,7 @@ losebreath = 0 if(!gibbed) - INVOKE_ASYNC(src, .proc/emote, "deathgasp") + INVOKE_ASYNC(src, PROC_REF(emote), "deathgasp") reagents.end_metabolization(src) add_memory_in_range(src, 7, MEMORY_DEATH, list(DETAIL_PROTAGONIST = src), memory_flags = MEMORY_FLAG_NOMOOD, story_value = STORY_VALUE_OKAY, memory_flags = MEMORY_CHECK_BLIND_AND_DEAF) @@ -20,7 +20,7 @@ BT.on_death() /mob/living/carbon/proc/inflate_gib() // Plays an animation that makes mobs appear to inflate before finally gibbing - addtimer(CALLBACK(src, .proc/gib, null, null, TRUE, TRUE), 25) + addtimer(CALLBACK(src, PROC_REF(gib), null, null, TRUE, TRUE), 25) var/matrix/M = matrix() M.Scale(1.8, 1.2) animate(src, time = 40, transform = M, easing = SINE_EASING) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 3999fb98f43..172fb167c0c 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -22,7 +22,7 @@ var/list/key_emotes = GLOB.emote_list["cry"] for(var/datum/emote/living/carbon/human/cry/human_emote in key_emotes) // The existing timer restarts if it is already running - addtimer(CALLBACK(human_emote, .proc/end_visual, human_user), CRY_DURATION, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(human_emote, PROC_REF(end_visual), human_user), CRY_DURATION, TIMER_UNIQUE | TIMER_OVERRIDE) /datum/emote/living/carbon/human/cry/proc/end_visual(mob/living/carbon/human/human_user) if(!QDELETED(human_user)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 5d4c4fa3dc8..4f1bf01f9fd 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -13,7 +13,7 @@ prepare_huds() //Prevents a nasty runtime on human init if(dna.species) - INVOKE_ASYNC(src, .proc/set_species, dna.species.type) + INVOKE_ASYNC(src, PROC_REF(set_species), dna.species.type) //initialise organs create_internal_organs() //most of it is done in set_species now, this is only for parent call @@ -21,14 +21,14 @@ . = ..() - RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, .proc/clean_face) + RegisterSignal(src, COMSIG_COMPONENT_CLEAN_FACE_ACT, PROC_REF(clean_face)) AddComponent(/datum/component/personal_crafting) AddElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 0.6, -6) //SKYRAT EDIT CHANGE - AESTHETICS AddComponent(/datum/component/bloodysoles/feet) AddElement(/datum/element/ridable, /datum/component/riding/creature/human) - AddElement(/datum/element/strippable, GLOB.strippable_human_items, /mob/living/carbon/human/.proc/should_strip) + AddElement(/datum/element/strippable, GLOB.strippable_human_items, TYPE_PROC_REF(/mob/living/carbon/human/, should_strip)) 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) GLOB.human_list += src @@ -721,7 +721,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) @@ -1091,7 +1091,7 @@ /mob/living/carbon/human/species/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/set_species, race) + INVOKE_ASYNC(src, PROC_REF(set_species), race) /mob/living/carbon/human/species/set_species(datum/species/mrace, icon_update = TRUE, pref_load = FALSE, list/override_features, list/override_mutantparts, list/override_markings, retain_features = FALSE, retain_mutantparts = FALSE) // SKYRAT EDIT - Customization . = ..() diff --git a/code/modules/mob/living/carbon/human/init_signals.dm b/code/modules/mob/living/carbon/human/init_signals.dm index 2b3e8a855bc..16d7916ed3e 100644 --- a/code/modules/mob/living/carbon/human/init_signals.dm +++ b/code/modules/mob/living/carbon/human/init_signals.dm @@ -1,7 +1,7 @@ /mob/living/carbon/human/register_init_signals() . = ..() - RegisterSignal(src, list(SIGNAL_ADDTRAIT(TRAIT_UNKNOWN), SIGNAL_REMOVETRAIT(TRAIT_UNKNOWN)), .proc/on_unknown_trait) + RegisterSignal(src, list(SIGNAL_ADDTRAIT(TRAIT_UNKNOWN), SIGNAL_REMOVETRAIT(TRAIT_UNKNOWN)), PROC_REF(on_unknown_trait)) /// Gaining or losing [TRAIT_UNKNOWN] updates our name and our sechud /mob/living/carbon/human/proc/on_unknown_trait(datum/source) diff --git a/code/modules/mob/living/carbon/human/monkey/monkey.dm b/code/modules/mob/living/carbon/human/monkey/monkey.dm index 18953f53ed6..fdb5c54f91e 100644 --- a/code/modules/mob/living/carbon/human/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/human/monkey/monkey.dm @@ -24,7 +24,7 @@ /mob/living/carbon/human/species/monkey/angry/Initialize(mapload) . = ..() if(prob(10)) - INVOKE_ASYNC(src, .proc/give_ape_escape_helmet) + INVOKE_ASYNC(src, PROC_REF(give_ape_escape_helmet)) /// Gives our funny monkey an Ape Escape hat reference /mob/living/carbon/human/species/monkey/angry/proc/give_ape_escape_helmet() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 4631cbdce0a..546546da64b 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -457,7 +457,7 @@ GLOBAL_LIST_EMPTY(features_by_species) replace_body(C, src) regenerate_organs(C, old_species, visual_only = C.visual_only_organs) - INVOKE_ASYNC(src, .proc/worn_items_fit_body_check, C) + INVOKE_ASYNC(src, PROC_REF(worn_items_fit_body_check), C) if(exotic_bloodtype && C.dna.blood_type != exotic_bloodtype) C.dna.blood_type = exotic_bloodtype @@ -1072,7 +1072,7 @@ GLOBAL_LIST_EMPTY(features_by_species) if(time_since_irradiated > RAD_MOB_HAIRLOSS && DT_PROB(RAD_MOB_HAIRLOSS_PROB, delta_time)) if(!(source.hairstyle == "Bald") && (HAIR in species_traits)) to_chat(source, span_danger("Your hair starts to fall out in clumps...")) - addtimer(CALLBACK(src, .proc/go_bald, source), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(go_bald), source), 5 SECONDS) /** * Makes the target human bald. @@ -1394,7 +1394,7 @@ GLOBAL_LIST_EMPTY(features_by_species) H.update_damage_overlays() else//no bodypart, we deal damage with a more general method. H.adjustBruteLoss(damage_amount) - INVOKE_ASYNC(H, /mob/living/carbon/human/.proc/adjust_pain, damage_amount) // SKYRAT EDIT ADDITION - ERP Pain + INVOKE_ASYNC(H, TYPE_PROC_REF(/mob/living/carbon/human, adjust_pain), damage_amount) // SKYRAT EDIT ADDITION - ERP Pain if(BURN) H.damageoverlaytemp = 20 var/damage_amount = forced ? damage : damage * hit_percent * burnmod * H.physiology.burn_mod @@ -1403,7 +1403,7 @@ GLOBAL_LIST_EMPTY(features_by_species) H.update_damage_overlays() else H.adjustFireLoss(damage_amount) - INVOKE_ASYNC(H, /mob/living/carbon/human/.proc/adjust_pain, damage_amount) // SKYRAT EDIT ADDITION - ERP Pain + INVOKE_ASYNC(H, TYPE_PROC_REF(/mob/living/carbon/human, adjust_pain), damage_amount) // SKYRAT EDIT ADDITION - ERP Pain if(TOX) var/damage_amount = forced ? damage : damage * hit_percent * H.physiology.tox_mod H.adjustToxLoss(damage_amount) diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm index 2c233c3d79f..1f77defbc89 100644 --- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm +++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm @@ -210,9 +210,9 @@ return INITIALIZE_HINT_QDEL owner = new_owner START_PROCESSING(SSobj, src) - RegisterSignal(owner, COMSIG_CLICK_SHIFT, .proc/examinate_check) - RegisterSignal(owner, COMSIG_LIVING_REGENERATE_LIMBS, .proc/unlist_head) - RegisterSignal(owner, COMSIG_LIVING_REVIVE, .proc/retrieve_head) + RegisterSignal(owner, COMSIG_CLICK_SHIFT, PROC_REF(examinate_check)) + RegisterSignal(owner, COMSIG_LIVING_REGENERATE_LIMBS, PROC_REF(unlist_head)) + RegisterSignal(owner, COMSIG_LIVING_REVIVE, PROC_REF(retrieve_head)) become_hearing_sensitive(ROUNDSTART_TRAIT) /obj/item/dullahan_relay/Destroy() diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index fa0b9f8b92b..316999da1a3 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -62,9 +62,9 @@ r1 = GETREDPART(default_color) g1 = GETGREENPART(default_color) b1 = GETBLUEPART(default_color) - RegisterSignal(ethereal, COMSIG_ATOM_EMAG_ACT, .proc/on_emag_act) - RegisterSignal(ethereal, COMSIG_ATOM_EMP_ACT, .proc/on_emp_act) - RegisterSignal(ethereal, COMSIG_LIGHT_EATER_ACT, .proc/on_light_eater) + RegisterSignal(ethereal, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag_act)) + RegisterSignal(ethereal, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act)) + RegisterSignal(ethereal, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) ethereal_light = ethereal.mob_light() spec_updatehealth(ethereal) C.set_safe_hunger_level() @@ -125,9 +125,9 @@ to_chat(H, span_notice("You feel the light of your body leave you.")) switch(severity) if(EMP_LIGHT) - addtimer(CALLBACK(src, .proc/stop_emp, H), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 10 seconds + addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 10 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 10 seconds if(EMP_HEAVY) - addtimer(CALLBACK(src, .proc/stop_emp, H), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 20 seconds + addtimer(CALLBACK(src, PROC_REF(stop_emp), H), 20 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) //We're out for 20 seconds /datum/species/ethereal/proc/on_emag_act(mob/living/carbon/human/H, mob/user) SIGNAL_HANDLER @@ -138,7 +138,7 @@ to_chat(user, span_notice("You tap [H] on the back with your card.")) H.visible_message(span_danger("[H] starts flickering in an array of colors!")) handle_emag(H) - addtimer(CALLBACK(src, .proc/stop_emag, H), 2 MINUTES) //Disco mode for 2 minutes! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass. + addtimer(CALLBACK(src, PROC_REF(stop_emag), H), 2 MINUTES) //Disco mode for 2 minutes! This doesn't affect the ethereal at all besides either annoying some players, or making someone look badass. /// Special handling for getting hit with a light eater /datum/species/ethereal/proc/on_light_eater(mob/living/carbon/human/source, datum/light_eater) @@ -157,7 +157,7 @@ return current_color = GLOB.color_list_ethereal[pick(GLOB.color_list_ethereal)] spec_updatehealth(H) - addtimer(CALLBACK(src, .proc/handle_emag, H), 5) //Call ourselves every 0.5 seconds to change color + addtimer(CALLBACK(src, PROC_REF(handle_emag), H), 5) //Call ourselves every 0.5 seconds to change color /datum/species/ethereal/proc/stop_emag(mob/living/carbon/human/H) emageffect = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 47230d46520..08ec7820404 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -557,7 +557,7 @@ is_charging = TRUE UpdateButtons() //action icon looks unavailable playsound(get_turf(H), 'sound/weapons/flash.ogg', 25, TRUE) - addtimer(CALLBACK(src, .proc/teleport, H), 15) + addtimer(CALLBACK(src, PROC_REF(teleport), H), 15) /datum/action/innate/unstable_teleport/proc/teleport(mob/living/carbon/human/H) H.visible_message(span_warning("[H] disappears in a shower of sparks!"), span_danger("You teleport!")) @@ -568,7 +568,7 @@ do_teleport(H, get_turf(H), 12, asoundin = 'sound/weapons/emitter2.ogg', channel = TELEPORT_CHANNEL_BLUESPACE) last_teleport = world.time is_charging = FALSE - addtimer(CALLBACK(src, .proc/UpdateButtons), cooldown + 5) //action icon looks available again + addtimer(CALLBACK(src, PROC_REF(UpdateButtons)), cooldown + 5) //action icon looks available again //honk @@ -617,7 +617,7 @@ ..() COOLDOWN_START(src, honkooldown, 0) COOLDOWN_START(src, banana_cooldown, banana_delay) - RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(C, COMSIG_MOB_SAY, PROC_REF(handle_speech)) var/obj/item/organ/internal/liver/liver = C.getorganslot(ORGAN_SLOT_LIVER) if(liver) ADD_TRAIT(liver, TRAIT_COMEDY_METABOLISM, SPECIES_TRAIT) @@ -892,7 +892,7 @@ H.forceMove(src) cloth_golem = H to_chat(cloth_golem, span_notice("You start gathering your life energy, preparing to rise again...")) - addtimer(CALLBACK(src, .proc/revive), revive_time) + addtimer(CALLBACK(src, PROC_REF(revive)), revive_time) else return INITIALIZE_HINT_QDEL @@ -1255,7 +1255,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 d37e1a7d38a..e4f9f7f9baa 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -746,7 +746,7 @@ to_chat(living_target, span_warning("You feel a foreign presence within your mind...")) currently_linking = TRUE - if(!do_after(owner, 6 SECONDS, target = living_target, extra_checks = CALLBACK(src, .proc/while_link_callback, living_target))) + if(!do_after(owner, 6 SECONDS, target = living_target, extra_checks = CALLBACK(src, PROC_REF(while_link_callback), living_target))) to_chat(owner, span_warning("You can't seem to link [living_target]'s mind.")) to_chat(living_target, span_warning("The foreign presence leaves your mind.")) currently_linking = FALSE diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index 18331ab9abb..720b0234e29 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -210,7 +210,7 @@ /obj/item/organ/internal/brain/primate/Insert(mob/living/carbon/primate, special = FALSE, drop_if_replaced = FALSE) . = ..() - RegisterSignal(primate, COMSIG_MOVABLE_CROSS, .proc/on_crossed, TRUE) + RegisterSignal(primate, COMSIG_MOVABLE_CROSS, PROC_REF(on_crossed), TRUE) /obj/item/organ/internal/brain/primate/Remove(mob/living/carbon/primate, special = FALSE, no_id_transfer = FALSE) UnregisterSignal(primate, COMSIG_MOVABLE_CROSS) diff --git a/code/modules/mob/living/carbon/init_signals.dm b/code/modules/mob/living/carbon/init_signals.dm index e1b83bfe3c1..aacef69b560 100644 --- a/code/modules/mob/living/carbon/init_signals.dm +++ b/code/modules/mob/living/carbon/init_signals.dm @@ -2,8 +2,8 @@ /mob/living/carbon/register_init_signals() . = ..() - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_NOBREATH), .proc/on_nobreath_trait_gain) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_NOMETABOLISM), .proc/on_nometabolism_trait_gain) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_NOBREATH), PROC_REF(on_nobreath_trait_gain)) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_NOMETABOLISM), PROC_REF(on_nometabolism_trait_gain)) /** * On gain of TRAIT_NOBREATH diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index 7cf8826f15a..38f1e65bb78 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -109,6 +109,6 @@ client.move_delay = initial(client.move_delay) if(!gibbed && (death_sound || death_message)) - INVOKE_ASYNC(src, /mob.proc/emote, "deathgasp") + INVOKE_ASYNC(src, TYPE_PROC_REF(/mob, emote), "deathgasp") return TRUE diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index ef352536f49..1b976b90bb0 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -24,7 +24,7 @@ var/list/key_emotes = GLOB.emote_list["blush"] for(var/datum/emote/living/blush/living_emote in key_emotes) // The existing timer restarts if it is already running - addtimer(CALLBACK(living_emote, .proc/end_blush, human_user), BLUSH_DURATION, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(living_emote, PROC_REF(end_blush), human_user), BLUSH_DURATION, TIMER_UNIQUE | TIMER_OVERRIDE) /datum/emote/living/blush/proc/end_blush(mob/living/carbon/human/human_user) if(!QDELETED(human_user)) @@ -167,7 +167,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(wings, open ? TYPE_PROC_REF(/obj/item/organ/external/wings/functional, open_wings) : TYPE_PROC_REF(/obj/item/organ/external/wings/functional, close_wings)), wing_time) */ //SKYRAT EDIT REMOVAL END @@ -518,7 +518,7 @@ continue var/yawn_delay = rand(0.25 SECONDS, 0.75 SECONDS) * dist_between - addtimer(CALLBACK(src, .proc/propagate_yawn, iter_living), yawn_delay) + addtimer(CALLBACK(src, PROC_REF(propagate_yawn), iter_living), yawn_delay) /// This yawn has been triggered by someone else yawning specifically, likely after a delay. Check again if they don't have the yawned recently trait /datum/emote/living/yawn/proc/propagate_yawn(mob/user) diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm index fb9f426c5a9..5d519d145be 100644 --- a/code/modules/mob/living/init_signals.dm +++ b/code/modules/mob/living/init_signals.dm @@ -1,34 +1,34 @@ /// Called on [/mob/living/Initialize(mapload)], for the mob to register to relevant signals. /mob/living/proc/register_init_signals() - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_KNOCKEDOUT), .proc/on_knockedout_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_KNOCKEDOUT), .proc/on_knockedout_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_KNOCKEDOUT), PROC_REF(on_knockedout_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_KNOCKEDOUT), PROC_REF(on_knockedout_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_DEATHCOMA), .proc/on_deathcoma_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_DEATHCOMA), .proc/on_deathcoma_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_DEATHCOMA), PROC_REF(on_deathcoma_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_DEATHCOMA), PROC_REF(on_deathcoma_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_IMMOBILIZED), .proc/on_immobilized_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_IMMOBILIZED), .proc/on_immobilized_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_IMMOBILIZED), PROC_REF(on_immobilized_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_IMMOBILIZED), PROC_REF(on_immobilized_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_FLOORED), .proc/on_floored_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_FLOORED), .proc/on_floored_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_FLOORED), PROC_REF(on_floored_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_FLOORED), PROC_REF(on_floored_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_FORCED_STANDING), .proc/on_forced_standing_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_FORCED_STANDING), .proc/on_forced_standing_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_FORCED_STANDING), PROC_REF(on_forced_standing_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_FORCED_STANDING), PROC_REF(on_forced_standing_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), .proc/on_handsblocked_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_HANDS_BLOCKED), .proc/on_handsblocked_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_HANDS_BLOCKED), PROC_REF(on_handsblocked_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_HANDS_BLOCKED), PROC_REF(on_handsblocked_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_UI_BLOCKED), .proc/on_ui_blocked_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_UI_BLOCKED), .proc/on_ui_blocked_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_UI_BLOCKED), PROC_REF(on_ui_blocked_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_UI_BLOCKED), PROC_REF(on_ui_blocked_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PULL_BLOCKED), .proc/on_pull_blocked_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PULL_BLOCKED), .proc/on_pull_blocked_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PULL_BLOCKED), PROC_REF(on_pull_blocked_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PULL_BLOCKED), PROC_REF(on_pull_blocked_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_INCAPACITATED), .proc/on_incapacitated_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_INCAPACITATED), .proc/on_incapacitated_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_INCAPACITATED), PROC_REF(on_incapacitated_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_INCAPACITATED), PROC_REF(on_incapacitated_trait_loss)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_RESTRAINED), .proc/on_restrained_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_RESTRAINED), .proc/on_restrained_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_RESTRAINED), PROC_REF(on_restrained_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_RESTRAINED), PROC_REF(on_restrained_trait_loss)) RegisterSignal(src, list( SIGNAL_ADDTRAIT(TRAIT_CRITICAL_CONDITION), @@ -36,13 +36,13 @@ SIGNAL_ADDTRAIT(TRAIT_NODEATH), SIGNAL_REMOVETRAIT(TRAIT_NODEATH), - ), .proc/update_succumb_action) + ), PROC_REF(update_succumb_action)) - RegisterSignal(src, COMSIG_MOVETYPE_FLAG_ENABLED, .proc/on_movement_type_flag_enabled) - RegisterSignal(src, COMSIG_MOVETYPE_FLAG_DISABLED, .proc/on_movement_type_flag_disabled) + RegisterSignal(src, COMSIG_MOVETYPE_FLAG_ENABLED, PROC_REF(on_movement_type_flag_enabled)) + RegisterSignal(src, COMSIG_MOVETYPE_FLAG_DISABLED, PROC_REF(on_movement_type_flag_disabled)) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_SKITTISH), .proc/on_skittish_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_SKITTISH), .proc/on_skittish_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_SKITTISH), PROC_REF(on_skittish_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_SKITTISH), PROC_REF(on_skittish_trait_loss)) /// Called when [TRAIT_KNOCKEDOUT] is added to the mob. /mob/living/proc/on_knockedout_trait_gain(datum/source) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index c10e13c72f4..82651e91070 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -175,7 +175,7 @@ /mob/living/proc/gravity_animate() if(!get_filter("gravity")) add_filter("gravity",1,list("type"="motion_blur", "x"=0, "y"=0)) - INVOKE_ASYNC(src, .proc/gravity_pulse_animation) + INVOKE_ASYNC(src, PROC_REF(gravity_pulse_animation)) /mob/living/proc/gravity_pulse_animation() animate(get_filter("gravity"), y = 1, time = 10) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 1deb70ee28c..08fb06ed86b 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -804,7 +804,7 @@ reload_fullscreen() . = TRUE if(excess_healing) - INVOKE_ASYNC(src, .proc/emote, "gasp") + INVOKE_ASYNC(src, PROC_REF(emote), "gasp") log_combat(src, src, "revived") else if(admin_revive) updatehealth() @@ -1044,7 +1044,7 @@ set name = "Resist" set category = "IC" - DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/execute_resist)) + DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(execute_resist))) ///proc extender of [/mob/living/verb/resist] meant to make the process queable if the server is overloaded when the verb is called /mob/living/proc/execute_resist() @@ -1937,8 +1937,8 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(!can_look_up()) return changeNext_move(CLICK_CD_LOOK_UP) - RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, .proc/stop_look_up) //We stop looking up if we move. - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/start_look_up) //We start looking again after we move. + RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(stop_look_up)) //We stop looking up if we move. + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(start_look_up)) //We start looking again after we move. start_look_up() /mob/living/proc/start_look_up() @@ -1987,8 +1987,8 @@ GLOBAL_LIST_EMPTY(fire_appearances) if(!can_look_up()) //if we cant look up, we cant look down. return changeNext_move(CLICK_CD_LOOK_UP) - RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, .proc/stop_look_down) //We stop looking down if we move. - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/start_look_down) //We start looking again after we move. + RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(stop_look_down)) //We stop looking down if we move. + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(start_look_down)) //We start looking again after we move. start_look_down() /mob/living/proc/start_look_down() diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 7b9636463a5..25291c16276 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -431,8 +431,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, CULT_VICTORY_MASS_CONVERSION), 120) - addtimer(CALLBACK(GLOBAL_PROC, .proc/ending_helper), 270) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_VICTORY_MASS_CONVERSION), 120) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper)), 270) if(client) makeNewConstruct(/mob/living/simple_animal/hostile/construct/harvester, src, cultoverride = TRUE) else @@ -466,7 +466,7 @@ type = /atom/movable/screen/fullscreen/flash/black overlay_fullscreen("flash", type) - addtimer(CALLBACK(src, .proc/clear_fullscreen, "flash", length), length) + addtimer(CALLBACK(src, PROC_REF(clear_fullscreen), "flash", length), length) SEND_SIGNAL(src, COMSIG_MOB_FLASHED, intensity, override_blindness_check, affect_silicon, visual, type, length) return TRUE diff --git a/code/modules/mob/living/living_fov.dm b/code/modules/mob/living/living_fov.dm index e5b98f8eeb8..ea83aa74ffc 100644 --- a/code/modules/mob/living/living_fov.dm +++ b/code/modules/mob/living/living_fov.dm @@ -123,7 +123,7 @@ //when added as an image mutable_appearances act identically. we just make it an MA becuase theyre faster to change appearance if(clients_shown) - addtimer(CALLBACK(GLOBAL_PROC, .proc/remove_images_from_clients, fov_image, clients_shown), 30) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(remove_images_from_clients), fov_image, clients_shown), 30) /atom/movable/screen/fov_blocker icon = 'icons/effects/fov/field_of_view.dmi' diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 103cd9fbdcf..5ad20ac91d0 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -387,9 +387,9 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( var/image/say_popup = image('icons/mob/effects/talk.dmi', src, "[bubble_type][say_test(message)]", FLY_LAYER) SET_PLANE_EXPLICIT(say_popup, ABOVE_GAME_PLANE, src) say_popup.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA - INVOKE_ASYNC(GLOBAL_PROC, /proc/flick_overlay, say_popup, speech_bubble_recipients, 3 SECONDS) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(flick_overlay), say_popup, speech_bubble_recipients, 3 SECONDS) LAZYADD(update_on_z, say_popup) - addtimer(CALLBACK(src, .proc/clear_saypopup, say_popup), 3.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(clear_saypopup), say_popup), 3.5 SECONDS) /mob/living/proc/clear_saypopup(image/say_popup) LAZYREMOVE(update_on_z, say_popup) diff --git a/code/modules/mob/living/navigation.dm b/code/modules/mob/living/navigation.dm index ae686a4a82d..e1245bd231b 100644 --- a/code/modules/mob/living/navigation.dm +++ b/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_LIVING_DEATH, .proc/cut_navigation) + addtimer(CALLBACK(src, PROC_REF(shine_navigation)), 0.5 SECONDS) + RegisterSignal(src, COMSIG_LIVING_DEATH, PROC_REF(cut_navigation)) balloon_alert(src, "navigation path created") /mob/living/proc/shine_navigation() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index f1bb1e52efa..d85507bafd3 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -157,9 +157,9 @@ create_modularInterface() if(client) - INVOKE_ASYNC(src, .proc/apply_pref_name, /datum/preference/name/ai, client) + INVOKE_ASYNC(src, PROC_REF(apply_pref_name), /datum/preference/name/ai, client) - INVOKE_ASYNC(src, .proc/set_core_display_icon) + INVOKE_ASYNC(src, PROC_REF(set_core_display_icon)) holo_icon = getHologramIcon(icon('icons/mob/silicon/ai.dmi',"default")) @@ -195,8 +195,8 @@ ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, ROUNDSTART_TRAIT) alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER, ALARM_CAMERA, ALARM_BURGLAR, ALARM_MOTION), list(z), camera_view = TRUE) - RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_TRIGGERED, .proc/alarm_triggered) - RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_CLEARED, .proc/alarm_cleared) + RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_TRIGGERED, PROC_REF(alarm_triggered)) + RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_CLEARED, PROC_REF(alarm_cleared)) /mob/living/silicon/ai/key_down(_key, client/user) if(findtext(_key, "numpad")) //if it's a numpad number, we can convert it to just the number @@ -1018,7 +1018,7 @@ return else if(mind) - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/disconnect_shell) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(disconnect_shell)) deployed_shell = target target.deploy_init(src) mind.transfer_to(target) diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index e3412a29dfb..52546c6109f 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") . = ..() @@ -39,7 +39,7 @@ make_mmi_drop_and_transfer() if(explosive) - addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, loc, 3, 6, 12, null, 15), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), loc, 3, 6, 12, null, 15), 1 SECONDS) if(istype(loc, /obj/item/aicard/aitater)) loc.icon_state = "aitater-404" diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm index 2fdd61aa89a..b04f9ccbc41 100644 --- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm +++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm @@ -24,7 +24,7 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new) /datum/cameranet/New() obscured_images = list() update_offsets(SSmapping.max_plane_offset) - RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, .proc/on_offset_growth) + RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, PROC_REF(on_offset_growth)) /datum/cameranet/proc/update_offsets(new_offset) for(var/i in length(obscured_images) to new_offset) diff --git a/code/modules/mob/living/silicon/ai/freelook/chunk.dm b/code/modules/mob/living/silicon/ai/freelook/chunk.dm index 625926aa563..c5549116fde 100644 --- a/code/modules/mob/living/silicon/ai/freelook/chunk.dm +++ b/code/modules/mob/living/silicon/ai/freelook/chunk.dm @@ -59,7 +59,7 @@ */ /datum/camerachunk/proc/hasChanged(update_now = 0) if(seenby.len || update_now) - addtimer(CALLBACK(src, .proc/update), UPDATE_BUFFER_TIME, TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(update)), UPDATE_BUFFER_TIME, TIMER_UNIQUE) else changed = TRUE diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index a335617e925..de3eb1ed7e9 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -166,4 +166,4 @@ adjust_blindness(1) update_sight() to_chat(src, span_alert("You've lost power!")) - addtimer(CALLBACK(src, .proc/start_RestorePowerRoutine), 20) + addtimer(CALLBACK(src, PROC_REF(start_RestorePowerRoutine)), 20) diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index bdaba2a452f..984f1af30ba 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -90,7 +90,7 @@ /turf/open/ai_visible/Initialize(mapload) . = ..() - RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, .proc/multiz_offset_increase) + RegisterSignal(SSmapping, COMSIG_PLANE_OFFSET_INCREASE, PROC_REF(multiz_offset_increase)) multiz_offset_increase(SSmapping) /turf/open/ai_visible/proc/multiz_offset_increase(datum/source) diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index dcb7e730b63..b9eb88fcaee 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -20,8 +20,8 @@ if(announce && last_lawchange_announce != world.time) to_chat(src, span_boldannounce("Your laws have been changed.")) // lawset modules cause this function to be executed multiple times in a tick, so we wait for the next tick in order to be able to see the entire lawset - addtimer(CALLBACK(src, .proc/show_laws), 0) - addtimer(CALLBACK(src, .proc/deadchat_lawchange), 0) + addtimer(CALLBACK(src, PROC_REF(show_laws)), 0) + addtimer(CALLBACK(src, PROC_REF(deadchat_lawchange)), 0) last_lawchange_announce = world.time //SKYRAT ADDITION START: AI LAWSYNC if(isAI(src)) diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm index aa62b2d7ba0..ce89d7b6fc7 100644 --- a/code/modules/mob/living/silicon/robot/laws.dm +++ b/code/modules/mob/living/silicon/robot/laws.dm @@ -78,4 +78,4 @@ /mob/living/silicon/robot/post_lawchange(announce = TRUE) . = ..() - addtimer(CALLBACK(src, .proc/logevent,"Law update processed."), 0, TIMER_UNIQUE | TIMER_OVERRIDE) //Post_Lawchange gets spammed by some law boards, so let's wait it out + addtimer(CALLBACK(src, PROC_REF(logevent),"Law update processed."), 0, TIMER_UNIQUE | TIMER_OVERRIDE) //Post_Lawchange gets spammed by some law boards, so let's wait it out diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 6721d747b84..26dee4193ca 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -8,17 +8,17 @@ tip_time = 3 SECONDS, \ untip_time = 2 SECONDS, \ self_right_time = 60 SECONDS, \ - post_tipped_callback = CALLBACK(src, .proc/after_tip_over), \ - post_untipped_callback = CALLBACK(src, .proc/after_righted), \ + post_tipped_callback = CALLBACK(src, PROC_REF(after_tip_over)), \ + post_untipped_callback = CALLBACK(src, PROC_REF(after_righted)), \ roleplay_friendly = TRUE, \ roleplay_emotes = list(/datum/emote/living/human/buzz, /datum/emote/living/human/buzz2, /datum/emote/living/human/beep, /datum/emote/living/human/beep2), \ - roleplay_callback = CALLBACK(src, .proc/untip_roleplay)) // SKYRAT EDIT CHANGE + roleplay_callback = CALLBACK(src, PROC_REF(untip_roleplay))) // SKYRAT EDIT CHANGE wires = new /datum/wires/robot(src) AddElement(/datum/element/empprotection, EMP_PROTECT_WIRES) AddElement(/datum/element/ridable, /datum/component/riding/creature/cyborg) - RegisterSignal(src, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, .proc/charge) - RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, .proc/on_light_eater) + RegisterSignal(src, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(charge)) + RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) robot_modules_background = new() robot_modules_background.icon_state = "block" @@ -80,15 +80,15 @@ diag_hud_set_borgcell() logevent("System brought online.") alert_control = new(src, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER, ALARM_CAMERA, ALARM_BURGLAR, ALARM_MOTION), list(z)) - RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_TRIGGERED, .proc/alarm_triggered) - RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_CLEARED, .proc/alarm_cleared) + RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_TRIGGERED, PROC_REF(alarm_triggered)) + RegisterSignal(alert_control.listener, COMSIG_ALARM_LISTENER_CLEARED, PROC_REF(alarm_cleared)) alert_control.listener.RegisterSignal(src, COMSIG_LIVING_DEATH, /datum/alarm_listener/proc/prevent_alarm_changes) alert_control.listener.RegisterSignal(src, COMSIG_LIVING_REVIVE, /datum/alarm_listener/proc/allow_alarm_changes) /mob/living/silicon/robot/model/syndicate/Initialize(mapload) . = ..() laws = new /datum/ai_laws/syndicate_override() - addtimer(CALLBACK(src, .proc/show_playstyle), 5) + addtimer(CALLBACK(src, PROC_REF(show_playstyle)), 5) /mob/living/silicon/robot/model/syndicate/create_modularInterface() if(!modularInterface) @@ -778,7 +778,7 @@ hat_offset = model.hat_offset - INVOKE_ASYNC(src, .proc/updatename) + INVOKE_ASYNC(src, PROC_REF(updatename)) /mob/living/silicon/robot/proc/place_on_head(obj/item/new_hat) @@ -817,8 +817,8 @@ return FALSE upgrades += new_upgrade new_upgrade.forceMove(src) - RegisterSignal(new_upgrade, COMSIG_MOVABLE_MOVED, .proc/remove_from_upgrades) - RegisterSignal(new_upgrade, COMSIG_PARENT_QDELETING, .proc/on_upgrade_deleted) + RegisterSignal(new_upgrade, COMSIG_MOVABLE_MOVED, PROC_REF(remove_from_upgrades)) + RegisterSignal(new_upgrade, COMSIG_PARENT_QDELETING, PROC_REF(on_upgrade_deleted)) logevent("Hardware [new_upgrade] installed successfully.") ///Called when an upgrade is moved outside the robot. So don't call this directly, use forceMove etc. diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index c84c65eb8e3..787e128e646 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -244,7 +244,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real return spark_system.start() step_away(src, user, 15) - addtimer(CALLBACK(GLOBAL_PROC, .proc/_step_away, src, get_turf(user), 15), 3) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step_away), src, get_turf(user), 15), 3) /mob/living/silicon/robot/welder_act(mob/living/user, obj/item/tool) if(user.combat_mode && usr != src) diff --git a/code/modules/mob/living/silicon/robot/robot_defines.dm b/code/modules/mob/living/silicon/robot/robot_defines.dm index 4a89976d9b5..e2a4fed5454 100644 --- a/code/modules/mob/living/silicon/robot/robot_defines.dm +++ b/code/modules/mob/living/silicon/robot/robot_defines.dm @@ -147,7 +147,7 @@ /mob/living/silicon/robot/model/Initialize(mapload) . = ..() - INVOKE_ASYNC(model, /obj/item/robot_model.proc/transform_to, set_model, TRUE) + INVOKE_ASYNC(model, TYPE_PROC_REF(/obj/item/robot_model, transform_to), set_model, TRUE) /mob/living/silicon/robot/model/clown set_model = /obj/item/robot_model/clown diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index f197a661b8f..f0d22690c67 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -198,7 +198,7 @@ new_model.update_tallborg() //SKYRAT EDIT ADDITION END - INVOKE_ASYNC(new_model, .proc/do_transform_animation) + INVOKE_ASYNC(new_model, PROC_REF(do_transform_animation)) qdel(src) return new_model @@ -215,7 +215,7 @@ var/image/reskin = reskin_icons[skin] reskin.pixel_x -= 16 //SKYRAT EDIT END - var/borg_skin = show_radial_menu(cyborg, cyborg, reskin_icons, custom_check = CALLBACK(src, .proc/check_menu, cyborg, old_model), radius = 38, require_near = TRUE) + var/borg_skin = show_radial_menu(cyborg, cyborg, reskin_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), cyborg, old_model), radius = 38, require_near = TRUE) if(!borg_skin) return FALSE var/list/details = borg_skins[borg_skin] @@ -417,7 +417,7 @@ /datum/action/toggle_buffer/New(Target) if(!allow_buffer_activate) - allow_buffer_activate = CALLBACK(src, .proc/allow_buffer_activate) + allow_buffer_activate = CALLBACK(src, PROC_REF(allow_buffer_activate)) return ..() /datum/action/toggle_buffer/Destroy() @@ -493,7 +493,7 @@ buffer_on = TRUE // Slow em down a bunch robot_owner.add_movespeed_modifier(/datum/movespeed_modifier/auto_wash) - RegisterSignal(robot_owner, COMSIG_MOVABLE_MOVED, .proc/clean) + RegisterSignal(robot_owner, COMSIG_MOVABLE_MOVED, PROC_REF(clean)) //This is basically just about adding a shake to the borg, effect should look ilke an engine's running var/base_x = robot_owner.base_pixel_x var/base_y = robot_owner.base_pixel_y @@ -530,7 +530,7 @@ // Reset our animations animate(pixel_x = base_x, pixel_y = base_y, time = 2) addtimer(CALLBACK(wash_audio, /datum/looping_sound/proc/stop), time_left) - addtimer(CALLBACK(src, .proc/turn_off_wash), finished_by) + addtimer(CALLBACK(src, PROC_REF(turn_off_wash)), finished_by) /// Called by [deactivate_wash] on a timer to allow noises and animation to play out. /// Finally disables the buffer. Doesn't do everything mind, just the stuff that we wanted to delay diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index de4e0bec40c..f41ceeee35d 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -125,7 +125,7 @@ if(in_cooldown) return - addtimer(CALLBACK(src, .proc/show_alarms), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(show_alarms)), 3 SECONDS) /mob/living/silicon/proc/show_alarms() if(length(alarms_to_show) < 5) diff --git a/code/modules/mob/living/silicon/silicon_movement.dm b/code/modules/mob/living/silicon/silicon_movement.dm index cd73638a5d0..d225ccf9c16 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 4cf6896e7dc..828be3deebc 100644 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm @@ -31,11 +31,11 @@ if(ismob(AM) && AM == target) visible_message(span_warning("[src] flails his swords and cuts [AM]!")) playsound(src,'sound/effects/beepskyspinsabre.ogg',100,TRUE,-1) - INVOKE_ASYNC(src, .proc/stun_attack, AM) + INVOKE_ASYNC(src, PROC_REF(stun_attack), AM) /mob/living/simple_animal/bot/secbot/grievous/Initialize(mapload) . = ..() - INVOKE_ASYNC(weapon, /obj/item.proc/attack_self, src) + INVOKE_ASYNC(weapon, TYPE_PROC_REF(/obj/item, attack_self), src) /mob/living/simple_animal/bot/secbot/grievous/Destroy() QDEL_NULL(weapon) @@ -53,7 +53,7 @@ weapon.attack(C, src) playsound(src, 'sound/weapons/blade1.ogg', 50, TRUE, -1) if(C.stat == DEAD) - addtimer(CALLBACK(src, /atom/.proc/update_appearance), 2) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_appearance)), 2) back_to_idle() @@ -109,7 +109,7 @@ if((C.name == oldtarget_name) && (world.time < last_found + 100)) continue - threatlevel = C.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) + threatlevel = C.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons))) if(!threatlevel) continue @@ -124,7 +124,7 @@ icon_state = "grievous-c" visible_message("[src] points at [C.name]!") mode = BOT_HUNT - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) break else continue diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 9d2bc94310f..ebaa2231e0f 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -433,7 +433,7 @@ ejectpai(0) if(bot_mode_flags & BOT_MODE_ON) turn_off() - addtimer(CALLBACK(src, .proc/emp_reset, was_on), severity * 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(emp_reset), was_on), severity * 30 SECONDS) /mob/living/simple_animal/bot/proc/emp_reset(was_on) stat &= ~EMPED @@ -561,7 +561,7 @@ Pass a positive integer as an argument to override a bot's default speed. if(step_count >= 1 && tries < BOT_STEP_MAX_RETRIES) for(var/step_number in 1 to step_count) - addtimer(CALLBACK(src, .proc/bot_step), BOT_STEP_DELAY*(step_number-1)) + addtimer(CALLBACK(src, PROC_REF(bot_step)), BOT_STEP_DELAY*(step_number-1)) else return FALSE return TRUE @@ -604,7 +604,7 @@ Pass a positive integer as an argument to override a bot's default speed. turn_on() //Saves the AI the hassle of having to activate a bot manually. access_card.set_access(REGION_ACCESS_ALL_STATION) //Give the bot all-access while under the AI's command. if(client) - reset_access_timer_id = addtimer(CALLBACK (src, .proc/bot_reset), 60 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) //if the bot is player controlled, they get the extra access for a limited time + reset_access_timer_id = addtimer(CALLBACK (src, PROC_REF(bot_reset)), 60 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) //if the bot is player controlled, they get the extra access for a limited time to_chat(src, span_notice("[span_big("Priority waypoint set by [icon2html(calling_ai, src)] [caller]. Proceed to [end_area].")]
    [path.len-1] meters to destination. You have been granted additional door access for 60 seconds.")) if(message) to_chat(calling_ai, span_notice("[icon2html(src, calling_ai)] [name] called to [end_area]. [path.len-1] meters to destination.")) @@ -652,7 +652,7 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/bot_patrol() patrol_step() - addtimer(CALLBACK(src, .proc/do_patrol), 5) + addtimer(CALLBACK(src, PROC_REF(do_patrol)), 5) /mob/living/simple_animal/bot/proc/do_patrol() if(mode == BOT_PATROL) @@ -672,7 +672,7 @@ Pass a positive integer as an argument to override a bot's default speed. return if(patrol_target) // has patrol target - INVOKE_ASYNC(src, .proc/target_patrol) + INVOKE_ASYNC(src, PROC_REF(target_patrol)) else // no patrol target, so need a new one speak("Engaging patrol mode.") find_patrol_target() @@ -706,7 +706,7 @@ Pass a positive integer as an argument to override a bot's default speed. var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move if(!moved) //Couldn't proceed the next step of the path BOT_STEP_MAX_RETRIES times - addtimer(CALLBACK(src, .proc/patrol_step_not_moved), 2) + addtimer(CALLBACK(src, PROC_REF(patrol_step_not_moved)), 2) else // no path, so calculate new one mode = BOT_START_PATROL @@ -813,7 +813,7 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/calc_summon_path(turf/avoid) check_bot_access() - INVOKE_ASYNC(src, .proc/do_calc_summon_path, avoid) + INVOKE_ASYNC(src, PROC_REF(do_calc_summon_path), avoid) /mob/living/simple_animal/bot/proc/do_calc_summon_path(turf/avoid) set_path(get_path_to(src, summon_target, max_distance=150, id=access_card, exclude=avoid)) @@ -837,7 +837,7 @@ Pass a positive integer as an argument to override a bot's default speed. var/moved = bot_move(summon_target, 3) // Move attempt if(!moved) - addtimer(CALLBACK(src, .proc/summon_step_not_moved), 2) + addtimer(CALLBACK(src, PROC_REF(summon_step_not_moved)), 2) else // no path, so calculate new one calc_summon_path() @@ -1070,7 +1070,7 @@ Pass a positive integer as an argument to override a bot's default speed. path.Cut(1, 2) if(!length(path)) - addtimer(CALLBACK(src, .proc/set_path, null), 0.6 SECONDS) // Enough time for the animate to finish + addtimer(CALLBACK(src, PROC_REF(set_path), null), 0.6 SECONDS) // Enough time for the animate to finish /mob/living/simple_animal/bot/rust_heretic_act() adjustBruteLoss(400) diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index cea6ccbbce7..8fb340f7e30 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -106,7 +106,7 @@ . = ..() AddComponent(/datum/component/cleaner, CLEANBOT_CLEANING_TIME, \ - on_cleaned_callback = CALLBACK(src, /atom/.proc/update_appearance, UPDATE_ICON)) + on_cleaned_callback = CALLBACK(src, TYPE_PROC_REF(/atom/, update_appearance), UPDATE_ICON)) get_targets() update_appearance(UPDATE_ICON) @@ -173,7 +173,7 @@ weapon.force = weapon.force / 2 add_overlay(image(icon = weapon.lefthand_file, icon_state = weapon.inhand_icon_state)) 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) return TRUE @@ -210,7 +210,7 @@ update_titles() zone_selected = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) - INVOKE_ASYNC(weapon, /obj/item.proc/attack, stabbed_carbon, src) + INVOKE_ASYNC(weapon, TYPE_PROC_REF(/obj/item, attack), stabbed_carbon, src) stabbed_carbon.Knockdown(20) /mob/living/simple_animal/bot/cleanbot/attackby(obj/item/attacking_item, mob/living/user, params) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 85ab4c6555b..5facdc1ac16 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -38,7 +38,7 @@ var/threatlevel = 0 if(nearby_carbon.incapacitated()) continue - threatlevel = nearby_carbon.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) + threatlevel = nearby_carbon.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, PROC_REF(check_for_weapons))) if(threatlevel < 4 ) continue var/dst = get_dist(src, nearby_carbon) diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index 937c7d33d42..2130f9c443f 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -242,7 +242,7 @@ else F.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) audible_message(span_danger("[src] makes an excited booping sound.")) - addtimer(CALLBACK(src, .proc/go_idle), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(go_idle)), 0.5 SECONDS) path = list() return if(!length(path)) diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index dace23ce086..9bdab65e93b 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -43,10 +43,10 @@ /mob/living/simple_animal/bot/secbot/honkbot/knockOver(mob/living/carbon/tripped_target) . = ..() - INVOKE_ASYNC(src, /mob/living/simple_animal/bot.proc/speak, "Honk!") + INVOKE_ASYNC(src, TYPE_PROC_REF(/mob/living/simple_animal/bot, speak), "Honk!") playsound(loc, 'sound/misc/sadtrombone.ogg', 50, TRUE, -1) icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) /mob/living/simple_animal/bot/secbot/honkbot/bot_reset() ..() @@ -59,11 +59,11 @@ var/judgement_criteria = judgement_criteria() playsound(src, 'sound/items/AirHorn.ogg', 100, TRUE, -1) //HEEEEEEEEEEEENK!! icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) if(!ishuman(current_target)) current_target.Paralyze(8 SECONDS) current_target.set_stutter(40 SECONDS) - addtimer(CALLBACK(src, .proc/limiting_spam_false), cooldowntime) + addtimer(CALLBACK(src, PROC_REF(limiting_spam_false)), cooldowntime) return current_target.set_stutter(40 SECONDS) @@ -83,7 +83,7 @@ var/mob/living/carbon/human/human_target = current_target threatlevel = human_target.assess_threat(judgement_criteria) threatlevel -= 6 - addtimer(CALLBACK(src, .proc/limiting_spam_false), cooldowntime) + addtimer(CALLBACK(src, PROC_REF(limiting_spam_false)), cooldowntime) log_combat(src, current_target, "honked") @@ -99,7 +99,7 @@ . = ..() playsound(src, 'sound/machines/buzz-sigh.ogg', 50, TRUE, -1) icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) /mob/living/simple_animal/bot/secbot/honkbot/UnarmedAttack(atom/attack_target, proximity_flag, list/modifiers) . = ..() @@ -126,8 +126,8 @@ icon_state = "[initial(icon_state)]-c" limiting_spam = TRUE // prevent spam - addtimer(CALLBACK(src, .proc/limiting_spam_false), cooldowntimehorn) - addtimer(CALLBACK(src, /atom.proc/update_appearance), 3 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(limiting_spam_false)), cooldowntimehorn) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 3 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) //Honkbots don't care for NAP violations /mob/living/simple_animal/bot/secbot/honkbot/check_nap_violations() @@ -142,5 +142,5 @@ playsound(loc, honksound, 50, TRUE, -1) limiting_spam = TRUE // prevent spam icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) - addtimer(CALLBACK(src, .proc/limiting_spam_false), cooldowntimehorn) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(limiting_spam_false)), cooldowntimehorn) diff --git a/code/modules/mob/living/simple_animal/bot/hygienebot.dm b/code/modules/mob/living/simple_animal/bot/hygienebot.dm index c3ebd96c711..7afd9c8888e 100644 --- a/code/modules/mob/living/simple_animal/bot/hygienebot.dm +++ b/code/modules/mob/living/simple_animal/bot/hygienebot.dm @@ -46,7 +46,7 @@ access_card.add_access(jani_trim.access + jani_trim.wildcard_access) prev_access = access_card.access.Copy() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -174,13 +174,13 @@ frustration = 0 last_found = world.time stop_washing() - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) /mob/living/simple_animal/bot/hygienebot/proc/back_to_hunt() frustration = 0 mode = BOT_HUNT stop_washing() - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) /mob/living/simple_animal/bot/hygienebot/proc/look_for_lowhygiene() for (var/mob/living/carbon/human/H in view(7,src)) //Find the NEET @@ -193,7 +193,7 @@ playsound(loc, 'sound/effects/hygienebot_happy.ogg', 60, 1) visible_message("[src] points at [H.name]!") mode = BOT_HUNT - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) break else continue diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 3d6c32c1709..c415cfbc9da 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -143,9 +143,9 @@ tip_time = 3 SECONDS, \ untip_time = 3 SECONDS, \ self_right_time = 3.5 MINUTES, \ - pre_tipped_callback = CALLBACK(src, .proc/pre_tip_over), \ - post_tipped_callback = CALLBACK(src, .proc/after_tip_over), \ - post_untipped_callback = CALLBACK(src, .proc/after_righted)) + pre_tipped_callback = CALLBACK(src, PROC_REF(pre_tip_over)), \ + post_tipped_callback = CALLBACK(src, PROC_REF(after_tip_over)), \ + post_untipped_callback = CALLBACK(src, PROC_REF(after_righted))) /mob/living/simple_animal/bot/medbot/bot_reset() ..() diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index cff65927cb8..6d586393a4d 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -59,10 +59,10 @@ /mob/living/simple_animal/bot/mulebot/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOB_BOT_PRE_STEP, .proc/check_pre_step) - RegisterSignal(src, COMSIG_MOB_CLIENT_PRE_MOVE, .proc/check_pre_step) - RegisterSignal(src, COMSIG_MOB_BOT_STEP, .proc/on_bot_step) - RegisterSignal(src, COMSIG_MOB_CLIENT_MOVED, .proc/on_bot_step) + RegisterSignal(src, COMSIG_MOB_BOT_PRE_STEP, PROC_REF(check_pre_step)) + RegisterSignal(src, COMSIG_MOB_CLIENT_PRE_MOVE, PROC_REF(check_pre_step)) + RegisterSignal(src, COMSIG_MOB_BOT_STEP, PROC_REF(on_bot_step)) + RegisterSignal(src, COMSIG_MOB_CLIENT_MOVED, PROC_REF(on_bot_step)) ADD_TRAIT(src, TRAIT_NOMOBSWAP, INNATE_TRAIT) @@ -549,7 +549,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 @@ -562,7 +562,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) @@ -610,7 +610,7 @@ /mob/living/simple_animal/bot/mulebot/proc/start_home() if(!(bot_mode_flags & BOT_MODE_ON)) return - INVOKE_ASYNC(src, .proc/do_start_home) + INVOKE_ASYNC(src, PROC_REF(do_start_home)) /mob/living/simple_animal/bot/mulebot/proc/do_start_home() set_destination(home_destination) @@ -815,7 +815,7 @@ if(isobserver(AM)) visible_message(span_warning("A ghostly figure appears on [src]!")) - RegisterSignal(AM, COMSIG_MOVABLE_MOVED, .proc/ghostmoved) + RegisterSignal(AM, COMSIG_MOVABLE_MOVED, PROC_REF(ghostmoved)) AM.forceMove(src) else if(!wires.is_cut(WIRE_LOADCHECK)) diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 19036e9e1a8..786a57f5103 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -116,7 +116,7 @@ prev_access = access_card.access.Copy() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -186,7 +186,7 @@ /mob/living/simple_animal/bot/secbot/proc/retaliate(mob/living/carbon/human/attacking_human) var/judgement_criteria = judgement_criteria() - threatlevel = attacking_human.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, .proc/check_for_weapons)) + threatlevel = attacking_human.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, PROC_REF(check_for_weapons))) threatlevel += 6 if(threatlevel >= 4) target = attacking_human @@ -288,7 +288,7 @@ playsound(src, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2) current_target.visible_message(span_danger("[src] is trying to put zipties on [current_target]!"),\ span_userdanger("[src] is trying to put zipties on you!")) - addtimer(CALLBACK(src, .proc/handcuff_target, current_target), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(handcuff_target), current_target), 6 SECONDS) /mob/living/simple_animal/bot/secbot/proc/handcuff_target(mob/living/carbon/current_target) if(!(bot_mode_flags & BOT_MODE_ON)) //if he's in a closet or not adjacent, we cancel cuffing. @@ -307,7 +307,7 @@ var/judgement_criteria = judgement_criteria() playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1) icon_state = "[initial(icon_state)]-c" - addtimer(CALLBACK(src, /atom.proc/update_appearance), 0.2 SECONDS) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance)), 0.2 SECONDS) var/threat = 5 if(harm) @@ -316,11 +316,11 @@ current_target.set_stutter(10 SECONDS) current_target.Paralyze(60) // SKYRAT EDIT CHANGE - original was current_target.Paralyze(100) var/mob/living/carbon/human/human_target = current_target - threat = human_target.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, .proc/check_for_weapons)) + threat = human_target.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, PROC_REF(check_for_weapons))) else current_target.Paralyze(60) // SKYRAT EDIT CHANGE - original was current_target.Paralyze(100) current_target.set_stutter(10 SECONDS) - threat = current_target.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, .proc/check_for_weapons)) + threat = current_target.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, PROC_REF(check_for_weapons))) log_combat(src, current_target, "stunned") if(security_mode_flags & SECBOT_DECLARE_ARRESTS) @@ -425,13 +425,13 @@ target = null last_found = world.time frustration = 0 - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) /mob/living/simple_animal/bot/secbot/proc/back_to_hunt() set_anchored(FALSE) frustration = 0 mode = BOT_HUNT - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) // look for a criminal in view of the bot /mob/living/simple_animal/bot/secbot/proc/look_for_perp() @@ -444,7 +444,7 @@ if((nearby_carbons.name == oldtarget_name) && (world.time < last_found + 100)) continue - threatlevel = nearby_carbons.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, .proc/check_for_weapons)) + threatlevel = nearby_carbons.assess_threat(judgement_criteria, weaponcheck = CALLBACK(src, PROC_REF(check_for_weapons))) if(!threatlevel) continue @@ -465,7 +465,7 @@ visible_message("[src] points at [nearby_carbons.name]!") mode = BOT_HUNT - INVOKE_ASYNC(src, .proc/handle_automated_action) + INVOKE_ASYNC(src, PROC_REF(handle_automated_action)) break /mob/living/simple_animal/bot/secbot/proc/check_for_weapons(obj/item/slot_item) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index a137637ed63..0ea412bf918 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -71,10 +71,10 @@ /mob/living/simple_animal/pet/dog/corgi/deadchat_plays(mode = ANARCHY_MODE, cooldown = 12 SECONDS) . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list( - "speak" = CALLBACK(src, .proc/handle_automated_speech, TRUE), - "wear_hat" = CALLBACK(src, .proc/find_new_hat), - "drop_hat" = CALLBACK(src, .proc/drop_hat), - "spin" = CALLBACK(src, /mob.proc/emote, "spin")), cooldown, CALLBACK(src, .proc/stop_deadchat_plays)) + "speak" = CALLBACK(src, PROC_REF(handle_automated_speech), TRUE), + "wear_hat" = CALLBACK(src, PROC_REF(find_new_hat)), + "drop_hat" = CALLBACK(src, PROC_REF(drop_hat)), + "spin" = CALLBACK(src, TYPE_PROC_REF(/mob, emote), "spin")), cooldown, CALLBACK(src, PROC_REF(stop_deadchat_plays))) if(. == COMPONENT_INCOMPATIBLE) return diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index f142329b2c8..21bc7853930 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -193,8 +193,8 @@ ADD_TRAIT(src, TRAIT_LITERATE, INNATE_TRAIT) listener = new(list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), list(z)) - RegisterSignal(listener, COMSIG_ALARM_LISTENER_TRIGGERED, .proc/alarm_triggered) - RegisterSignal(listener, COMSIG_ALARM_LISTENER_CLEARED, .proc/alarm_cleared) + RegisterSignal(listener, COMSIG_ALARM_LISTENER_TRIGGERED, PROC_REF(alarm_triggered)) + RegisterSignal(listener, COMSIG_ALARM_LISTENER_CLEARED, PROC_REF(alarm_cleared)) listener.RegisterSignal(src, COMSIG_LIVING_DEATH, /datum/alarm_listener/proc/prevent_alarm_changes) listener.RegisterSignal(src, COMSIG_LIVING_REVIVE, /datum/alarm_listener/proc/allow_alarm_changes) @@ -347,8 +347,8 @@ LoadComponent(/datum/component/shy_in_room, drone_bad_areas, "Touching anything in %ROOM could break your laws.") LoadComponent(/datum/component/technoshy, 1 MINUTES, "%TARGET was touched by a being recently, using it could break your laws.") LoadComponent(/datum/component/itempicky, drone_good_items, "Using %TARGET could break your laws.") - RegisterSignal(src, COMSIG_TRY_USE_MACHINE, .proc/blacklist_on_try_use_machine) - RegisterSignal(src, COMSIG_TRY_WIRES_INTERACT, .proc/blacklist_on_try_wires_interact) + RegisterSignal(src, COMSIG_TRY_USE_MACHINE, PROC_REF(blacklist_on_try_use_machine)) + RegisterSignal(src, COMSIG_TRY_WIRES_INTERACT, PROC_REF(blacklist_on_try_wires_interact)) else REMOVE_TRAIT(src, TRAIT_PACIFISM, DRONE_SHY_TRAIT) qdel(GetComponent(/datum/component/shy)) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm index 90fa3962f11..aa9fa882523 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/visuals_icons.dm @@ -104,7 +104,7 @@ "Repair Drone" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = REPAIRDRONE), "Scout Drone" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = SCOUTDRONE) ) - var/picked_icon = show_radial_menu(src, src, drone_icons, custom_check = CALLBACK(src, .proc/check_menu), radius = 38, require_near = TRUE) + var/picked_icon = show_radial_menu(src, src, drone_icons, custom_check = CALLBACK(src, PROC_REF(check_menu)), radius = 38, require_near = TRUE) switch(picked_icon) if("Maintenance Drone") visualAppearance = MAINTDRONE @@ -116,7 +116,7 @@ "pink" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = "[visualAppearance]_pink"), "red" = image(icon = 'icons/mob/silicon/drone.dmi', icon_state = "[visualAppearance]_red") ) - var/picked_color = show_radial_menu(src, src, drone_colors, custom_check = CALLBACK(src, .proc/check_menu), radius = 38, require_near = TRUE) + var/picked_color = show_radial_menu(src, src, drone_colors, custom_check = CALLBACK(src, PROC_REF(check_menu)), radius = 38, require_near = TRUE) if(picked_color) icon_state = "[visualAppearance]_[picked_color]" icon_living = "[visualAppearance]_[picked_color]" diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index fee6211a81b..0ac1d83c35b 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -206,7 +206,7 @@ eggs_left = 0,\ eggs_added_from_eating = rand(1, 4),\ max_eggs_held = 8,\ - egg_laid_callback = CALLBACK(src, .proc/egg_laid)\ + egg_laid_callback = CALLBACK(src, PROC_REF(egg_laid))\ ) ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) diff --git a/code/modules/mob/living/simple_animal/friendly/trader.dm b/code/modules/mob/living/simple_animal/friendly/trader.dm index 0e5fba828df..3b6225e1c1d 100644 --- a/code/modules/mob/living/simple_animal/friendly/trader.dm +++ b/code/modules/mob/living/simple_animal/friendly/trader.dm @@ -167,7 +167,7 @@ npc_options["Sell"] = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_sell") if(!npc_options.len) return FALSE - var/npc_result = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/npc_result = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) switch(npc_result) if("Buy") buy_item(user) @@ -199,7 +199,7 @@ "Selling?" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_selling"), "Buying?" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_buying"), ) - var/pick = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/pick = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) switch(pick) if("Lore") say(return_trader_phrase(TRADER_LORE_PHRASE)) @@ -257,7 +257,7 @@ if(product_info[TRADER_PRODUCT_INFO_QUANTITY] <= 0) //out of stock item_image.overlays += image(icon = 'icons/hud/radial.dmi', icon_state = "radial_center") items += list("[initial(thing.name)]" = item_image) - var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/pick = show_radial_menu(user, src, items, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!pick) return var/obj/item/item_to_buy = display_names[pick] @@ -271,7 +271,7 @@ "Yes" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_yes"), "No" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_no") ) - var/buyer_will_buy = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/buyer_will_buy = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(buyer_will_buy != "Yes") return face_atom(user) @@ -350,7 +350,7 @@ "No" = image(icon = 'icons/hud/radial.dmi', icon_state = "radial_no"), ) face_atom(user) - var/npc_result = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/npc_result = show_radial_menu(user, src, npc_options, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(npc_result != "Yes") say(return_trader_phrase(ITEM_SELLING_CANCELED_PHRASE)) return TRUE diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index ff315e7186a..db9914d3200 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -77,9 +77,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians summoner = to_who Recall(TRUE) - RegisterSignal(to_who, COMSIG_LIVING_ON_WABBAJACKED, .proc/on_owner_wabbajacked) - RegisterSignal(to_who, COMSIG_LIVING_SHAPESHIFTED, .proc/on_owner_shapeshifted) - RegisterSignal(to_who, COMSIG_LIVING_UNSHAPESHIFTED, .proc/on_owner_unshapeshifted) + RegisterSignal(to_who, COMSIG_LIVING_ON_WABBAJACKED, PROC_REF(on_owner_wabbajacked)) + RegisterSignal(to_who, COMSIG_LIVING_SHAPESHIFTED, PROC_REF(on_owner_shapeshifted)) + RegisterSignal(to_who, COMSIG_LIVING_UNSHAPESHIFTED, PROC_REF(on_owner_unshapeshifted)) /// Signal proc for [COMSIG_LIVING_ON_WABBAJACKED], when our summoner is wabbajacked we should be alerted. /mob/living/simple_animal/hostile/guardian/proc/on_owner_wabbajacked(mob/living/source, mob/living/new_mob) diff --git a/code/modules/mob/living/simple_animal/guardian/types/charger.dm b/code/modules/mob/living/simple_animal/guardian/types/charger.dm index ab6657e9245..8da5a278948 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/charger.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/charger.dm @@ -34,7 +34,7 @@ /mob/living/simple_animal/hostile/guardian/charger/Shoot(atom/targeted_atom) charging = 1 - throw_at(targeted_atom, range, 1, src, FALSE, TRUE, callback = CALLBACK(src, .proc/charging_end)) + throw_at(targeted_atom, range, 1, src, FALSE, TRUE, callback = CALLBACK(src, PROC_REF(charging_end))) /mob/living/simple_animal/hostile/guardian/charger/proc/charging_end() charging = 0 diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm index 79e5a99ad62..d54cf3a7e63 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm @@ -33,9 +33,9 @@ if(bomb_cooldown <= world.time && !stat) to_chat(src, span_danger("Success! Bomb armed!")) bomb_cooldown = world.time + 200 - RegisterSignal(A, COMSIG_PARENT_EXAMINE, .proc/display_examine) - RegisterSignal(A, boom_signals, .proc/kaboom) - addtimer(CALLBACK(src, .proc/disable, A), 600, TIMER_UNIQUE|TIMER_OVERRIDE) + RegisterSignal(A, COMSIG_PARENT_EXAMINE, PROC_REF(display_examine)) + RegisterSignal(A, boom_signals, PROC_REF(kaboom)) + addtimer(CALLBACK(src, PROC_REF(disable), A), 600, TIMER_UNIQUE|TIMER_OVERRIDE) else to_chat(src, span_danger("Your powers are on cooldown! You must wait 20 seconds between bombs.")) diff --git a/code/modules/mob/living/simple_animal/guardian/types/fire.dm b/code/modules/mob/living/simple_animal/guardian/types/fire.dm index 44a357e467b..6161fd069d7 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/fire.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/fire.dm @@ -17,7 +17,7 @@ /mob/living/simple_animal/hostile/guardian/fire/Initialize(mapload, theme) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm index 5a594a6abd6..767b1ea25db 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/gravitokinetic.dm @@ -59,7 +59,7 @@ return A.AddElement(/datum/element/forced_gravity, new_gravity) gravito_targets[A] = new_gravity - RegisterSignal(A, COMSIG_MOVABLE_MOVED, .proc/__distance_check) + RegisterSignal(A, COMSIG_MOVABLE_MOVED, PROC_REF(__distance_check)) playsound(src, 'sound/effects/gravhit.ogg', 100, TRUE) /mob/living/simple_animal/hostile/guardian/gravitokinetic/proc/remove_gravity(atom/target) diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm index 18e1d98ca50..339396c7e51 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm @@ -114,7 +114,7 @@ /obj/effect/snare/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/simple_animal/heretic_monsters.dm b/code/modules/mob/living/simple_animal/heretic_monsters.dm index 60f0ffdb39e..bad34d93798 100644 --- a/code/modules/mob/living/simple_animal/heretic_monsters.dm +++ b/code/modules/mob/living/simple_animal/heretic_monsters.dm @@ -77,7 +77,7 @@ linker_action_path = /datum/action/cooldown/spell/pointed/manse_link, \ link_message = on_link_message, \ unlink_message = on_unlink_message, \ - post_unlink_callback = CALLBACK(src, .proc/after_unlink), \ + post_unlink_callback = CALLBACK(src, PROC_REF(after_unlink)), \ speech_action_background_icon_state = "bg_ecult", \ ) @@ -120,7 +120,7 @@ if(QDELETED(unlinked_mob) || unlinked_mob.stat == DEAD) return - INVOKE_ASYNC(unlinked_mob, /mob.proc/emote, "scream") + INVOKE_ASYNC(unlinked_mob, TYPE_PROC_REF(/mob, emote), "scream") unlinked_mob.AdjustParalyzed(0.5 SECONDS) //micro stun // What if we took a linked list... But made it a mob? @@ -175,7 +175,7 @@ worm_length = 3 //code breaks below 3, let's just not allow it. oldloc = loc - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/update_chain_links) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(update_chain_links)) if(!spawn_bodyparts) return diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 31545ef74de..5ecf53033db 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -370,7 +370,7 @@ /mob/living/simple_animal/hostile/bee/short/Initialize(mapload, timetolive=50 SECONDS) . = ..() - addtimer(CALLBACK(src, .proc/death), timetolive) + addtimer(CALLBACK(src, PROC_REF(death)), timetolive) /obj/item/trash/bee name = "bee" diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm index 75fa33ec49f..345fcf20102 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -68,7 +68,7 @@ for(var/i in 1 to summon_amount) var/atom/chosen_minion = pick_n_take(minions) chosen_minion = new chosen_minion(get_step(boss, pick_n_take(directions))) - RegisterSignal(chosen_minion, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), .proc/lost_minion) + RegisterSignal(chosen_minion, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(lost_minion)) summoned_minions++ /// Called when a minion is qdeleted or dies, removes it from our minion list diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index 529508e73de..31629374a2e 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -99,7 +99,7 @@ return ..() /mob/living/simple_animal/hostile/carp/proc/make_tameable() - AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/meat), tame_chance = 10, bonus_tame_chance = 5, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/meat), tame_chance = 10, bonus_tame_chance = 5, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/simple_animal/hostile/carp/proc/tamed(mob/living/tamer) tamed = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 0dc4b2f8e78..35feb539f77 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -314,7 +314,7 @@ . = ..() if (!owner) return - RegisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_DO_AFTER_BEGAN, COMSIG_DO_AFTER_ENDED), .proc/update_icon_on_signal) + RegisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_DO_AFTER_BEGAN, COMSIG_DO_AFTER_ENDED), PROC_REF(update_icon_on_signal)) /datum/action/innate/spider/lay_web/Remove(mob/removed_from) . = ..() @@ -383,7 +383,7 @@ . = ..() if (!owner) return - RegisterSignal(owner, list(COMSIG_DO_AFTER_BEGAN, COMSIG_DO_AFTER_ENDED), .proc/update_icon_on_signal) + RegisterSignal(owner, list(COMSIG_DO_AFTER_BEGAN, COMSIG_DO_AFTER_ENDED), PROC_REF(update_icon_on_signal)) /datum/action/cooldown/wrap/Remove(mob/removed_from) . = ..() @@ -438,7 +438,7 @@ return FALSE StartCooldown(wrap_time) - INVOKE_ASYNC(src, .proc/cocoon, to_wrap) + INVOKE_ASYNC(src, PROC_REF(cocoon), to_wrap) return TRUE /datum/action/cooldown/wrap/proc/cocoon(atom/movable/to_wrap) @@ -496,7 +496,7 @@ . = ..() if (!owner) return - RegisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_DO_AFTER_BEGAN, COMSIG_DO_AFTER_ENDED), .proc/update_icon_on_signal) + RegisterSignal(owner, list(COMSIG_MOVABLE_MOVED, COMSIG_DO_AFTER_BEGAN, COMSIG_DO_AFTER_ENDED), PROC_REF(update_icon_on_signal)) /datum/action/innate/spider/lay_eggs/Remove(mob/removed_from) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm index 6b7df2a1668..afa2bfbb864 100644 --- a/code/modules/mob/living/simple_animal/hostile/goose.dm +++ b/code/modules/mob/living/simple_animal/hostile/goose.dm @@ -40,7 +40,7 @@ /mob/living/simple_animal/hostile/retaliate/goose/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/goosement) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(goosement)) /mob/living/simple_animal/hostile/retaliate/goose/proc/goosement(atom/movable/AM, OldLoc, Dir, Forced) SIGNAL_HANDLER @@ -143,7 +143,7 @@ /mob/living/simple_animal/hostile/retaliate/goose/proc/choke(obj/item/food/plastic) if(stat == DEAD || choking) return - addtimer(CALLBACK(src, .proc/suffocate), 300) + addtimer(CALLBACK(src, PROC_REF(suffocate)), 300) /mob/living/simple_animal/hostile/retaliate/goose/vomit/choke(obj/item/food/plastic) if(stat == DEAD || choking) @@ -151,9 +151,9 @@ if(prob(25)) visible_message(span_warning("[src] is gagging on \the [plastic]!")) manual_emote("gags!") - addtimer(CALLBACK(src, .proc/vomit), 300) + addtimer(CALLBACK(src, PROC_REF(vomit)), 300) else - addtimer(CALLBACK(src, .proc/suffocate), 300) + addtimer(CALLBACK(src, PROC_REF(suffocate)), 300) /mob/living/simple_animal/hostile/retaliate/goose/Life(delta_time = SSMOBS_DT, times_fired) . = ..() @@ -200,13 +200,13 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/vomit_prestart(duration) flick("vomit_start",src) - addtimer(CALLBACK(src, .proc/vomit_start, duration), 13) //13 is the length of the vomit_start animation in gooseloose.dmi + addtimer(CALLBACK(src, PROC_REF(vomit_start), duration), 13) //13 is the length of the vomit_start animation in gooseloose.dmi /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/vomit_start(duration) vomiting = TRUE icon_state = "vomit" vomit() - addtimer(CALLBACK(src, .proc/vomit_preend), duration) + addtimer(CALLBACK(src, PROC_REF(vomit_preend)), duration) /mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/vomit_preend() for (var/obj/item/consumed in contents) //Get rid of any food left in the poor thing @@ -224,7 +224,7 @@ /mob/living/simple_animal/hostile/retaliate/goose/vomit/goosement(atom/movable/AM, OldLoc, Dir, Forced) . = ..() if(vomiting) - INVOKE_ASYNC(src, .proc/vomit) // its supposed to keep vomiting if you move + INVOKE_ASYNC(src, PROC_REF(vomit)) // its supposed to keep vomiting if you move return if(prob(vomitCoefficient * 0.2)) vomit_prestart(vomitTimeBonus + 25) @@ -234,9 +234,9 @@ /// A proc to make it easier for admins to make the goose playable by deadchat. /mob/living/simple_animal/hostile/retaliate/goose/vomit/deadchat_plays(mode = ANARCHY_MODE, cooldown = 12 SECONDS) . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list( - "vomit" = CALLBACK(src, .proc/vomit_prestart, 25), - "honk" = CALLBACK(src, /atom/movable.proc/say, "HONK!!!"), - "spin" = CALLBACK(src, /mob.proc/emote, "spin")), cooldown, CALLBACK(src, .proc/stop_deadchat_plays)) + "vomit" = CALLBACK(src, PROC_REF(vomit_prestart), 25), + "honk" = CALLBACK(src, TYPE_PROC_REF(/atom/movable, say), "HONK!!!"), + "spin" = CALLBACK(src, TYPE_PROC_REF(/mob, emote), "spin")), cooldown, CALLBACK(src, PROC_REF(stop_deadchat_plays))) if(. == COMPONENT_INCOMPATIBLE) return diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 8631c9ad4e2..1dcb2645c59 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -52,7 +52,7 @@ return Infect(target) to_chat(src, span_userdanger("With our egg laid, our death approaches rapidly...")) - addtimer(CALLBACK(src, .proc/death), 100) + addtimer(CALLBACK(src, PROC_REF(death)), 100) /obj/item/organ/internal/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 f1f62be7edb..1cd6e166fb0 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -126,7 +126,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) @@ -301,7 +301,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) @@ -448,7 +448,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 @@ -593,7 +593,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() @@ -604,7 +604,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) @@ -664,4 +664,4 @@ UnregisterSignal(target, COMSIG_PARENT_QDELETING) target = new_target if(target) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/handle_target_del) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(handle_target_del)) diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index a12f3f136ba..2e4c58ed9f1 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -91,7 +91,7 @@ ADD_TRAIT(src, TRAIT_MOVE_FLOATING, LEAPER_BUBBLE_TRAIT) QDEL_IN(src, 100) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/swabable, CELL_LINE_TABLE_LEAPER, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) @@ -221,7 +221,7 @@ if(AIStatus == AI_ON && ranged_cooldown <= world.time) projectile_ready = TRUE update_icons() - throw_at(new_turf, max(3,get_dist(src,new_turf)), 1, src, FALSE, callback = CALLBACK(src, .proc/FinishHop)) + throw_at(new_turf, max(3,get_dist(src,new_turf)), 1, src, FALSE, callback = CALLBACK(src, PROC_REF(FinishHop))) /mob/living/simple_animal/hostile/jungle/leaper/proc/FinishHop() set_density(TRUE) @@ -231,18 +231,18 @@ playsound(src.loc, 'sound/effects/meteorimpact.ogg', 100, TRUE) if(target && AIStatus == AI_ON && projectile_ready && !ckey) face_atom(target) - addtimer(CALLBACK(src, .proc/OpenFire, target), 5) + addtimer(CALLBACK(src, PROC_REF(OpenFire), target), 5) /mob/living/simple_animal/hostile/jungle/leaper/proc/BellyFlop() var/turf/new_turf = get_turf(target) hopping = TRUE notransform = TRUE new /obj/effect/temp_visual/leaper_crush(new_turf) - addtimer(CALLBACK(src, .proc/BellyFlopHop, new_turf), 30) + addtimer(CALLBACK(src, PROC_REF(BellyFlopHop), new_turf), 30) /mob/living/simple_animal/hostile/jungle/leaper/proc/BellyFlopHop(turf/T) set_density(FALSE) - throw_at(T, get_dist(src,T),1,src, FALSE, callback = CALLBACK(src, .proc/Crush)) + throw_at(T, get_dist(src,T),1,src, FALSE, callback = CALLBACK(src, PROC_REF(Crush))) /mob/living/simple_animal/hostile/jungle/leaper/proc/Crush() hopping = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm index 52e9ee10698..a6bc04e93aa 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm @@ -74,9 +74,9 @@ SSmove_manager.stop_looping(src) update_icons() if(prob(50) && get_dist(src,target) <= 3 || forced_slash_combo) - addtimer(CALLBACK(src, .proc/SlashCombo), ATTACK_INTERMISSION_TIME) + addtimer(CALLBACK(src, PROC_REF(SlashCombo)), ATTACK_INTERMISSION_TIME) return - addtimer(CALLBACK(src, .proc/LeapAttack), ATTACK_INTERMISSION_TIME + rand(0,3)) + addtimer(CALLBACK(src, PROC_REF(LeapAttack)), ATTACK_INTERMISSION_TIME + rand(0,3)) return attack_state = MOOK_ATTACK_RECOVERY ResetNeutral() @@ -86,9 +86,9 @@ attack_state = MOOK_ATTACK_ACTIVE update_icons() SlashAttack() - addtimer(CALLBACK(src, .proc/SlashAttack), 3) - addtimer(CALLBACK(src, .proc/SlashAttack), 6) - addtimer(CALLBACK(src, .proc/AttackRecovery), 9) + addtimer(CALLBACK(src, PROC_REF(SlashAttack)), 3) + addtimer(CALLBACK(src, PROC_REF(SlashAttack)), 6) + addtimer(CALLBACK(src, PROC_REF(AttackRecovery)), 9) /mob/living/simple_animal/hostile/jungle/mook/proc/SlashAttack() if(target && !stat && attack_state == MOOK_ATTACK_ACTIVE) @@ -117,7 +117,7 @@ playsound(src, 'sound/weapons/thudswoosh.ogg', 25, TRUE) playsound(src, 'sound/voice/mook_leap_yell.ogg', 100, TRUE) var/target_turf = get_turf(target) - throw_at(target_turf, 7, 1, src, FALSE, callback = CALLBACK(src, .proc/AttackRecovery)) + throw_at(target_turf, 7, 1, src, FALSE, callback = CALLBACK(src, PROC_REF(AttackRecovery))) return attack_state = MOOK_ATTACK_RECOVERY ResetNeutral() @@ -136,11 +136,11 @@ if(isliving(target)) var/mob/living/L = target if(L.incapacitated() && L.stat != DEAD) - addtimer(CALLBACK(src, .proc/WarmupAttack, TRUE), ATTACK_INTERMISSION_TIME) + addtimer(CALLBACK(src, PROC_REF(WarmupAttack), TRUE), ATTACK_INTERMISSION_TIME) return - addtimer(CALLBACK(src, .proc/WarmupAttack), ATTACK_INTERMISSION_TIME) + addtimer(CALLBACK(src, PROC_REF(WarmupAttack)), ATTACK_INTERMISSION_TIME) return - addtimer(CALLBACK(src, .proc/ResetNeutral), ATTACK_INTERMISSION_TIME) + addtimer(CALLBACK(src, PROC_REF(ResetNeutral)), ATTACK_INTERMISSION_TIME) /mob/living/simple_animal/hostile/jungle/mook/proc/ResetNeutral() if(attack_state == MOOK_ATTACK_RECOVERY) diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm index 5f05d8e27d5..aef62c0bca1 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm @@ -134,7 +134,7 @@ if(get_dist(src,target) >= 4 && prob(40)) SolarBeamStartup(target) return - addtimer(CALLBACK(src, .proc/Volley), 5) + addtimer(CALLBACK(src, PROC_REF(Volley)), 5) /mob/living/simple_animal/hostile/jungle/seedling/proc/SolarBeamStartup(mob/living/living_target)//It's more like requiem than final spark if(combatant_state == SEEDLING_STATE_WARMUP && target) @@ -145,7 +145,7 @@ if(get_dist(src,living_target) > 7) playsound(living_target,'sound/effects/seedling_chargeup.ogg', 100, FALSE) solar_beam_identifier = world.time - addtimer(CALLBACK(src, .proc/Beamu, living_target, solar_beam_identifier), 35) + addtimer(CALLBACK(src, PROC_REF(Beamu), living_target, solar_beam_identifier), 35) /mob/living/simple_animal/hostile/jungle/seedling/proc/Beamu(mob/living/living_target, beam_id = 0) if(combatant_state == SEEDLING_STATE_ACTIVE && living_target && beam_id == solar_beam_identifier) @@ -165,7 +165,7 @@ living_target.adjust_fire_stacks(0.2)//Just here for the showmanship living_target.ignite_mob() playsound(living_target,'sound/weapons/sear.ogg', 50, TRUE) - addtimer(CALLBACK(src, .proc/AttackRecovery), 5) + addtimer(CALLBACK(src, PROC_REF(AttackRecovery)), 5) return AttackRecovery() @@ -173,10 +173,10 @@ if(combatant_state == SEEDLING_STATE_WARMUP && target) combatant_state = SEEDLING_STATE_ACTIVE update_icons() - var/datum/callback/cb = CALLBACK(src, .proc/InaccurateShot) + var/datum/callback/cb = CALLBACK(src, PROC_REF(InaccurateShot)) for(var/i in 1 to 13) addtimer(cb, i) - addtimer(CALLBACK(src, .proc/AttackRecovery), 14) + addtimer(CALLBACK(src, PROC_REF(AttackRecovery)), 14) /mob/living/simple_animal/hostile/jungle/seedling/proc/InaccurateShot() if(!QDELETED(target) && combatant_state == SEEDLING_STATE_ACTIVE && !stat) @@ -196,7 +196,7 @@ ranged_cooldown = world.time + ranged_cooldown_time if(target) face_atom(target) - addtimer(CALLBACK(src, .proc/ResetNeutral), 10) + addtimer(CALLBACK(src, PROC_REF(ResetNeutral)), 10) /mob/living/simple_animal/hostile/jungle/seedling/proc/ResetNeutral() combatant_state = SEEDLING_STATE_NEUTRAL diff --git a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm index d68c5b38764..5800796f2a0 100644 --- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm +++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm @@ -63,7 +63,7 @@ if(spawn_mecha_type) var/obj/vehicle/sealed/mecha/M = new spawn_mecha_type (get_turf(src)) if(istype(M)) - INVOKE_ASYNC(src, .proc/enter_mecha, M) + INVOKE_ASYNC(src, PROC_REF(enter_mecha), M) /mob/living/simple_animal/hostile/syndicate/mecha_pilot/proc/enter_mecha(obj/vehicle/sealed/mecha/M) @@ -231,7 +231,7 @@ if(LAZYACCESSASSOC(mecha.occupant_actions, src, /datum/action/vehicle/sealed/mecha/mech_defense_mode) && !mecha.defense_mode) var/datum/action/vehicle/sealed/mecha/mech_defense_mode/action = mecha.occupant_actions[src][/datum/action/vehicle/sealed/mecha/mech_defense_mode] action.Trigger(forced_state = TRUE) - addtimer(CALLBACK(action, /datum/action/vehicle/sealed/mecha/mech_defense_mode.proc/Trigger, FALSE), 100) //10 seconds of defense, then toggle off + addtimer(CALLBACK(action, TYPE_PROC_REF(/datum/action/vehicle/sealed/mecha/mech_defense_mode, Trigger), FALSE), 100) //10 seconds of defense, then toggle off else if(prob(retreat_chance)) //Speed boost if possible @@ -239,7 +239,7 @@ var/datum/action/vehicle/sealed/mecha/mech_overload_mode/action = mecha.occupant_actions[src][/datum/action/vehicle/sealed/mecha/mech_overload_mode] mecha.leg_overload_mode = FALSE action.Trigger(forced_state = TRUE) - addtimer(CALLBACK(action, /datum/action/vehicle/sealed/mecha/mech_overload_mode.proc/Trigger, FALSE), 100) //10 seconds of speeeeed, then toggle off + addtimer(CALLBACK(action, TYPE_PROC_REF(/datum/action/vehicle/sealed/mecha/mech_overload_mode, Trigger), FALSE), 100) //10 seconds of speeeeed, then toggle off retreat_distance = 50 addtimer(VARSET_CALLBACK(src, retreat_distance, 0), 10 SECONDS) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index c4238506abf..1982a94de8a 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 @@ -168,7 +168,7 @@ Difficulty: Medium /obj/effect/temp_visual/dir_setting/miner_death/Initialize(mapload, set_dir) . = ..() - INVOKE_ASYNC(src, .proc/fade_out) + INVOKE_ASYNC(src, PROC_REF(fade_out)) /obj/effect/temp_visual/dir_setting/miner_death/proc/fade_out() var/matrix/M = new diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index cbf15b468d8..1fc67c3d7e9 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -97,8 +97,8 @@ Difficulty: Hard blood_warp.Grant(src) hallucination_charge.spawn_blood = TRUE hallucination_charge_surround.spawn_blood = TRUE - RegisterSignal(src, COMSIG_BLOOD_WARP, .proc/blood_enrage) - RegisterSignal(src, COMSIG_FINISHED_CHARGE, .proc/after_charge) + RegisterSignal(src, COMSIG_BLOOD_WARP, PROC_REF(blood_enrage)) + RegisterSignal(src, COMSIG_FINISHED_CHARGE, PROC_REF(after_charge)) if(spawn_blood) AddComponent(/datum/component/blood_walk, \ blood_type = /obj/effect/decal/cleanable/blood/bubblegum, \ @@ -159,7 +159,7 @@ Difficulty: Hard /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/try_bloodattack() var/list/targets = get_mobs_on_blood() if(targets.len) - INVOKE_ASYNC(src, .proc/bloodattack, targets, prob(50)) + INVOKE_ASYNC(src, PROC_REF(bloodattack), targets, prob(50)) return TRUE return FALSE @@ -225,7 +225,7 @@ Difficulty: Hard var/turf/targetturf = get_step(src, dir) L.forceMove(targetturf) playsound(targetturf, 'sound/magic/exit_blood.ogg', 100, TRUE, -1) - addtimer(CALLBACK(src, .proc/devour, L), 2) + addtimer(CALLBACK(src, PROC_REF(devour), L), 2) SLEEP_CHECK_DEATH(1, src) /mob/living/simple_animal/hostile/megafauna/bubblegum/devour(mob/living/yummy_food) @@ -255,9 +255,9 @@ Difficulty: Hard return FALSE enrage_till = world.time + enrage_time update_approach() - INVOKE_ASYNC(src, .proc/change_move_delay, 3.75) + INVOKE_ASYNC(src, PROC_REF(change_move_delay), 3.75) add_atom_colour(COLOR_BUBBLEGUM_RED, TEMPORARY_COLOUR_PRIORITY) - var/datum/callback/cb = CALLBACK(src, .proc/blood_enrage_end) + var/datum/callback/cb = CALLBACK(src, PROC_REF(blood_enrage_end)) addtimer(cb, enrage_time) /mob/living/simple_animal/hostile/megafauna/bubblegum/proc/after_charge() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 7a68550c448..17b9f37366d 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -82,8 +82,8 @@ shotgun_blast.Grant(src) dir_shots.Grant(src) colossus_final.Grant(src) - RegisterSignal(src, COMSIG_MOB_ABILITY_STARTED, .proc/start_attack) - RegisterSignal(src, COMSIG_MOB_ABILITY_FINISHED, .proc/finished_attack) + RegisterSignal(src, COMSIG_MOB_ABILITY_STARTED, PROC_REF(start_attack)) + RegisterSignal(src, COMSIG_MOB_ABILITY_FINISHED, PROC_REF(finished_attack)) AddElement(/datum/element/projectile_shield) /mob/living/simple_animal/hostile/megafauna/colossus/Destroy() @@ -137,13 +137,13 @@ spiral_shots.enraged = COLOSSUS_ENRAGED telegraph() icon_state = "eva_attack" - INVOKE_ASYNC(src, /atom/movable.proc/say, "Judgement.", null, list("colossus", "yell")) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), "Judgement.", null, list("colossus", "yell")) else if(activated == random_shots) - INVOKE_ASYNC(src, /atom/movable.proc/say, "Wrath.", null, list("colossus", "yell")) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), "Wrath.", null, list("colossus", "yell")) else if(activated == shotgun_blast) - INVOKE_ASYNC(src, /atom/movable.proc/say, "Retribution.", null, list("colossus", "yell")) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), "Retribution.", null, list("colossus", "yell")) else if(activated == dir_shots) - INVOKE_ASYNC(src, /atom/movable.proc/say, "Lament.", null, list("colossus", "yell")) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, say), "Lament.", null, list("colossus", "yell")) /mob/living/simple_animal/hostile/megafauna/colossus/proc/finished_attack(mob/living/owner, datum/action/cooldown/finished) SIGNAL_HANDLER @@ -179,7 +179,7 @@ /obj/effect/temp_visual/at_shield/Initialize(mapload, new_target) . = ..() target = new_target - INVOKE_ASYNC(src, /atom/movable.proc/orbit, target, 0, FALSE, 0, 0, FALSE, TRUE) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, orbit), target, 0, FALSE, 0, 0, FALSE, TRUE) /obj/projectile/colossus name = "death bolt" diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index fd186850e53..18618249c37 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 @@ -76,7 +76,7 @@ Difficulty: Extremely Hard hard_ice_shotgun.Grant(src) for(var/obj/structure/frost_miner_prism/prism_to_set in GLOB.frost_miner_prisms) prism_to_set.set_prism_light(LIGHT_COLOR_BLUE, 5) - RegisterSignal(src, COMSIG_MOB_ABILITY_STARTED, .proc/start_attack) + RegisterSignal(src, COMSIG_MOB_ABILITY_STARTED, PROC_REF(start_attack)) AddElement(/datum/element/knockback, 7, FALSE, TRUE) AddElement(/datum/element/lifesteal, 50) ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT) @@ -119,7 +119,7 @@ Difficulty: Extremely Hard if(enraging) return COMPONENT_BLOCK_ABILITY_START if(FROST_MINER_SHOULD_ENRAGE) - INVOKE_ASYNC(src, .proc/check_enraged) + INVOKE_ASYNC(src, PROC_REF(check_enraged)) return COMPONENT_BLOCK_ABILITY_START var/projectile_speed_multiplier = 1 - enraged * 0.5 frost_orbs.projectile_speed_multiplier = projectile_speed_multiplier @@ -241,7 +241,7 @@ Difficulty: Extremely Hard return forceMove(user) to_chat(user, span_notice("You feel a bit safer... but a demonic presence lurks in the back of your head...")) - RegisterSignal(user, COMSIG_LIVING_DEATH, .proc/resurrect) + RegisterSignal(user, COMSIG_LIVING_DEATH, PROC_REF(resurrect)) /// Resurrects the target when they die by moving them and dusting a clone in their place, one life for another /obj/item/resurrection_crystal/proc/resurrect(mob/living/carbon/user, gibbed) @@ -253,12 +253,12 @@ Difficulty: Extremely Hard var/typepath = user.type var/mob/living/carbon/clone = new typepath(user.loc) clone.real_name = user.real_name - INVOKE_ASYNC(user.dna, /datum/dna.proc/transfer_identity, clone) + INVOKE_ASYNC(user.dna, TYPE_PROC_REF(/datum/dna, transfer_identity), clone) clone.updateappearance(mutcolor_update=1) var/turf/T = find_safe_turf() user.forceMove(T) user.revive(full_heal = TRUE, admin_revive = TRUE) - INVOKE_ASYNC(user, /mob/living/carbon.proc/set_species, /datum/species/shadow) + INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living/carbon, set_species), /datum/species/shadow) to_chat(user, span_notice("You blink and find yourself in [get_area_name(T)]... feeling a bit darker.")) clone.dust() qdel(src) @@ -273,7 +273,7 @@ Difficulty: Extremely Hard /obj/item/clothing/shoes/winterboots/ice_boots/ice_trail/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, .proc/on_step) + RegisterSignal(src, COMSIG_SHOES_STEP_ACTION, PROC_REF(on_step)) /obj/item/clothing/shoes/winterboots/ice_boots/ice_trail/equipped(mob/user, slot) . = ..() @@ -301,7 +301,7 @@ Difficulty: Extremely Hard return var/reset_turf = T.type T.ChangeTurf(change_turf, flags = CHANGETURF_INHERIT_AIR) - addtimer(CALLBACK(T, /turf.proc/ChangeTurf, reset_turf, null, CHANGETURF_INHERIT_AIR), duration, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(T, TYPE_PROC_REF(/turf, ChangeTurf), reset_turf, null, CHANGETURF_INHERIT_AIR), duration, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/item/pickaxe/drill/jackhammer/demonic name = "demonic jackhammer" @@ -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, span_userdanger("You become frozen in a cube!")) cube = icon('icons/effects/freeze.dmi', "ice_cube") diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index f9027666b7a..574ea33883c 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -93,10 +93,10 @@ meteors.Grant(src) mass_fire.Grant(src) lava_swoop.Grant(src) - RegisterSignal(src, COMSIG_MOB_ABILITY_STARTED, .proc/start_attack) - RegisterSignal(src, COMSIG_MOB_ABILITY_FINISHED, .proc/finished_attack) - RegisterSignal(src, COMSIG_SWOOP_INVULNERABILITY_STARTED, .proc/swoop_invulnerability_started) - RegisterSignal(src, COMSIG_LAVA_ARENA_FAILED, .proc/on_arena_fail) + RegisterSignal(src, COMSIG_MOB_ABILITY_STARTED, PROC_REF(start_attack)) + RegisterSignal(src, COMSIG_MOB_ABILITY_FINISHED, PROC_REF(finished_attack)) + RegisterSignal(src, COMSIG_SWOOP_INVULNERABILITY_STARTED, PROC_REF(swoop_invulnerability_started)) + RegisterSignal(src, COMSIG_LAVA_ARENA_FAILED, PROC_REF(on_arena_fail)) /mob/living/simple_animal/hostile/megafauna/dragon/Destroy() QDEL_NULL(fire_cone) @@ -160,7 +160,7 @@ /mob/living/simple_animal/hostile/megafauna/dragon/proc/on_arena_fail() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/arena_escape_enrage) + INVOKE_ASYNC(src, PROC_REF(arena_escape_enrage)) /mob/living/simple_animal/hostile/megafauna/dragon/proc/arena_escape_enrage() // you ran somehow / teleported away from my arena attack now i'm mad fucker SLEEP_CHECK_DEATH(0, src) @@ -249,7 +249,7 @@ /obj/effect/temp_visual/lava_warning/Initialize(mapload, reset_time = 10) . = ..() - INVOKE_ASYNC(src, .proc/fall, reset_time) + INVOKE_ASYNC(src, PROC_REF(fall), reset_time) src.alpha = 63.75 animate(src, alpha = 255, time = duration) @@ -274,7 +274,7 @@ var/lava_turf = /turf/open/lava/smooth var/reset_turf = T.type T.ChangeTurf(lava_turf, flags = CHANGETURF_INHERIT_AIR) - addtimer(CALLBACK(T, /turf.proc/ChangeTurf, reset_turf, null, CHANGETURF_INHERIT_AIR), reset_time, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(T, TYPE_PROC_REF(/turf, ChangeTurf), reset_turf, null, CHANGETURF_INHERIT_AIR), reset_time, TIMER_OVERRIDE|TIMER_UNIQUE) /obj/effect/temp_visual/drakewall desc = "An ash drakes true flame." @@ -320,7 +320,7 @@ /obj/effect/temp_visual/target/Initialize(mapload, list/flame_hit) . = ..() - INVOKE_ASYNC(src, .proc/fall, flame_hit) + INVOKE_ASYNC(src, PROC_REF(fall), flame_hit) /obj/effect/temp_visual/target/proc/fall(list/flame_hit) var/turf/T = get_turf(src) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index db733b440f5..c7a9b0dbbef 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -206,13 +206,13 @@ Difficulty: Hard else if(prob(70 - anger_modifier)) //a cross blast of some type if(prob(anger_modifier * (2 / target_slowness)) && health < maxHealth * 0.5) //we're super angry do it at all dirs - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.alldirs) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.alldirs) else if(prob(60)) - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.cardinals) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.cardinals) else - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.diagonals) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.diagonals) else //just release a burst of power - INVOKE_ASYNC(src, .proc/burst, get_turf(src)) + INVOKE_ASYNC(src, PROC_REF(burst), get_turf(src)) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/blink_spam(blink_counter, target_slowness, cross_counter) update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = max(0.5 SECONDS, major_attack_cooldown - anger_modifier * 0.75))) @@ -246,9 +246,9 @@ Difficulty: Hard while(!QDELETED(target) && cross_counter) cross_counter-- if(prob(60)) - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.cardinals) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.cardinals) else - INVOKE_ASYNC(src, .proc/blasts, target, GLOB.diagonals) + INVOKE_ASYNC(src, PROC_REF(blasts), target, GLOB.diagonals) SLEEP_CHECK_DEATH(6 + target_slowness, src) animate(src, color = oldcolor, time = 8) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 8) @@ -297,7 +297,7 @@ Difficulty: Hard SLEEP_CHECK_DEATH(2, src) new /obj/effect/temp_visual/hierophant/blast/damaging(T, src, FALSE) for(var/d in directions) - INVOKE_ASYNC(src, .proc/blast_wall, T, d) + INVOKE_ASYNC(src, PROC_REF(blast_wall), T, d) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/blast_wall(turf/T, set_dir) //make a wall of blasts beam_range tiles long var/range = beam_range @@ -316,13 +316,13 @@ Difficulty: Hard return update_cooldowns(list(COOLDOWN_UPDATE_SET_ARENA = arena_cooldown_time)) for(var/d in GLOB.cardinals) - INVOKE_ASYNC(src, .proc/arena_squares, T, d) + INVOKE_ASYNC(src, PROC_REF(arena_squares), T, d) for(var/t in RANGE_TURFS(11, T)) if(t && get_dist(t, T) == 11) new /obj/effect/temp_visual/hierophant/wall(t, src) new /obj/effect/temp_visual/hierophant/blast/damaging(t, src, FALSE) if(get_dist(src, T) >= 11) //hey you're out of range I need to get closer to you! - INVOKE_ASYNC(src, .proc/blink, T) + INVOKE_ASYNC(src, PROC_REF(blink), T) /mob/living/simple_animal/hostile/megafauna/hierophant/proc/arena_squares(turf/T, set_dir) //make a fancy effect extending from the arena target var/turf/previousturf = T @@ -466,10 +466,10 @@ Difficulty: Hard if(ranged_cooldown <= world.time) calculate_rage() update_cooldowns(list(COOLDOWN_UPDATE_SET_RANGED = max(0.5 SECONDS, ranged_cooldown_time - anger_modifier * 0.75)), ignore_staggered = TRUE) - INVOKE_ASYNC(src, .proc/burst, get_turf(src)) + INVOKE_ASYNC(src, PROC_REF(burst), get_turf(src)) else burst_range = 3 - INVOKE_ASYNC(src, .proc/burst, get_turf(src), 0.25) //melee attacks on living mobs cause it to release a fast burst if on cooldown + INVOKE_ASYNC(src, PROC_REF(burst), get_turf(src), 0.25) //melee attacks on living mobs cause it to release a fast burst if on cooldown OpenFire() else devour(L) @@ -585,7 +585,7 @@ Difficulty: Hard friendly_fire_check = is_friendly_fire if(new_speed) speed = new_speed - addtimer(CALLBACK(src, .proc/seek_target), 1) + addtimer(CALLBACK(src, PROC_REF(seek_target)), 1) /obj/effect/temp_visual/hierophant/chaser/proc/get_target_dir() . = get_cardinal_dir(src, targetturf) @@ -670,9 +670,9 @@ Difficulty: Hard if(ismineralturf(loc)) //drill mineral turfs var/turf/closed/mineral/M = loc M.gets_drilled(caster) - INVOKE_ASYNC(src, .proc/blast) + INVOKE_ASYNC(src, PROC_REF(blast)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 0d2655e23c3..75613fd5a1b 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -161,15 +161,15 @@ minimum_distance = 0 set_varspeed(0) charging = TRUE - addtimer(CALLBACK(src, .proc/reset_charge), 60) + addtimer(CALLBACK(src, PROC_REF(reset_charge)), 60) var/mob/living/L = target if(!istype(L) || L.stat != DEAD) //I know, weird syntax, but it just works. - addtimer(CALLBACK(src, .proc/throw_thyself), 20) + addtimer(CALLBACK(src, PROC_REF(throw_thyself)), 20) ///This is the proc that actually does the throwing. Charge only adds a timer for this. /mob/living/simple_animal/hostile/megafauna/legion/proc/throw_thyself() playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 50, TRUE) - throw_at(target, 7, 1.1, src, FALSE, FALSE, CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/effects/meteorimpact.ogg', 50 * size, TRUE, 2), INFINITY) + throw_at(target, 7, 1.1, src, FALSE, FALSE, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/effects/meteorimpact.ogg', 50 * size, TRUE, 2), INFINITY) ///Deals some extra damage on throw impact. /mob/living/simple_animal/hostile/megafauna/legion/throw_impact(mob/living/hit_atom, datum/thrownthing/throwingdatum) @@ -285,7 +285,7 @@ /obj/structure/legionturret/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/set_up_shot), initial_firing_time) + addtimer(CALLBACK(src, PROC_REF(set_up_shot)), initial_firing_time) ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT) ///Handles an extremely basic AI @@ -310,7 +310,7 @@ var/datum/point/vector/V = new(T1.x, T1.y, T1.z, 0, 0, angle) generate_tracer_between_points(V, V.return_vector_after_increments(6), /obj/effect/projectile/tracer/legion/tracer, 0, shot_delay, 0, 0, 0, null) playsound(src, 'sound/machines/airlockopen.ogg', 100, TRUE) - addtimer(CALLBACK(src, .proc/fire_beam, angle), shot_delay) + addtimer(CALLBACK(src, PROC_REF(fire_beam), angle), shot_delay) ///Called shot_delay after the turret shot the tracer. Shoots a projectile into the same direction. /obj/structure/legionturret/proc/fire_beam(angle) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index 329329c171d..a2c3f4a9445 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -141,7 +141,7 @@ Difficulty: Hard . = ..() stored_move_dirs &= ~movement_dir if(!stored_move_dirs) - INVOKE_ASYNC(src, .proc/wendigo_slam, stomp_range, 1, 8) + INVOKE_ASYNC(src, PROC_REF(wendigo_slam), stomp_range, 1, 8) /// Slams the ground around the source throwing back enemies caught nearby, delay is for the radius increase /mob/living/simple_animal/hostile/megafauna/wendigo/proc/wendigo_slam(range, delay, throw_range) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 274a54003e4..061c8de41d8 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -90,7 +90,7 @@ set_varspeed(0) warmed_up = TRUE projectiletype = /obj/projectile/temp/basilisk/heated - addtimer(CALLBACK(src, .proc/cool_down), 3000) + addtimer(CALLBACK(src, PROC_REF(cool_down)), 3000) /mob/living/simple_animal/hostile/asteroid/basilisk/proc/cool_down() visible_message(span_warning("[src] appears to be cooling down...")) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm index 2ea8d46f4de..37116d21dae 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/brimdemon.dm @@ -100,7 +100,7 @@ add_overlay("brimdemon_telegraph_dir") visible_message(span_danger("[src] starts charging!")) balloon_alert(src, "charging...") - addtimer(CALLBACK(src, .proc/fire_laser), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(fire_laser)), 1 SECONDS) COOLDOWN_START(src, ranged_cooldown, ranged_cooldown_time) /mob/living/simple_animal/hostile/asteroid/brimdemon/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) @@ -145,7 +145,7 @@ last_brimbeam.icon_state = "brimbeam_end" var/atom/first_brimbeam = beamparts[1] first_brimbeam.icon_state = "brimbeam_start" - addtimer(CALLBACK(src, .proc/end_laser), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(end_laser)), 2 SECONDS) /// Deletes all the brimbeam parts and sets variables back to their initial ones. /mob/living/simple_animal/hostile/asteroid/brimdemon/proc/end_laser() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm index 6daeb14f70b..955bf1d6863 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm @@ -49,10 +49,10 @@ our_loop = SSmove_manager.force_move(src, move_target, delay, priority = MOVEMENT_ABOVE_SPACE_PRIORITY) if(!our_loop) return - RegisterSignal(move_target, COMSIG_MOB_STATCHANGE, .proc/stat_change) - RegisterSignal(move_target, COMSIG_MOVABLE_Z_CHANGED, .proc/target_z_change) - RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, .proc/our_z_change) - RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, .proc/handle_loop_end) + RegisterSignal(move_target, COMSIG_MOB_STATCHANGE, PROC_REF(stat_change)) + RegisterSignal(move_target, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(target_z_change)) + RegisterSignal(src, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(our_z_change)) + RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, PROC_REF(handle_loop_end)) /mob/living/simple_animal/hostile/asteroid/curseblob/proc/stat_change(datum/source, new_stat) SIGNAL_HANDLER diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index f55ea598138..48653cceed7 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 @@ -163,8 +163,8 @@ While using this makes the system rely on OnFire, it still gives options for tim if(boosted) mychild.playsound_local(get_turf(mychild), 'sound/effects/magic.ogg', 40, 0) to_chat(mychild, "Someone has activated your tumor. You will be returned to fight shortly, get ready!") - addtimer(CALLBACK(src, .proc/return_elite), 30) - INVOKE_ASYNC(src, .proc/arena_checks) + addtimer(CALLBACK(src, PROC_REF(return_elite)), 30) + INVOKE_ASYNC(src, PROC_REF(arena_checks)) if(TUMOR_INACTIVE) if(HAS_TRAIT(user, TRAIT_ELITE_CHALLENGER)) user.visible_message(span_warning("[user] reaches for [src] with [user.p_their()] arm, but nothing happens."), @@ -175,7 +175,7 @@ While using this makes the system rely on OnFire, it still gives options for tim visible_message(span_boldwarning("[src] begins to convulse. Your instincts tell you to step back.")) make_activator(user) if(!boosted) - addtimer(CALLBACK(src, .proc/spawn_elite), 30) + addtimer(CALLBACK(src, PROC_REF(spawn_elite)), 30) return visible_message(span_boldwarning("Something within [src] stirs...")) var/list/candidates = poll_candidates_for_mob("Do you want to play as a lavaland elite?", ROLE_SENTIENCE, ROLE_SENTIENCE, 5 SECONDS, src, POLL_IGNORE_LAVALAND_ELITE) @@ -188,7 +188,7 @@ While using this makes the system rely on OnFire, it still gives options for tim While the opponent might have an upper hand with powerful mining equipment and tools, you have great power normally limited by AI mobs.\n\ If you want to win, you'll have to use your powers in creative ways to ensure the kill. It's suggested you try using them all as soon as possible.\n\ Should you win, you'll receive extra information regarding what to do after. Good luck!") - addtimer(CALLBACK(src, .proc/spawn_elite, elitemind), 100) + addtimer(CALLBACK(src, PROC_REF(spawn_elite), elitemind), 100) else visible_message(span_boldwarning("The stirring stops, and nothing emerges. Perhaps try again later.")) activity = TUMOR_INACTIVE @@ -205,8 +205,8 @@ While using this makes the system rely on OnFire, it still gives options for tim notify_ghosts("\A [mychild] has been awakened in \the [get_area(src)]!", source = mychild, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Lavaland Elite awakened") mychild.log_message("has been awakened by [key_name(activator)]!", LOG_GAME, color="#960000") icon_state = "tumor_popped" - RegisterSignal(mychild, COMSIG_PARENT_QDELETING, .proc/onEliteLoss) - INVOKE_ASYNC(src, .proc/arena_checks) + RegisterSignal(mychild, COMSIG_PARENT_QDELETING, PROC_REF(onEliteLoss)) + INVOKE_ASYNC(src, PROC_REF(arena_checks)) /obj/structure/elite_tumor/proc/return_elite() mychild.forceMove(loc) @@ -235,7 +235,7 @@ While using this makes the system rely on OnFire, it still gives options for tim return activator = user ADD_TRAIT(user, TRAIT_ELITE_CHALLENGER, REF(src)) - RegisterSignal(user, COMSIG_PARENT_QDELETING, .proc/clear_activator) + RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(clear_activator)) user.log_message("has activated an elite tumor!", LOG_GAME, color="#960000") /obj/structure/elite_tumor/proc/clear_activator(mob/source) @@ -271,11 +271,11 @@ While using this makes the system rely on OnFire, it still gives options for tim /obj/structure/elite_tumor/proc/arena_checks() if(activity != TUMOR_ACTIVE || QDELETED(src)) return - INVOKE_ASYNC(src, .proc/fighters_check) //Checks to see if our fighters died. - INVOKE_ASYNC(src, .proc/arena_trap) //Gets another arena trap queued up for when this one runs out. - INVOKE_ASYNC(src, .proc/border_check) //Checks to see if our fighters got out of the arena somehow. + INVOKE_ASYNC(src, PROC_REF(fighters_check)) //Checks to see if our fighters died. + INVOKE_ASYNC(src, PROC_REF(arena_trap)) //Gets another arena trap queued up for when this one runs out. + INVOKE_ASYNC(src, PROC_REF(border_check)) //Checks to see if our fighters got out of the arena somehow. if(!QDELETED(src)) - addtimer(CALLBACK(src, .proc/arena_checks), 50) + addtimer(CALLBACK(src, PROC_REF(arena_checks)), 50) /obj/structure/elite_tumor/proc/fighters_check() if(QDELETED(mychild) || mychild.stat == DEAD) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index dd831d8cd06..934457ba1cd 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 d03a5b384a3..57d2e0cfeaa 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -53,7 +53,7 @@ /mob/living/simple_animal/hostile/asteroid/elite/herald/death() . = ..() if(!is_mirror) - addtimer(CALLBACK(src, .proc/become_ghost), 8) + addtimer(CALLBACK(src, PROC_REF(become_ghost)), 8) if(my_mirror != null) qdel(my_mirror) @@ -145,13 +145,13 @@ var/target_turf = get_turf(target) var/angle_to_target = get_angle(src, target_turf) shoot_projectile(target_turf, angle_to_target, FALSE, TRUE) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 2) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 4) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 2) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 4) if(health < maxHealth * 0.5 && !is_mirror) playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 10) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 12) - addtimer(CALLBACK(src, .proc/shoot_projectile, target_turf, angle_to_target, FALSE, TRUE), 14) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 10) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 12) + addtimer(CALLBACK(src, PROC_REF(shoot_projectile), target_turf, angle_to_target, FALSE, TRUE), 14) /mob/living/simple_animal/hostile/asteroid/elite/herald/proc/herald_circleshot(offset) var/static/list/directional_shot_angles = list(0, 45, 90, 135, 180, 225, 270, 315) @@ -168,11 +168,11 @@ if(!is_mirror) icon_state = "herald_enraged" playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) - addtimer(CALLBACK(src, .proc/herald_circleshot, 0), 5) + addtimer(CALLBACK(src, PROC_REF(herald_circleshot), 0), 5) if(health < maxHealth * 0.5 && !is_mirror) playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) - addtimer(CALLBACK(src, .proc/herald_circleshot, 22.5), 15) - addtimer(CALLBACK(src, .proc/unenrage), 20) + addtimer(CALLBACK(src, PROC_REF(herald_circleshot), 22.5), 15) + addtimer(CALLBACK(src, PROC_REF(unenrage)), 20) /mob/living/simple_animal/hostile/asteroid/elite/herald/proc/herald_teleshot(target) ranged_cooldown = world.time + 30 @@ -275,4 +275,4 @@ owner.visible_message(span_danger("[owner]'s [src] emits a loud noise as [owner] is struck!")) var/static/list/directional_shot_angles = list(0, 45, 90, 135, 180, 225, 270, 315) playsound(get_turf(owner), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) - addtimer(CALLBACK(src, .proc/reactionshot, owner), 10) + addtimer(CALLBACK(src, PROC_REF(reactionshot), owner), 10) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm index 5f7c0288bd8..e6d49d22518 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm @@ -123,7 +123,7 @@ T = get_step(T, dir_to_target) playsound(src,'sound/magic/demon_attack1.ogg', 200, 1) visible_message(span_boldwarning("[src] prepares to charge!")) - addtimer(CALLBACK(src, .proc/legionnaire_charge_2, dir_to_target, 0), 4) + addtimer(CALLBACK(src, PROC_REF(legionnaire_charge_2), dir_to_target, 0), 4) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/legionnaire_charge_2(move_dir, times_ran) if(times_ran >= 6) @@ -156,7 +156,7 @@ trample_target.safe_throw_at(throwtarget, 10, 1, src) trample_target.Paralyze(20) trample_target.adjustBruteLoss(melee_damage_upper) - addtimer(CALLBACK(src, .proc/legionnaire_charge_2, move_dir, (times_ran + 1)), 0.7) + addtimer(CALLBACK(src, PROC_REF(legionnaire_charge_2), move_dir, (times_ran + 1)), 0.7) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/head_detach(target) ranged_cooldown = world.time + 1 SECONDS @@ -183,7 +183,7 @@ /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/onHeadDeath() myhead = null - addtimer(CALLBACK(src, .proc/regain_head), 50) + addtimer(CALLBACK(src, PROC_REF(regain_head)), 50) /mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/regain_head() has_head = TRUE @@ -282,7 +282,7 @@ /obj/structure/legionnaire_bonfire/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index 2d1b4486214..bb987e1831c 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -118,7 +118,7 @@ new /obj/effect/temp_visual/hierophant/blast/damaging/pandora(T, src) T = get_step(T, angleused) procsleft = procsleft - 1 - addtimer(CALLBACK(src, .proc/singular_shot_line, procsleft, angleused, T), cooldown_time * 0.1) + addtimer(CALLBACK(src, PROC_REF(singular_shot_line), procsleft, angleused, T), cooldown_time * 0.1) /mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/magic_box(target) ranged_cooldown = world.time + cooldown_time @@ -136,7 +136,7 @@ new /obj/effect/temp_visual/hierophant/telegraph(turf_target, src) new /obj/effect/temp_visual/hierophant/telegraph(source, src) playsound(source,'sound/machines/airlockopen.ogg', 200, 1) - addtimer(CALLBACK(src, .proc/pandora_teleport_2, turf_target, source), 2) + addtimer(CALLBACK(src, PROC_REF(pandora_teleport_2), turf_target, source), 2) /mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_2(turf/T, turf/source) new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src) @@ -148,7 +148,7 @@ animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out visible_message(span_hierophant_warning("[src] fades out!")) set_density(FALSE) - addtimer(CALLBACK(src, .proc/pandora_teleport_3, T), 2) + addtimer(CALLBACK(src, PROC_REF(pandora_teleport_3), T), 2) /mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_3(turf/T) forceMove(T) @@ -161,7 +161,7 @@ var/turf/T = get_turf(target) new /obj/effect/temp_visual/hierophant/blast/damaging/pandora(T, src) var/max_size = 3 - addtimer(CALLBACK(src, .proc/aoe_squares_2, T, 0, max_size), 2) + addtimer(CALLBACK(src, PROC_REF(aoe_squares_2), T, 0, max_size), 2) /mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/aoe_squares_2(turf/T, ring, max_size) if(ring > max_size) @@ -169,7 +169,7 @@ for(var/t in spiral_range_turfs(ring, T)) if(get_dist(t, T) == ring) new /obj/effect/temp_visual/hierophant/blast/damaging/pandora(t, src) - addtimer(CALLBACK(src, .proc/aoe_squares_2, T, (ring + 1), max_size), cooldown_time * 0.1) + addtimer(CALLBACK(src, PROC_REF(aoe_squares_2), T, (ring + 1), max_size), cooldown_time * 0.1) //The specific version of hiero's squares pandora uses /obj/effect/temp_visual/hierophant/blast/damaging/pandora diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm index 02f373347ec..dc6e70f2fee 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 @@ -102,7 +102,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 69120d72b02..7855f395cd2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -108,7 +108,7 @@ /mob/living/simple_animal/hostile/asteroid/goliath/beast/Initialize(mapload) . = ..() - AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/ash_flora), tame_chance = 10, bonus_tame_chance = 5, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/grown/ash_flora), tame_chance = 10, bonus_tame_chance = 5, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/simple_animal/hostile/asteroid/goliath/beast/attackby(obj/item/O, mob/user, params) if(!istype(O, /obj/item/saddle) || saddled) @@ -196,7 +196,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) . = ..() @@ -210,7 +210,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 @@ -225,7 +225,7 @@ retract() else deltimer(timerid) - timerid = addtimer(CALLBACK(src, .proc/retract), 10, TIMER_STOPPABLE) + timerid = addtimer(CALLBACK(src, PROC_REF(retract)), 10, TIMER_STOPPABLE) /obj/effect/temp_visual/goliath_tentacle/proc/retract() icon_state = "Goliath_tentacle_retract" diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index a77a6d05699..6e844583a9f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -47,7 +47,7 @@ /mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize(mapload) . = ..() if(wanted_objects.len) - AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, .proc/regenerate_icons), CALLBACK(src, .proc/regenerate_icons)) + AddComponent(/datum/component/udder, /obj/item/udder/gutlunch, CALLBACK(src, PROC_REF(regenerate_icons)), CALLBACK(src, PROC_REF(regenerate_icons))) ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) /mob/living/simple_animal/hostile/asteroid/gutlunch/CanAttack(atom/the_target) // Gutlunch-specific version of CanAttack to handle stupid stat_exclusive = true crap so we don't have to do it for literally every single simple_animal/hostile except the two that spawn in lavaland diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 93add42c699..ad053660702 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 @@ -93,7 +93,7 @@ /mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/death), 100) + addtimer(CALLBACK(src, PROC_REF(death)), 100) AddElement(/datum/element/simple_flying) AddComponent(/datum/component/swarming) AddComponent(/datum/component/clickbox, icon_state = clickbox_state, max_scale = clickbox_max_scale) diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index f171d556c8d..834e9c5f016 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -92,7 +92,7 @@ /mob/living/simple_animal/hostile/mushroom/adjustHealth(amount, updating_health = TRUE, forced = FALSE) //Possibility to flee from a fight just to make it more visually interesting if(!retreat_distance && prob(33)) retreat_distance = 5 - addtimer(CALLBACK(src, .proc/stop_retreat), 30) + addtimer(CALLBACK(src, PROC_REF(stop_retreat)), 30) . = ..() /mob/living/simple_animal/hostile/mushroom/proc/stop_retreat() @@ -141,7 +141,7 @@ revive(full_heal = TRUE, admin_revive = FALSE) UpdateMushroomCap() recovery_cooldown = 1 - addtimer(CALLBACK(src, .proc/recovery_recharge), 300) + addtimer(CALLBACK(src, PROC_REF(recovery_recharge)), 300) /mob/living/simple_animal/hostile/mushroom/proc/recovery_recharge() recovery_cooldown = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm index c29d7117fc0..22752f94eb7 100644 --- a/code/modules/mob/living/simple_animal/hostile/ooze.dm +++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm @@ -165,8 +165,8 @@ /datum/action/cooldown/metabolicboost/proc/trigger_boost() var/mob/living/simple_animal/hostile/ooze/ooze = owner ooze.add_movespeed_modifier(/datum/movespeed_modifier/metabolicboost) - var/timerid = addtimer(CALLBACK(src, .proc/HeatUp), 1 SECONDS, TIMER_STOPPABLE | TIMER_LOOP) //Heat up every second - addtimer(CALLBACK(src, .proc/FinishSpeedup, timerid), 6 SECONDS) + var/timerid = addtimer(CALLBACK(src, PROC_REF(HeatUp)), 1 SECONDS, TIMER_STOPPABLE | TIMER_LOOP) //Heat up every second + addtimer(CALLBACK(src, PROC_REF(FinishSpeedup), timerid), 6 SECONDS) to_chat(ooze, span_notice("You start feel a lot quicker.")) active = TRUE ooze.adjust_ooze_nutrition(-10) @@ -200,8 +200,8 @@ ///Register for owner death /datum/action/consume/New(Target) . = ..() - RegisterSignal(owner, COMSIG_LIVING_DEATH, .proc/on_owner_death) - RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/handle_mob_deletion) + RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(on_owner_death)) + RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(handle_mob_deletion)) /datum/action/consume/proc/handle_mob_deletion() SIGNAL_HANDLER @@ -233,7 +233,7 @@ /datum/action/consume/proc/start_consuming(mob/living/target) vored_mob = target vored_mob.forceMove(owner) ///AAAAAAAAAAAAAAAAAAAAAAHHH!!! - RegisterSignal(vored_mob, COMSIG_PARENT_QDELETING, .proc/handle_mob_deletion) + RegisterSignal(vored_mob, COMSIG_PARENT_QDELETING, PROC_REF(handle_mob_deletion)) playsound(owner,'sound/items/eatfood.ogg', rand(30,50), TRUE) owner.visible_message(span_warning("[src] devours [target]!"), span_notice("You devour [target].")) START_PROCESSING(SSprocessing, src) diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm index 3656de3140b..179b2647209 100644 --- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm +++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm @@ -197,7 +197,7 @@ /mob/living/simple_animal/hostile/regalrat/controlled/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/get_player) + INVOKE_ASYNC(src, PROC_REF(get_player)) var/kingdom = pick("Plague","Miasma","Maintenance","Trash","Garbage","Rat","Vermin","Cheese") var/title = pick("King","Lord","Prince","Emperor","Supreme","Overlord","Master","Shogun","Bojar","Tsar") name = "[kingdom] [title]" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm index 35dfdc169c7..55cf97c4a7a 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm @@ -170,7 +170,7 @@ . = ..() new /obj/item/food/grown/banana/bunch(get_step(owner.loc, owner.dir)) playsound(owner, 'sound/items/bikehorn.ogg', 60) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, owner, 'sound/creatures/clown/hohoho.ogg', 100, 1), 1 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), owner, 'sound/creatures/clown/hohoho.ogg', 100, 1), 1 SECONDS) StartCooldown() /mob/living/simple_animal/hostile/retaliate/clown/honkling @@ -401,7 +401,7 @@ spit.Grant(src) add_cell_sample() - AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/cheesiehonkers, /obj/item/food/cornchips), tame_chance = 30, bonus_tame_chance = 0, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, food_types = list(/obj/item/food/cheesiehonkers, /obj/item/food/cornchips), tame_chance = 30, bonus_tame_chance = 0, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/simple_animal/hostile/retaliate/clown/mutant/glutton/attacked_by(obj/item/I, mob/living/user) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm index 2a899c76c6f..4f0586be139 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm @@ -53,7 +53,7 @@ poison_type = /datum/reagent/drug/mushroomhallucinogen var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/venomous, poison_type, poison_per_bite) 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 aab35678633..4e4c96900c5 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -91,7 +91,7 @@ AddElement(/datum/element/content_barfer) small_sprite = new small_sprite.Grant(src) - RegisterSignal(small_sprite, COMSIG_ACTION_TRIGGER, .proc/add_dragon_overlay) + RegisterSignal(small_sprite, COMSIG_ACTION_TRIGGER, PROC_REF(add_dragon_overlay)) /mob/living/simple_animal/hostile/space_dragon/Login() . = ..() @@ -176,7 +176,7 @@ /mob/living/simple_animal/hostile/space_dragon/revive(full_heal, admin_revive) . = ..() add_dragon_overlay() - RegisterSignal(small_sprite, COMSIG_ACTION_TRIGGER, .proc/add_dragon_overlay) + RegisterSignal(small_sprite, COMSIG_ACTION_TRIGGER, PROC_REF(add_dragon_overlay)) /** * Allows space dragon to choose its own name. @@ -283,7 +283,7 @@ if(D.density) return delayFire += 1.5 - addtimer(CALLBACK(src, .proc/dragon_fire_line, T), delayFire) + addtimer(CALLBACK(src, PROC_REF(dragon_fire_line), T), delayFire) /** * What occurs on each tile to actually create the fire. @@ -354,7 +354,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" @@ -376,7 +376,7 @@ var/throwtarget = get_edge_target_turf(target, dir_to_target) L.safe_throw_at(throwtarget, 10, 1, src) L.Paralyze(50) - addtimer(CALLBACK(src, .proc/reset_status), 4 + ((tiredness * tiredness_mult) / 10)) + addtimer(CALLBACK(src, PROC_REF(reset_status)), 4 + ((tiredness * tiredness_mult) / 10)) tiredness = tiredness + (gust_tiredness * tiredness_mult) #undef DARKNESS_THRESHOLD diff --git a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm index 7b4fb51e3cb..c8eb1e505c6 100644 --- a/code/modules/mob/living/simple_animal/hostile/vatbeast.dm +++ b/code/modules/mob/living/simple_animal/hostile/vatbeast.dm @@ -29,7 +29,7 @@ slapper.Grant(src) add_cell_sample() - AddComponent(/datum/component/tameable, list(/obj/item/food/fries, /obj/item/food/cheesyfries, /obj/item/food/cornchips, /obj/item/food/carrotfries), tame_chance = 30, bonus_tame_chance = 0, after_tame = CALLBACK(src, .proc/tamed)) + AddComponent(/datum/component/tameable, list(/obj/item/food/fries, /obj/item/food/cheesyfries, /obj/item/food/cornchips, /obj/item/food/carrotfries), tame_chance = 30, bonus_tame_chance = 0, after_tame = CALLBACK(src, PROC_REF(tamed))) /mob/living/simple_animal/hostile/vatbeast/proc/tamed(mob/living/tamer) buckle_lying = 0 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 b54e1d948fd..94277a50cd9 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 @@ -50,8 +50,8 @@ for(var/turf/T in anchors) vines += Beam(T, "vine", maxdistance=5, beam_type=/obj/effect/ebeam/vine) finish_time = world.time + growth_time - addtimer(CALLBACK(src, .proc/bear_fruit), growth_time) - addtimer(CALLBACK(src, .proc/progress_growth), growth_time/4) + addtimer(CALLBACK(src, PROC_REF(bear_fruit)), growth_time) + addtimer(CALLBACK(src, PROC_REF(progress_growth)), growth_time/4) countdown.start() /obj/structure/alien/resin/flower_bud/run_atom_armor(damage_amount, damage_type, damage_flag = 0, attack_dir) @@ -79,7 +79,7 @@ icon_state = "bud[growth_icon]" if(growth_icon == FINAL_BUD_GROWTH_ICON) return - addtimer(CALLBACK(src, .proc/progress_growth), growth_time/4) + addtimer(CALLBACK(src, PROC_REF(progress_growth)), growth_time/4) /obj/structure/alien/resin/flower_bud/attack_ghost(mob/user) spawner.attack_ghost(user) @@ -92,7 +92,7 @@ /obj/effect/ebeam/vine/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -192,7 +192,7 @@ return var/datum/beam/newVine = Beam(the_target, icon_state = "vine", maxdistance = vine_grab_distance, beam_type=/obj/effect/ebeam/vine) - RegisterSignal(newVine, COMSIG_PARENT_QDELETING, .proc/remove_vine, newVine) + RegisterSignal(newVine, COMSIG_PARENT_QDELETING, PROC_REF(remove_vine), newVine) vines += newVine if(isliving(the_target)) var/mob/living/L = the_target diff --git a/code/modules/mob/living/simple_animal/hostile/zombie.dm b/code/modules/mob/living/simple_animal/hostile/zombie.dm index a920142a787..da5454caed1 100644 --- a/code/modules/mob/living/simple_animal/hostile/zombie.dm +++ b/code/modules/mob/living/simple_animal/hostile/zombie.dm @@ -27,7 +27,7 @@ /mob/living/simple_animal/hostile/zombie/Initialize(mapload) . = ..() - INVOKE_ASYNC(src, .proc/setup_visuals) + INVOKE_ASYNC(src, PROC_REF(setup_visuals)) /* SKYRAT EDIT REMOVAL - MOVED TO MODULAR ZOMBIE.DM /mob/living/simple_animal/hostile/zombie/proc/setup_visuals() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index a6186129d43..9525d4cd39d 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -697,7 +697,7 @@ return relaydrive(user, direction) /mob/living/simple_animal/deadchat_plays(mode = ANARCHY_MODE, cooldown = 12 SECONDS) - . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list(), cooldown, CALLBACK(src, .proc/stop_deadchat_plays)) + . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list(), cooldown, CALLBACK(src, PROC_REF(stop_deadchat_plays))) if(. == COMPONENT_INCOMPATIBLE) return diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm index 5afb8ac74a0..67ef8c592ce 100644 --- a/code/modules/mob/living/simple_animal/slime/life.dm +++ b/code/modules/mob/living/simple_animal/slime/life.dm @@ -382,7 +382,7 @@ else if(!HAS_TRAIT(src, TRAIT_IMMOBILIZED) && isturf(loc) && prob(33)) step(src, pick(GLOB.cardinals)) else if(!AIproc) - INVOKE_ASYNC(src, .proc/AIprocess) + INVOKE_ASYNC(src, PROC_REF(AIprocess)) /mob/living/simple_animal/slime/handle_automated_movement() return //slime random movement is currently handled in handle_targets() diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index d358bc223a4..59ae3cfb233 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -120,8 +120,8 @@ /mob/living/simple_animal/slime/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles removing signal hooks incase someone is crazy enough to reset the reagents datum. /mob/living/simple_animal/slime/proc/on_reagents_del(datum/reagents/reagents) @@ -488,7 +488,7 @@ if(user) step_away(src,user,15) - addtimer(CALLBACK(src, .proc/slime_move, user), 0.3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(slime_move), user), 0.3 SECONDS) /mob/living/simple_animal/slime/proc/slime_move(mob/user) @@ -515,7 +515,7 @@ if(old_target && !SLIME_CARES_ABOUT(old_target)) UnregisterSignal(old_target, COMSIG_PARENT_QDELETING) if(Target) - RegisterSignal(Target, COMSIG_PARENT_QDELETING, .proc/clear_memories_of, override = TRUE) + RegisterSignal(Target, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/set_leader(new_leader) var/old_leader = Leader @@ -523,19 +523,19 @@ if(old_leader && !SLIME_CARES_ABOUT(old_leader)) UnregisterSignal(old_leader, COMSIG_PARENT_QDELETING) if(Leader) - RegisterSignal(Leader, COMSIG_PARENT_QDELETING, .proc/clear_memories_of, override = TRUE) + RegisterSignal(Leader, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/add_friendship(new_friend, amount = 1) if(!Friends[new_friend]) Friends[new_friend] = 0 Friends[new_friend] += amount if(new_friend) - RegisterSignal(new_friend, COMSIG_PARENT_QDELETING, .proc/clear_memories_of, override = TRUE) + RegisterSignal(new_friend, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/set_friendship(new_friend, amount = 1) Friends[new_friend] = amount if(new_friend) - RegisterSignal(new_friend, COMSIG_PARENT_QDELETING, .proc/clear_memories_of, override = TRUE) + RegisterSignal(new_friend, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/remove_friend(friend) Friends -= friend diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index d089fe023e5..8e8f42e5e2c 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -68,7 +68,7 @@ if(vent_parent && (vent_parent.members.len || vent_parent.other_atmos_machines)) flick_overlay_static(image('icons/effects/vent_indicator.dmi', "arrow", ABOVE_MOB_LAYER, dir = get_dir(src.loc, ventcrawl_target.loc)), ventcrawl_target, 2 SECONDS) visible_message(span_notice("[src] begins climbing into the ventilation system...") ,span_notice("You begin climbing into the ventilation system...")) - if(!do_after(src, 2.5 SECONDS, target = ventcrawl_target, extra_checks = CALLBACK(src, .proc/can_enter_vent, ventcrawl_target))) + if(!do_after(src, 2.5 SECONDS, target = ventcrawl_target, extra_checks = CALLBACK(src, PROC_REF(can_enter_vent), ventcrawl_target))) return if(!client) return diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 0d64feeba5d..6b0d03fdf87 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -532,7 +532,7 @@ set name = "Examine" set category = "IC" - DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/run_examinate, examinify)) + DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(run_examinate), examinify)) /mob/proc/run_examinate(atom/examinify) @@ -556,7 +556,7 @@ else result = examinify.examine(src) client.recent_examines[ref_to_atom] = world.time // set to when we last normal examine'd them - addtimer(CALLBACK(src, .proc/clear_from_recent_examines, ref_to_atom), RECENT_EXAMINE_MAX_WINDOW) + addtimer(CALLBACK(src, PROC_REF(clear_from_recent_examines), ref_to_atom), RECENT_EXAMINE_MAX_WINDOW) handle_eye_contact(examinify) else result = examinify.examine(src) // if a tree is examined but no client is there to see it, did the tree ever really exist? @@ -670,11 +670,11 @@ // check to see if their face is blocked or, if not, a signal blocks it if(examined_mob.is_face_visible() && SEND_SIGNAL(src, COMSIG_MOB_EYECONTACT, examined_mob, TRUE) != COMSIG_BLOCK_EYECONTACT) var/msg = span_smallnotice("You make eye contact with [examined_mob].") - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, src, msg), 3) // so the examine signal has time to fire and this will print after + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), src, msg), 3) // so the examine signal has time to fire and this will print after if(!imagined_eye_contact && is_face_visible() && SEND_SIGNAL(examined_mob, COMSIG_MOB_EYECONTACT, src, FALSE) != COMSIG_BLOCK_EYECONTACT) var/msg = span_smallnotice("[src] makes eye contact with you.") - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, examined_mob, msg), 3) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), examined_mob, msg), 3) /** * Called by using Activate Held Object with an empty hand/limb @@ -731,7 +731,7 @@ set category = "Object" set src = usr - DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/execute_mode)) + DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(execute_mode))) ///proc version to finish /mob/verb/mode() execution. used in case the proc needs to be queued for the tick after its first called /mob/proc/execute_mode() @@ -1407,7 +1407,7 @@ UnregisterSignal(active_storage, COMSIG_PARENT_QDELETING) active_storage = new_active_storage if(active_storage) - RegisterSignal(active_storage, COMSIG_PARENT_QDELETING, .proc/active_storage_deleted) + RegisterSignal(active_storage, COMSIG_PARENT_QDELETING, PROC_REF(active_storage_deleted)) /mob/proc/active_storage_deleted(datum/source) SIGNAL_HANDLER diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index bf7ac2996e2..634597cf0b1 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -16,7 +16,7 @@ new /obj/effect/temp_visual/monkeyify(loc) - transformation_timer = addtimer(CALLBACK(src, .proc/finish_monkeyize), TRANSFORMATION_DURATION, TIMER_UNIQUE) + transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_monkeyize)), TRANSFORMATION_DURATION, TIMER_UNIQUE) /mob/living/carbon/proc/finish_monkeyize() transformation_timer = null @@ -48,7 +48,7 @@ invisibility = INVISIBILITY_MAXIMUM new /obj/effect/temp_visual/monkeyify/humanify(loc) - transformation_timer = addtimer(CALLBACK(src, .proc/finish_humanize, species), TRANSFORMATION_DURATION, TIMER_UNIQUE) + transformation_timer = addtimer(CALLBACK(src, PROC_REF(finish_humanize), species), TRANSFORMATION_DURATION, TIMER_UNIQUE) /mob/living/carbon/proc/finish_humanize(species = /datum/species/human) transformation_timer = null @@ -147,7 +147,7 @@ . = R if(R.ckey && is_banned_from(R.ckey, JOB_CYBORG)) - INVOKE_ASYNC(R, /mob/living/silicon/robot.proc/replace_banned_cyborg) + INVOKE_ASYNC(R, TYPE_PROC_REF(/mob/living/silicon/robot, replace_banned_cyborg)) qdel(src) /mob/living/Robotize(delete_items = 0, transfer_after = TRUE) @@ -301,7 +301,7 @@ /mob/living/carbon/human/Animalize() var/list/mobtypes = typesof(/mob/living/simple_animal) - var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a type", sort_list(mobtypes, /proc/cmp_typepaths_asc)) + var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a type", sort_list(mobtypes, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(mobpath)) return if(!safe_animal(mobpath)) @@ -335,7 +335,7 @@ /mob/proc/Animalize() var/list/mobtypes = typesof(/mob/living/simple_animal) - var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a type", sort_list(mobtypes, /proc/cmp_typepaths_asc)) + var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a type", sort_list(mobtypes, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(mobpath)) return if(!safe_animal(mobpath)) diff --git a/code/modules/mob_spawn/mob_spawn.dm b/code/modules/mob_spawn/mob_spawn.dm index a2a239c34fa..a78abf2e224 100644 --- a/code/modules/mob_spawn/mob_spawn.dm +++ b/code/modules/mob_spawn/mob_spawn.dm @@ -249,10 +249,10 @@ . = ..() switch(spawn_when) if(CORPSE_INSTANT) - INVOKE_ASYNC(src, .proc/create) + INVOKE_ASYNC(src, PROC_REF(create)) if(CORPSE_ROUNDSTART) if(mapload || (SSticker && SSticker.current_state > GAME_STATE_SETTING_UP)) - INVOKE_ASYNC(src, .proc/create) + INVOKE_ASYNC(src, PROC_REF(create)) /obj/effect/mob_spawn/corpse/special(mob/living/spawned_mob) . = ..() diff --git a/code/modules/mod/mod_actions.dm b/code/modules/mod/mod_actions.dm index 96f80523cc4..0039a86ee20 100644 --- a/code/modules/mod/mod_actions.dm +++ b/code/modules/mod/mod_actions.dm @@ -73,7 +73,7 @@ ready = TRUE button_icon_state = "activate-ready" UpdateButtons() - addtimer(CALLBACK(src, .proc/reset_ready), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_ready)), 3 SECONDS) return var/obj/item/mod/control/mod = target reset_ready() @@ -139,9 +139,9 @@ desc = "Quickly activate [linked_module]." icon_icon = linked_module.icon button_icon_state = linked_module.icon_state - RegisterSignal(linked_module, COMSIG_MODULE_ACTIVATED, .proc/on_module_activate) - RegisterSignal(linked_module, COMSIG_MODULE_DEACTIVATED, .proc/on_module_deactivate) - RegisterSignal(linked_module, COMSIG_MODULE_USED, .proc/on_module_use) + RegisterSignal(linked_module, COMSIG_MODULE_ACTIVATED, PROC_REF(on_module_activate)) + RegisterSignal(linked_module, COMSIG_MODULE_DEACTIVATED, PROC_REF(on_module_deactivate)) + RegisterSignal(linked_module, COMSIG_MODULE_USED, PROC_REF(on_module_use)) /datum/action/item_action/mod/pinned_module/Destroy() module.pinned_to -= pinner_ref @@ -175,7 +175,7 @@ if(!COOLDOWN_FINISHED(module, cooldown_timer)) var/image/cooldown_image = image(icon = 'icons/hud/radial.dmi', icon_state = "module_cooldown") current_button.add_overlay(cooldown_image) - addtimer(CALLBACK(current_button, /image.proc/cut_overlay, cooldown_image), COOLDOWN_TIMELEFT(module, cooldown_timer)) + addtimer(CALLBACK(current_button, TYPE_PROC_REF(/image, cut_overlay), cooldown_image), COOLDOWN_TIMELEFT(module, cooldown_timer)) /datum/action/item_action/mod/pinned_module/proc/on_module_activate(datum/source) SIGNAL_HANDLER diff --git a/code/modules/mod/mod_activation.dm b/code/modules/mod/mod_activation.dm index 9af95c4455c..aa86897ac35 100644 --- a/code/modules/mod/mod_activation.dm +++ b/code/modules/mod/mod_activation.dm @@ -80,7 +80,7 @@ if(overslot) overslotting_parts[part] = overslot wearer.transferItemToLoc(overslot, part, force = TRUE) - RegisterSignal(part, COMSIG_ATOM_EXITED, .proc/on_overslot_exit) + RegisterSignal(part, COMSIG_ATOM_EXITED, PROC_REF(on_overslot_exit)) if(wearer.equip_to_slot_if_possible(part, part.slot_flags, qdel_on_fail = FALSE, disable_warning = TRUE)) ADD_TRAIT(part, TRAIT_NODROP, MOD_TRAIT) if(!user) @@ -167,23 +167,23 @@ to_chat(mod_pai, span_notice("MODsuit [active ? "shutting down" : "starting up"].")) // SKYRAT EDIT END - if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, .proc/has_wearer))) + if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)))) to_chat(wearer, span_notice("[boots] [active ? "relax their grip on your legs" : "seal around your feet"].")) playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) seal_part(boots, seal = !active) - if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, .proc/has_wearer))) + if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)))) to_chat(wearer, span_notice("[gauntlets] [active ? "become loose around your fingers" : "tighten around your fingers and wrists"].")) playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) seal_part(gauntlets, seal = !active) - if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, .proc/has_wearer))) + if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)))) to_chat(wearer, span_notice("[chestplate] [active ? "releases your chest" : "cinches tightly against your chest"].")) playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) seal_part(chestplate, seal = !active) - if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, .proc/has_wearer))) + if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)))) to_chat(wearer, span_notice("[helmet] hisses [active ? "open" : "closed"].")) playsound(src, 'sound/mecha/mechmove03.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) seal_part(helmet, seal = !active) - if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, .proc/has_wearer))) + if(do_after(wearer, activation_step_time, wearer, MOD_ACTIVATION_STEP_FLAGS, extra_checks = CALLBACK(src, PROC_REF(has_wearer)))) to_chat(wearer, span_notice("Systems [active ? "shut down. Parts unsealed. Goodbye" : "started up. Parts sealed. Welcome"], [wearer].")) // SKYRAT EDIT START - pAIs in MODsuits if(mod_pai) diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm index 6caa33cd397..deb5085907a 100644 --- a/code/modules/mod/mod_ai.dm +++ b/code/modules/mod/mod_ai.dm @@ -89,7 +89,7 @@ return wearer.loc.relaymove(wearer, direction) else if(wearer) ADD_TRAIT(wearer, TRAIT_FORCED_STANDING, MOD_TRAIT) - addtimer(CALLBACK(src, .proc/ai_fall), AI_FALL_TIME, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(ai_fall)), AI_FALL_TIME, TIMER_UNIQUE | TIMER_OVERRIDE) var/atom/movable/mover = wearer || src return step(mover, direction) @@ -115,7 +115,7 @@ if(!ai) return ai.apply_damage(150, BURN) - INVOKE_ASYNC(ai, /mob/living/silicon/ai.proc/death) + INVOKE_ASYNC(ai, TYPE_PROC_REF(/mob/living/silicon/ai, death)) ai.forceMove(src) stored_ai = WEAKREF(ai) icon_state = "minicard-filled" diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index d829c3d0ecd..33a73ec3cc1 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -133,15 +133,15 @@ part.min_cold_protection_temperature = theme.min_cold_protection_temperature part.siemens_coefficient = theme.siemens_coefficient for(var/obj/item/part as anything in mod_parts) - RegisterSignal(part, COMSIG_ATOM_DESTRUCTION, .proc/on_part_destruction) - RegisterSignal(part, COMSIG_PARENT_QDELETING, .proc/on_part_deletion) + RegisterSignal(part, COMSIG_ATOM_DESTRUCTION, PROC_REF(on_part_destruction)) + RegisterSignal(part, COMSIG_PARENT_QDELETING, PROC_REF(on_part_deletion)) set_mod_skin(new_skin || theme.default_skin) update_speed() for(var/obj/item/mod/module/module as anything in initial_modules) module = new module(src) install(module) - RegisterSignal(src, COMSIG_ATOM_EXITED, .proc/on_exit) - RegisterSignal(src, COMSIG_SPEED_POTION_APPLIED, .proc/on_potion) + RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) + RegisterSignal(src, COMSIG_SPEED_POTION_APPLIED, PROC_REF(on_potion)) movedelay = CONFIG_GET(number/movedelay/run_delay) /obj/item/mod/control/Destroy() @@ -458,8 +458,8 @@ /obj/item/mod/control/proc/set_wearer(mob/living/carbon/human/user) wearer = user SEND_SIGNAL(src, COMSIG_MOD_WEARER_SET, wearer) - RegisterSignal(wearer, COMSIG_ATOM_EXITED, .proc/on_exit) - RegisterSignal(wearer, COMSIG_SPECIES_GAIN, .proc/on_species_gain) + RegisterSignal(wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) + RegisterSignal(wearer, COMSIG_SPECIES_GAIN, PROC_REF(on_species_gain)) update_charge_alert() for(var/obj/item/mod/module/module as anything in modules) module.on_equip() @@ -699,7 +699,7 @@ return retract(wearer, part) if(active) - INVOKE_ASYNC(src, .proc/toggle_activate, wearer, TRUE) + INVOKE_ASYNC(src, PROC_REF(toggle_activate), wearer, TRUE) /obj/item/mod/control/proc/on_part_destruction(obj/item/part, damage_flag) SIGNAL_HANDLER diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm index cf295ceae59..beda0e19759 100644 --- a/code/modules/mod/mod_core.dm +++ b/code/modules/mod/mod_core.dm @@ -88,10 +88,10 @@ . = ..() if(cell) install_cell(cell) - RegisterSignal(mod, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(mod, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) - RegisterSignal(mod, COMSIG_MOD_WEARER_SET, .proc/on_wearer_set) + RegisterSignal(mod, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(mod, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(mod, COMSIG_MOD_WEARER_SET, PROC_REF(on_wearer_set)) if(mod.wearer) on_wearer_set(mod, mod.wearer) @@ -150,7 +150,7 @@ /obj/item/mod/core/standard/proc/install_cell(new_cell) cell = new_cell cell.forceMove(src) - RegisterSignal(src, COMSIG_ATOM_EXITED, .proc/on_exit) + RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) /obj/item/mod/core/standard/proc/uninstall_cell() if(!cell) @@ -178,7 +178,7 @@ if(mod.seconds_electrified && charge_amount() && mod.shock(user)) return COMPONENT_CANCEL_ATTACK_CHAIN if(mod.open && mod.loc == user) - INVOKE_ASYNC(src, .proc/mod_uninstall_cell, user) + INVOKE_ASYNC(src, PROC_REF(mod_uninstall_cell), user) return COMPONENT_CANCEL_ATTACK_CHAIN return NONE @@ -219,8 +219,8 @@ /obj/item/mod/core/standard/proc/on_wearer_set(datum/source, mob/user) SIGNAL_HANDLER - RegisterSignal(mod.wearer, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, .proc/on_borg_charge) - RegisterSignal(mod, COMSIG_MOD_WEARER_UNSET, .proc/on_wearer_unset) + RegisterSignal(mod.wearer, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge)) + RegisterSignal(mod, COMSIG_MOD_WEARER_UNSET, PROC_REF(on_wearer_unset)) /obj/item/mod/core/standard/proc/on_wearer_unset(datum/source, mob/user) SIGNAL_HANDLER @@ -293,7 +293,7 @@ /obj/item/mod/core/plasma/install(obj/item/mod/control/mod_unit) . = ..() - RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) /obj/item/mod/core/plasma/uninstall() UnregisterSignal(mod, COMSIG_PARENT_ATTACKBY) diff --git a/code/modules/mod/mod_paint.dm b/code/modules/mod/mod_paint.dm index 8d670b6c607..ee162b2d981 100644 --- a/code/modules/mod/mod_paint.dm +++ b/code/modules/mod/mod_paint.dm @@ -146,7 +146,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 5d5384795cd..d6fd1ab4139 100644 --- a/code/modules/mod/modules/_module.dm +++ b/code/modules/mod/modules/_module.dm @@ -55,8 +55,8 @@ if(ispath(device)) device = new device(src) ADD_TRAIT(device, TRAIT_NODROP, MOD_TRAIT) - RegisterSignal(device, COMSIG_PARENT_QDELETING, .proc/on_device_deletion) - RegisterSignal(src, COMSIG_ATOM_EXITED, .proc/on_exit) + RegisterSignal(device, COMSIG_PARENT_QDELETING, PROC_REF(on_device_deletion)) + RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) /obj/item/mod/module/Destroy() mod?.uninstall(src) @@ -120,8 +120,8 @@ if(device) if(mod.wearer.put_in_hands(device)) balloon_alert(mod.wearer, "[device] extended") - RegisterSignal(mod.wearer, COMSIG_ATOM_EXITED, .proc/on_exit) - RegisterSignal(mod.wearer, COMSIG_KB_MOB_DROPITEM_DOWN, .proc/dropkey) + RegisterSignal(mod.wearer, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) + RegisterSignal(mod.wearer, COMSIG_KB_MOB_DROPITEM_DOWN, PROC_REF(dropkey)) else balloon_alert(mod.wearer, "can't extend [device]!") mod.wearer.transferItemToLoc(device, src, force = TRUE) @@ -169,7 +169,7 @@ if(SEND_SIGNAL(src, COMSIG_MODULE_TRIGGERED) & MOD_ABORT_USE) return FALSE COOLDOWN_START(src, cooldown_timer, cooldown_time) - addtimer(CALLBACK(mod.wearer, /mob.proc/update_clothing, mod.slot_flags), cooldown_time+1) //need to run it a bit after the cooldown starts to avoid conflicts + addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/mob, update_clothing), mod.slot_flags), cooldown_time+1) //need to run it a bit after the cooldown starts to avoid conflicts mod.wearer.update_clothing(mod.slot_flags) SEND_SIGNAL(src, COMSIG_MODULE_USED) return TRUE @@ -307,7 +307,7 @@ mod.selected_module.used_signal = COMSIG_MOB_MIDDLECLICKON if(ALT_CLICK) mod.selected_module.used_signal = COMSIG_MOB_ALTCLICKON - RegisterSignal(mod.wearer, mod.selected_module.used_signal, /obj/item/mod/module.proc/on_special_click) + RegisterSignal(mod.wearer, mod.selected_module.used_signal, TYPE_PROC_REF(/obj/item/mod/module, on_special_click)) /// Pins the module to the user's action buttons /obj/item/mod/module/proc/pin(mob/user) diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm index 4fb275ee810..7a9e0b61eb5 100644 --- a/code/modules/mod/modules/module_kinesis.dm +++ b/code/modules/mod/modules/module_kinesis.dm @@ -73,8 +73,8 @@ kinesis_catcher = mod.wearer.overlay_fullscreen("kinesis", /atom/movable/screen/fullscreen/kinesis, 0) kinesis_catcher.kinesis_user = mod.wearer kinesis_catcher.view_list = getviewsize(mod.wearer.client.view) - kinesis_catcher.RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, /atom/movable/screen/fullscreen/kinesis.proc/on_move) - kinesis_catcher.RegisterSignal(mod.wearer, COMSIG_VIEWDATA_UPDATE, /atom/movable/screen/fullscreen/kinesis.proc/on_viewdata_update) + kinesis_catcher.RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/atom/movable/screen/fullscreen/kinesis, on_move)) + kinesis_catcher.RegisterSignal(mod.wearer, COMSIG_VIEWDATA_UPDATE, TYPE_PROC_REF(/atom/movable/screen/fullscreen/kinesis, on_viewdata_update)) kinesis_catcher.calculate_params() soundloop.start() START_PROCESSING(SSfastprocess, src) @@ -196,7 +196,7 @@ /obj/item/mod/module/anomaly_locked/kinesis/proc/launch() playsound(grabbed_atom, 'sound/magic/repulse.ogg', 100, TRUE) - RegisterSignal(grabbed_atom, COMSIG_MOVABLE_IMPACT, .proc/launch_impact) + RegisterSignal(grabbed_atom, COMSIG_MOVABLE_IMPACT, PROC_REF(launch_impact)) var/turf/target_turf = get_turf_in_angle(get_angle(mod.wearer, grabbed_atom), get_turf(src), 10) grabbed_atom.throw_at(target_turf, range = grab_range, speed = grabbed_atom.density ? 3 : 4, thrower = mod.wearer, spin = isitem(grabbed_atom)) diff --git a/code/modules/mod/modules/module_pathfinder.dm b/code/modules/mod/modules/module_pathfinder.dm index e4e76f72e33..b9f81a0b4d4 100644 --- a/code/modules/mod/modules/module_pathfinder.dm +++ b/code/modules/mod/modules/module_pathfinder.dm @@ -117,7 +117,7 @@ ADD_TRAIT(module.mod, TRAIT_MOVE_FLYING, MOD_TRAIT) animate(module.mod, 0.2 SECONDS, pixel_x = base_pixel_y, pixel_y = base_pixel_y) module.mod.add_overlay(jet_icon) - RegisterSignal(module.mod, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(module.mod, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) balloon_alert(imp_in, "suit recalled") return TRUE diff --git a/code/modules/mod/modules/modules_antag.dm b/code/modules/mod/modules/modules_antag.dm index d016f8e8697..a95013f19d6 100644 --- a/code/modules/mod/modules/modules_antag.dm +++ b/code/modules/mod/modules/modules_antag.dm @@ -117,7 +117,7 @@ /obj/item/mod/module/energy_shield/on_suit_activation() mod.AddComponent(/datum/component/shielded, max_charges = max_charges, recharge_start_delay = recharge_start_delay, charge_increment_delay = charge_increment_delay, \ charge_recovery = charge_recovery, lose_multiple_charges = lose_multiple_charges, recharge_path = recharge_path, starting_charges = charges, shield_icon_file = shield_icon_file, shield_icon = shield_icon) - RegisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS, .proc/shield_reaction) + RegisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(shield_reaction)) /obj/item/mod/module/energy_shield/on_suit_deactivation(deleting = FALSE) var/datum/component/shielded/shield = mod.GetComponent(/datum/component/shielded) @@ -287,7 +287,7 @@ flame.preparePixelProjectile(target, mod.wearer) flame.firer = mod.wearer playsound(src, 'sound/items/modsuit/flamethrower.ogg', 75, TRUE) - INVOKE_ASYNC(flame, /obj/projectile.proc/fire) + INVOKE_ASYNC(flame, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_power_cost) ///Power kick - Lets the user launch themselves at someone to kick them. @@ -316,7 +316,7 @@ playsound(src, 'sound/items/modsuit/loader_charge.ogg', 75, TRUE) balloon_alert(mod.wearer, "you start charging...") animate(mod.wearer, 0.3 SECONDS, pixel_z = 16, flags = ANIMATION_RELATIVE, easing = SINE_EASING|EASE_OUT) - addtimer(CALLBACK(mod.wearer, /atom.proc/SpinAnimation, 3, 2), 0.3 SECONDS) + addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/atom, SpinAnimation), 3, 2), 0.3 SECONDS) if(!do_after(mod.wearer, 1 SECONDS, target = mod)) animate(mod.wearer, 0.2 SECONDS, pixel_z = -16, flags = ANIMATION_RELATIVE, easing = SINE_EASING|EASE_IN) return @@ -325,8 +325,8 @@ playsound(src, 'sound/items/modsuit/loader_launch.ogg', 75, TRUE) var/angle = get_angle(mod.wearer, target) + 180 mod.wearer.transform = mod.wearer.transform.Turn(angle) - RegisterSignal(mod.wearer, COMSIG_MOVABLE_IMPACT, .proc/on_throw_impact) - mod.wearer.throw_at(target, range = 7, speed = 2, thrower = mod.wearer, spin = FALSE, gentle = TRUE, callback = CALLBACK(src, .proc/on_throw_end, mod.wearer, -angle)) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_IMPACT, PROC_REF(on_throw_impact)) + mod.wearer.throw_at(target, range = 7, speed = 2, thrower = mod.wearer, spin = FALSE, gentle = TRUE, callback = CALLBACK(src, PROC_REF(on_throw_end), mod.wearer, -angle)) /obj/item/mod/module/power_kick/proc/on_throw_end(mob/user, angle) if(!user) @@ -366,7 +366,7 @@ var/obj/item/current_disguise /obj/item/mod/module/chameleon/on_install() - var/list/all_disguises = sort_list(subtypesof(get_path_by_slot(mod.slot_flags)), /proc/cmp_typepaths_asc) + var/list/all_disguises = sort_list(subtypesof(get_path_by_slot(mod.slot_flags)), GLOBAL_PROC_REF(cmp_typepaths_asc)) for(var/clothing_path in all_disguises) var/obj/item/clothing = clothing_path if(!initial(clothing.icon_state)) @@ -407,7 +407,7 @@ mod.worn_icon_state = initial(current_disguise.worn_icon_state) mod.inhand_icon_state = initial(current_disguise.inhand_icon_state) mod.wearer.update_clothing(mod.slot_flags) - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/return_look) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(return_look)) /obj/item/mod/module/chameleon/proc/return_look() mod.name = "[mod.theme.name] [initial(mod.name)]" diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm index 6c0dc01610f..05ac9296e73 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/projectile.proc/fire) + INVOKE_ASYNC(tether, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_power_cost) /obj/projectile/tether @@ -155,7 +155,7 @@ /obj/item/mod/module/rad_protection/on_suit_activation() AddComponent(/datum/component/geiger_sound) ADD_TRAIT(mod.wearer, TRAIT_BYPASS_EARLY_IRRADIATED_CHECK, MOD_TRAIT) - RegisterSignal(mod.wearer, COMSIG_IN_RANGE_OF_IRRADIATION, .proc/on_pre_potential_irradiation) + RegisterSignal(mod.wearer, COMSIG_IN_RANGE_OF_IRRADIATION, PROC_REF(on_pre_potential_irradiation)) for(var/obj/item/part in mod.mod_parts) ADD_TRAIT(part, TRAIT_RADIATION_PROTECTED_CLOTHING, MOD_TRAIT) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 78124e75c41..e98744b4f61 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -25,7 +25,7 @@ var/datum/storage/modstorage = mod.create_storage(max_specific_storage = max_w_class, max_total_storage = max_combined_w_class, max_slots = max_items) modstorage.set_real_location(src) atom_storage.locked = FALSE - RegisterSignal(mod.chestplate, COMSIG_ITEM_PRE_UNEQUIP, .proc/on_chestplate_unequip) + RegisterSignal(mod.chestplate, COMSIG_ITEM_PRE_UNEQUIP, PROC_REF(on_chestplate_unequip)) /obj/item/mod/module/storage/on_uninstall(deleting = FALSE) var/datum/storage/modstorage = mod.atom_storage @@ -105,8 +105,8 @@ /obj/item/mod/module/jetpack/Initialize(mapload) . = ..() - get_mover = CALLBACK(src, .proc/get_user) - check_on_move = CALLBACK(src, .proc/allow_thrust) + get_mover = CALLBACK(src, PROC_REF(get_user)) + check_on_move = CALLBACK(src, PROC_REF(allow_thrust)) refresh_jetpack() /obj/item/mod/module/jetpack/Destroy() @@ -337,7 +337,7 @@ incompatible_modules = list(/obj/item/mod/module/longfall) /obj/item/mod/module/longfall/on_suit_activation() - RegisterSignal(mod.wearer, COMSIG_LIVING_Z_IMPACT, .proc/z_impact_react) + RegisterSignal(mod.wearer, COMSIG_LIVING_Z_IMPACT, PROC_REF(z_impact_react)) /obj/item/mod/module/longfall/on_suit_deactivation(deleting = FALSE) UnregisterSignal(mod.wearer, COMSIG_LIVING_Z_IMPACT) @@ -397,10 +397,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) @@ -523,9 +523,9 @@ )) /obj/item/mod/module/hat_stabilizer/on_suit_activation() - RegisterSignal(mod.helmet, COMSIG_PARENT_EXAMINE, .proc/add_examine) - RegisterSignal(mod.helmet, COMSIG_PARENT_ATTACKBY, .proc/place_hat) - RegisterSignal(mod.helmet, COMSIG_ATOM_ATTACK_HAND_SECONDARY, .proc/remove_hat) + RegisterSignal(mod.helmet, COMSIG_PARENT_EXAMINE, PROC_REF(add_examine)) + RegisterSignal(mod.helmet, COMSIG_PARENT_ATTACKBY, PROC_REF(place_hat)) + RegisterSignal(mod.helmet, COMSIG_ATOM_ATTACK_HAND_SECONDARY, PROC_REF(remove_hat)) /obj/item/mod/module/hat_stabilizer/on_suit_deactivation(deleting = FALSE) if(deleting) diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm index 3ccdf03202c..18b68366207 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) @@ -31,8 +31,8 @@ return //remove non-touch reagent exposure to_chat(mod.wearer, span_danger("[src] makes an ominous click sound...")) playsound(src, 'sound/items/modsuit/springlock.ogg', 75, TRUE) - addtimer(CALLBACK(src, .proc/snap_shut), rand(3 SECONDS, 5 SECONDS)) - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/on_activate_spring_block) + addtimer(CALLBACK(src, PROC_REF(snap_shut)), rand(3 SECONDS, 5 SECONDS)) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_activate_spring_block)) ///Signal fired when wearer attempts to activate/deactivate suits /obj/item/mod/module/springlock/proc/on_activate_spring_block(datum/source, user) @@ -286,7 +286,7 @@ return playsound(src, 'sound/effects/curseattack.ogg', 50) mod.wearer.AddElement(/datum/element/forced_gravity, NEGATIVE_GRAVITY) - RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/check_upstairs) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(check_upstairs)) mod.wearer.update_gravity(mod.wearer.has_gravity()) ADD_TRAIT(mod.wearer, TRAIT_SILENT_FOOTSTEPS, MOD_TRAIT) check_upstairs() //todo at some point flip your screen around @@ -319,7 +319,7 @@ if(current_turf && istype(turf_above)) current_turf.zFall(mod.wearer) else if(!turf_above && istype(current_turf) && current_turf.planetary_atmos) //nothing holding you down - INVOKE_ASYNC(src, .proc/fly_away) + INVOKE_ASYNC(src, PROC_REF(fly_away)) else if(!(step_count % 2)) playsound(current_turf, 'sound/items/modsuit/atrocinator_step.ogg', 50) step_count++ diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm index 2f3d0ec9260..639b90f56ca 100644 --- a/code/modules/mod/modules/modules_medical.dm +++ b/code/modules/mod/modules/modules_medical.dm @@ -158,7 +158,7 @@ projectile.preparePixelProjectile(target, mod.wearer) projectile.firer = mod.wearer playsound(src, 'sound/mecha/hydraulic.ogg', 25, TRUE) - INVOKE_ASYNC(projectile, /obj/projectile.proc/fire) + INVOKE_ASYNC(projectile, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_power_cost) /obj/projectile/organ @@ -247,7 +247,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/proc/on_defib_success(obj/item/shockpaddles/source) drain_power(use_power_cost) diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm index bd242060678..606a1c8b34d 100644 --- a/code/modules/mod/modules/modules_ninja.dm +++ b/code/modules/mod/modules/modules_ninja.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_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED), .proc/unstealth) + RegisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP, PROC_REF(unstealth)) + RegisterSignal(mod.wearer, COMSIG_HUMAN_MELEE_UNARMED_ATTACK, PROC_REF(on_unarmed_attack)) + RegisterSignal(mod.wearer, COMSIG_ATOM_BULLET_ACT, PROC_REF(on_bullet_act)) + RegisterSignal(mod.wearer, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED), PROC_REF(unstealth)) animate(mod.wearer, alpha = stealth_alpha, time = 1.5 SECONDS) drain_power(use_power_cost) @@ -90,7 +90,7 @@ /obj/item/mod/module/welding/camera_vision/on_suit_activation() . = ..() - RegisterSignal(mod.wearer, COMSIG_LIVING_CAN_TRACK, .proc/can_track) + RegisterSignal(mod.wearer, COMSIG_LIVING_CAN_TRACK, PROC_REF(can_track)) /obj/item/mod/module/welding/camera_vision/on_suit_deactivation(deleting = FALSE) . = ..() @@ -131,7 +131,7 @@ var/door_hack_counter = 0 /obj/item/mod/module/hacker/on_suit_activation() - RegisterSignal(mod.wearer, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/hack) + RegisterSignal(mod.wearer, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(hack)) /obj/item/mod/module/hacker/on_suit_deactivation(deleting = FALSE) UnregisterSignal(mod.wearer, COMSIG_HUMAN_EARLY_UNARMED_ATTACK) @@ -206,8 +206,8 @@ /obj/item/mod/module/weapon_recall/proc/set_weapon(obj/item/weapon) linked_weapon = weapon - RegisterSignal(linked_weapon, COMSIG_MOVABLE_IMPACT, .proc/catch_weapon) - RegisterSignal(linked_weapon, COMSIG_PARENT_QDELETING, .proc/deleted_weapon) + RegisterSignal(linked_weapon, COMSIG_MOVABLE_IMPACT, PROC_REF(catch_weapon)) + RegisterSignal(linked_weapon, COMSIG_PARENT_QDELETING, PROC_REF(deleted_weapon)) /obj/item/mod/module/weapon_recall/proc/recall_weapon(caught = FALSE) linked_weapon.forceMove(get_turf(src)) @@ -235,7 +235,7 @@ return if(hit_atom != mod.wearer) return - INVOKE_ASYNC(src, .proc/recall_weapon, TRUE) + INVOKE_ASYNC(src, PROC_REF(recall_weapon), TRUE) return COMPONENT_MOVABLE_IMPACT_NEVERMIND /obj/item/mod/module/weapon_recall/proc/deleted_weapon(obj/item/source) @@ -412,10 +412,10 @@ mod.wearer.remove_status_effect(/datum/status_effect/speech/stutter) mod.wearer.reagents.add_reagent(/datum/reagent/medicine/stimulants, 5) reagents.remove_reagent(reagent_required, reagents.total_volume * 0.75) - addtimer(CALLBACK(src, .proc/boost_aftereffects, mod.wearer), 7 SECONDS) + addtimer(CALLBACK(src, PROC_REF(boost_aftereffects), mod.wearer), 7 SECONDS) /obj/item/mod/module/adrenaline_boost/on_install() - RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) /obj/item/mod/module/adrenaline_boost/on_uninstall(deleting) UnregisterSignal(mod, COMSIG_PARENT_ATTACKBY) diff --git a/code/modules/mod/modules/modules_science.dm b/code/modules/mod/modules/modules_science.dm index 501d04efddf..0d1b8065aab 100644 --- a/code/modules/mod/modules/modules_science.dm +++ b/code/modules/mod/modules/modules_science.dm @@ -36,7 +36,7 @@ if(!.) return ADD_TRAIT(mod.wearer, TRAIT_RESEARCH_SCANNER, MOD_TRAIT) - 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 da2f5360b99..d4b4ade3d1f 100644 --- a/code/modules/mod/modules/modules_security.dm +++ b/code/modules/mod/modules/modules_security.dm @@ -30,7 +30,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) @@ -42,7 +42,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)) @@ -67,7 +67,7 @@ overlay_state_use = "module_pepper_used" /obj/item/mod/module/pepper_shoulders/on_suit_activation() - RegisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS, .proc/on_check_shields) + RegisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(on_check_shields)) /obj/item/mod/module/pepper_shoulders/on_suit_deactivation(deleting = FALSE) UnregisterSignal(mod.wearer, COMSIG_HUMAN_CHECK_SHIELDS) @@ -162,7 +162,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) . = ..() @@ -237,8 +237,8 @@ linked_bodybag = new bodybag_type(target_turf) linked_bodybag.take_contents() playsound(linked_bodybag, 'sound/weapons/egloves.ogg', 80, TRUE) - RegisterSignal(linked_bodybag, COMSIG_MOVABLE_MOVED, .proc/check_range) - RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/check_range) + RegisterSignal(linked_bodybag, COMSIG_MOVABLE_MOVED, PROC_REF(check_range)) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(check_range)) /obj/item/mod/module/criminalcapture/proc/packup() if(!linked_bodybag) @@ -246,7 +246,7 @@ playsound(linked_bodybag, 'sound/weapons/egloves.ogg', 80, TRUE) apply_wibbly_filters(linked_bodybag) animate(linked_bodybag, 0.5 SECONDS, alpha = 50, flags = ANIMATION_PARALLEL) - addtimer(CALLBACK(src, .proc/delete_bag, linked_bodybag), 0.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(delete_bag), linked_bodybag), 0.5 SECONDS) linked_bodybag = null /obj/item/mod/module/criminalcapture/proc/check_range() @@ -258,7 +258,7 @@ /obj/item/mod/module/criminalcapture/proc/delete_bag(obj/structure/closet/body_bag/bag) if(mod?.wearer) - UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/check_range) + UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(check_range)) balloon_alert(mod.wearer, "bag dissipated") bag.open(force = TRUE) qdel(bag) @@ -334,8 +334,8 @@ if(istype(dampening_field)) QDEL_NULL(dampening_field) dampening_field = new(mod.wearer, field_radius, TRUE, src) - RegisterSignal(dampening_field, COMSIG_DAMPENER_CAPTURE, .proc/dampen_projectile) - RegisterSignal(dampening_field, COMSIG_DAMPENER_RELEASE, .proc/release_projectile) + RegisterSignal(dampening_field, COMSIG_DAMPENER_CAPTURE, PROC_REF(dampen_projectile)) + RegisterSignal(dampening_field, COMSIG_DAMPENER_RELEASE, PROC_REF(release_projectile)) /obj/item/mod/module/projectile_dampener/on_deactivation(display_message, deleting = FALSE) . = ..() diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm index 0757d39b105..203859cc134 100644 --- a/code/modules/mod/modules/modules_supply.dm +++ b/code/modules/mod/modules/modules_supply.dm @@ -128,7 +128,7 @@ . = ..() if(!.) return - RegisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP, .proc/bump_mine) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_BUMP, PROC_REF(bump_mine)) /obj/item/mod/module/drill/on_deactivation(display_message = TRUE, deleting = FALSE) . = ..() @@ -178,7 +178,7 @@ var/list/ores = list() /obj/item/mod/module/orebag/on_equip() - RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/ore_pickup) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(ore_pickup)) /obj/item/mod/module/orebag/on_unequip() UnregisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED) @@ -187,7 +187,7 @@ SIGNAL_HANDLER for(var/obj/item/stack/ore/ore in get_turf(mod.wearer)) - INVOKE_ASYNC(src, .proc/move_ore, ore) + INVOKE_ASYNC(src, PROC_REF(move_ore), ore) playsound(src, SFX_RUSTLE, 50, TRUE) /obj/item/mod/module/orebag/proc/move_ore(obj/item/stack/ore) @@ -261,7 +261,7 @@ mod.wearer.transform = mod.wearer.transform.Turn(angle) mod.wearer.throw_at(get_ranged_target_turf_direct(mod.wearer, target, power), \ range = power, speed = max(round(0.2*power), 1), thrower = mod.wearer, spin = FALSE, \ - callback = CALLBACK(src, .proc/on_throw_end, mod.wearer, -angle)) + callback = CALLBACK(src, PROC_REF(on_throw_end), mod.wearer, -angle)) /obj/item/mod/module/hydraulic/proc/on_throw_end(mob/user, angle) if(!user) @@ -283,7 +283,7 @@ disposal_tag = pick(GLOB.TAGGERLOCATIONS) /obj/item/mod/module/disposal_connector/on_suit_activation() - RegisterSignal(mod.wearer, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) /obj/item/mod/module/disposal_connector/on_suit_deactivation(deleting = FALSE) UnregisterSignal(mod.wearer, COMSIG_MOVABLE_DISPOSING) @@ -337,7 +337,7 @@ new /obj/effect/temp_visual/mook_dust(get_turf(locker)) playsound(locker, 'sound/effects/gravhit.ogg', 75, TRUE) locker.throw_at(mod.wearer, range = 7, speed = 3, force = MOVE_FORCE_WEAK, \ - callback = CALLBACK(src, .proc/check_locker, locker)) + callback = CALLBACK(src, PROC_REF(check_locker), locker)) /obj/item/mod/module/magnet/on_deactivation(display_message = TRUE, deleting = FALSE) . = ..() @@ -353,7 +353,7 @@ return mod.wearer.start_pulling(locker) locker.strong_grab = TRUE - RegisterSignal(locker, COMSIG_ATOM_NO_LONGER_PULLED, .proc/on_stop_pull) + RegisterSignal(locker, COMSIG_ATOM_NO_LONGER_PULLED, PROC_REF(on_stop_pull)) /obj/item/mod/module/magnet/proc/on_stop_pull(obj/structure/closet/locker, atom/movable/last_puller) SIGNAL_HANDLER @@ -410,7 +410,7 @@ /obj/item/mod/module/ash_accretion/on_suit_activation() ADD_TRAIT(mod.wearer, TRAIT_ASHSTORM_IMMUNE, MOD_TRAIT) ADD_TRAIT(mod.wearer, TRAIT_SNOWSTORM_IMMUNE, MOD_TRAIT) - RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(mod.wearer, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) /obj/item/mod/module/ash_accretion/on_suit_deactivation(deleting = FALSE) REMOVE_TRAIT(mod.wearer, TRAIT_ASHSTORM_IMMUNE, MOD_TRAIT) @@ -506,7 +506,7 @@ mod.wearer.RemoveElement(/datum/element/footstep, FOOTSTEP_MOB_HUMAN, 1, -6) mod.wearer.AddElement(/datum/element/footstep, FOOTSTEP_OBJ_ROBOT, 1, -6, sound_vary = TRUE) mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/sphere) - RegisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE, .proc/on_statchange) + RegisterSignal(mod.wearer, COMSIG_MOB_STATCHANGE, PROC_REF(on_statchange)) /obj/item/mod/module/sphere_transform/on_deactivation(display_message = TRUE, deleting = FALSE) . = ..() @@ -516,7 +516,7 @@ playsound(src, 'sound/items/modsuit/ballin.ogg', 100, TRUE, frequency = -1) mod.wearer.base_pixel_y = 0 animate(mod.wearer, animate_time, pixel_y = mod.wearer.base_pixel_y) - addtimer(CALLBACK(mod.wearer, /atom.proc/remove_filter, list("mod_ball", "mod_blur", "mod_outline")), animate_time) + addtimer(CALLBACK(mod.wearer, TYPE_PROC_REF(/atom, remove_filter), list("mod_ball", "mod_blur", "mod_outline")), animate_time) REMOVE_TRAIT(mod.wearer, TRAIT_LAVA_IMMUNE, MOD_TRAIT) REMOVE_TRAIT(mod.wearer, TRAIT_HANDS_BLOCKED, MOD_TRAIT) REMOVE_TRAIT(mod.wearer, TRAIT_FORCED_STANDING, MOD_TRAIT) @@ -542,7 +542,7 @@ bomb.preparePixelProjectile(target, mod.wearer) bomb.firer = mod.wearer playsound(src, 'sound/weapons/gun/general/grenade_launch.ogg', 75, TRUE) - INVOKE_ASYNC(bomb, /obj/projectile.proc/fire) + INVOKE_ASYNC(bomb, TYPE_PROC_REF(/obj/projectile, fire)) drain_power(use_power_cost) /obj/item/mod/module/sphere_transform/on_active_process(delta_time) @@ -605,7 +605,7 @@ /obj/structure/mining_bomb/Initialize(mapload, atom/movable/firer) . = ..() generate_image() - addtimer(CALLBACK(src, .proc/prime, firer), prime_time) + addtimer(CALLBACK(src, PROC_REF(prime), firer), prime_time) /obj/structure/mining_bomb/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) if(same_z_layer) @@ -622,7 +622,7 @@ /obj/structure/mining_bomb/proc/prime(atom/movable/firer) add_overlay(explosion_image) - addtimer(CALLBACK(src, .proc/boom, firer), explosion_time) + addtimer(CALLBACK(src, PROC_REF(boom), firer), explosion_time) /obj/structure/mining_bomb/proc/boom(atom/movable/firer) visible_message(span_danger("[src] explodes!")) diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm index d84a1c8c101..ddebdb59ee0 100644 --- a/code/modules/mod/modules/modules_timeline.dm +++ b/code/modules/mod/modules/modules_timeline.dm @@ -20,8 +20,8 @@ var/true_owner_ckey /obj/item/mod/module/eradication_lock/on_install() - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/on_mod_activation) - RegisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL, .proc/on_mod_removal) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_mod_activation)) + RegisterSignal(mod, COMSIG_MOD_MODULE_REMOVAL, PROC_REF(on_mod_removal)) /obj/item/mod/module/eradication_lock/on_uninstall(deleting = FALSE) UnregisterSignal(mod, COMSIG_MOD_ACTIVATE) @@ -74,10 +74,10 @@ playsound(src, 'sound/items/modsuit/time_anchor_set.ogg', 50, TRUE) //stops all mods from triggering during rewinding for(var/obj/item/mod/module/module as anything in mod.modules) - RegisterSignal(module, COMSIG_MODULE_TRIGGERED, .proc/on_module_triggered) + RegisterSignal(module, COMSIG_MODULE_TRIGGERED, PROC_REF(on_module_triggered)) mod.wearer.AddComponent(/datum/component/dejavu/timeline, 1, 10 SECONDS) - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/on_activate_block) - addtimer(CALLBACK(src, .proc/unblock_suit_activation), 10 SECONDS) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_activate_block)) + addtimer(CALLBACK(src, PROC_REF(unblock_suit_activation)), 10 SECONDS) ///Unregisters the modsuit deactivation blocking signal, after dejavu functionality finishes. /obj/item/mod/module/rewinder/proc/unblock_suit_activation() @@ -121,9 +121,9 @@ return //stops all mods from triggering during timestop- including timestop itself for(var/obj/item/mod/module/module as anything in mod.modules) - RegisterSignal(module, COMSIG_MODULE_TRIGGERED, .proc/on_module_triggered) + RegisterSignal(module, COMSIG_MODULE_TRIGGERED, PROC_REF(on_module_triggered)) timestop = new /obj/effect/timestop/channelled(get_turf(mod.wearer), 2, INFINITY, list(mod.wearer)) - RegisterSignal(timestop, COMSIG_PARENT_QDELETING, .proc/unblock_suit_activation) + RegisterSignal(timestop, COMSIG_PARENT_QDELETING, PROC_REF(unblock_suit_activation)) ///Unregisters the modsuit deactivation blocking signal, after timestop functionality finishes. /obj/item/mod/module/timestopper/proc/unblock_suit_activation(datum/source) @@ -175,7 +175,7 @@ mod.wearer.SetAllImmobility(0) mod.wearer.setStaminaLoss(0, 0) phased_mob = new(get_turf(mod.wearer.loc), mod.wearer) - RegisterSignal(mod, COMSIG_MOD_ACTIVATE, .proc/on_activate_block) + RegisterSignal(mod, COMSIG_MOD_ACTIVATE, PROC_REF(on_activate_block)) else //phasing in phased_mob.eject_jaunter() @@ -228,7 +228,7 @@ chrono_beam.preparePixelProjectile(target, mod.wearer) chrono_beam.firer = mod.wearer playsound(src, 'sound/items/modsuit/time_anchor_set.ogg', 50, TRUE) - INVOKE_ASYNC(chrono_beam, /obj/projectile.proc/fire) + INVOKE_ASYNC(chrono_beam, TYPE_PROC_REF(/obj/projectile, fire)) /obj/item/mod/module/tem/on_uninstall(deleting = FALSE) if(!field) diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 0d6595d4709..02280921a02 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -170,7 +170,7 @@ GLOBAL_LIST_EMPTY(TabletMessengers) // a list of all active messengers, similar if(active_program?.tap(A, user, params)) user.do_attack_animation(A) //Emulate this animation since we kill the attack in three lines playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), TRUE, -1) //Likewise for the tap sound - addtimer(CALLBACK(src, .proc/play_ping), 0.5 SECONDS, TIMER_UNIQUE) //Slightly delayed ping to indicate success + addtimer(CALLBACK(src, PROC_REF(play_ping)), 0.5 SECONDS, TIMER_UNIQUE) //Slightly delayed ping to indicate success return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN return ..() diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index 8c577e60f9d..d05db951993 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -25,7 +25,7 @@ /obj/item/modular_computer/tablet/pda/heads/captain/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TABLET_CHECK_DETONATE, .proc/tab_no_detonate) + RegisterSignal(src, COMSIG_TABLET_CHECK_DETONATE, PROC_REF(tab_no_detonate)) for(var/datum/computer_file/program/messenger/messenger_app in stored_files) messenger_app.spam_mode = TRUE @@ -311,8 +311,8 @@ /obj/item/modular_computer/tablet/pda/clown/Initialize(mapload) . = ..() - AddComponent(/datum/component/slippery/clowning, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, .proc/AfterSlip), slot_whitelist = list(ITEM_SLOT_ID, ITEM_SLOT_BELT)) - AddComponent(/datum/component/wearertargeting/sitcomlaughter, CALLBACK(src, .proc/after_sitcom_laugh)) + AddComponent(/datum/component/slippery/clowning, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, PROC_REF(AfterSlip)), slot_whitelist = list(ITEM_SLOT_ID, ITEM_SLOT_BELT)) + AddComponent(/datum/component/wearertargeting/sitcomlaughter, CALLBACK(src, PROC_REF(after_sitcom_laugh))) /obj/item/modular_computer/tablet/pda/clown/update_overlays() . = ..() diff --git a/code/modules/modular_computers/file_system/programs/alarm.dm b/code/modules/modular_computers/file_system/programs/alarm.dm index fd5eb86cc61..7e081bb591f 100644 --- a/code/modules/modular_computers/file_system/programs/alarm.dm +++ b/code/modules/modular_computers/file_system/programs/alarm.dm @@ -19,7 +19,7 @@ //Or if we're on station. Otherwise, die. var/list/allowed_areas = GLOB.the_station_areas + typesof(/area/mine) alert_control = new(computer, list(ALARM_ATMOS, ALARM_FIRE, ALARM_POWER), listener_areas = allowed_areas) - RegisterSignal(alert_control.listener, list(COMSIG_ALARM_LISTENER_TRIGGERED, COMSIG_ALARM_LISTENER_CLEARED), .proc/update_alarm_display) + RegisterSignal(alert_control.listener, list(COMSIG_ALARM_LISTENER_TRIGGERED, COMSIG_ALARM_LISTENER_CLEARED), PROC_REF(update_alarm_display)) return ..() /datum/computer_file/program/alarm_monitor/Destroy() diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index c9e77a39aa7..318f34daf32 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.silicon_owner,span_userdanger("SYSTEM PURGE DETECTED/")) - addtimer(CALLBACK(modularInterface.silicon_owner, /mob/living/silicon/robot/.proc/death), 2 SECONDS, TIMER_UNIQUE) + addtimer(CALLBACK(modularInterface.silicon_owner, 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/atmosscan.dm b/code/modules/modular_computers/file_system/programs/atmosscan.dm index 3e86d542a27..64abf2dd9f2 100644 --- a/code/modules/modular_computers/file_system/programs/atmosscan.dm +++ b/code/modules/modular_computers/file_system/programs/atmosscan.dm @@ -81,7 +81,7 @@ computer.say("Device incompatible for scanning objects!") return FALSE atmozphere_mode = ATMOZPHERE_SCAN_CLICK - RegisterSignal(computer, COMSIG_ITEM_ATTACK_SELF_SECONDARY, .proc/turf_analyze) + RegisterSignal(computer, COMSIG_ITEM_ATTACK_SELF_SECONDARY, PROC_REF(turf_analyze)) var/turf/turf = get_turf(computer) last_gasmix_data = list(gas_mixture_parser(turf?.return_air(), "Location Reading")) return TRUE diff --git a/code/modules/modular_computers/file_system/programs/emojipedia.dm b/code/modules/modular_computers/file_system/programs/emojipedia.dm index ad842d94dd1..e4835f2da8d 100644 --- a/code/modules/modular_computers/file_system/programs/emojipedia.dm +++ b/code/modules/modular_computers/file_system/programs/emojipedia.dm @@ -14,7 +14,7 @@ /datum/computer_file/program/emojipedia/New() . = ..() // Sort the emoji list so it's easier to find things and we don't have to keep sorting on ui_data since the number of emojis can not change in-game. - emoji_list = sortTim(emoji_list, /proc/cmp_text_asc) + emoji_list = sortTim(emoji_list, GLOBAL_PROC_REF(cmp_text_asc)) /datum/computer_file/program/emojipedia/ui_static_data(mob_user) var/list/data = get_header_data() diff --git a/code/modules/modular_computers/file_system/programs/frontier.dm b/code/modules/modular_computers/file_system/programs/frontier.dm index ea04562c980..d475b661604 100644 --- a/code/modules/modular_computers/file_system/programs/frontier.dm +++ b/code/modules/modular_computers/file_system/programs/frontier.dm @@ -183,7 +183,7 @@ for(var/datum/computer_file/data/ordnance/ordnance_data in computer.stored_files) if(ordnance_data.uid == params["selected_uid"]) selected_file = ordnance_data - RegisterSignal(selected_file, COMSIG_MODULAR_COMPUTER_FILE_DELETED, .proc/recheck_file_presence) + RegisterSignal(selected_file, COMSIG_MODULAR_COMPUTER_FILE_DELETED, PROC_REF(recheck_file_presence)) return TRUE if("select_experiment") var/ex_path = text2path(params["selected_expath"]) diff --git a/code/modules/modular_computers/file_system/programs/ntmessenger.dm b/code/modules/modular_computers/file_system/programs/ntmessenger.dm index 5480287c1bf..389bc302108 100644 --- a/code/modules/modular_computers/file_system/programs/ntmessenger.dm +++ b/code/modules/modular_computers/file_system/programs/ntmessenger.dm @@ -75,9 +75,9 @@ var/sortmode if(sort_by_job) - sortmode = /proc/cmp_pdajob_asc + sortmode = GLOBAL_PROC_REF(cmp_pdajob_asc) else - sortmode = /proc/cmp_pdaname_asc + sortmode = GLOBAL_PROC_REF(cmp_pdaname_asc) for(var/obj/item/modular_computer/P in sort_list(GLOB.TabletMessengers, sortmode)) for(var/datum/computer_file/program/messenger/app in P.stored_files) diff --git a/code/modules/modular_computers/file_system/programs/radar.dm b/code/modules/modular_computers/file_system/programs/radar.dm index 0dc58c6860d..966f66f514b 100644 --- a/code/modules/modular_computers/file_system/programs/radar.dm +++ b/code/modules/modular_computers/file_system/programs/radar.dm @@ -315,7 +315,7 @@ if(!.) return - RegisterSignal(SSdcs, COMSIG_GLOB_NUKE_DEVICE_ARMED, .proc/on_nuke_armed) + RegisterSignal(SSdcs, COMSIG_GLOB_NUKE_DEVICE_ARMED, PROC_REF(on_nuke_armed)) /datum/computer_file/program/radar/fission360/kill_program(forced) UnregisterSignal(SSdcs, COMSIG_GLOB_NUKE_DEVICE_ARMED) diff --git a/code/modules/modular_computers/file_system/programs/signalcommander.dm b/code/modules/modular_computers/file_system/programs/signalcommander.dm index 512e8040545..830160118c1 100644 --- a/code/modules/modular_computers/file_system/programs/signalcommander.dm +++ b/code/modules/modular_computers/file_system/programs/signalcommander.dm @@ -37,7 +37,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 3f74ae0273c..ad2918b90e0 100644 --- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm @@ -39,7 +39,7 @@ if (!sm.include_in_cims || !isturf(sm.loc) || !(is_station_level(sm.z) || is_mining_level(sm.z) || sm.z == user_turf.z)) continue supermatters += sm - RegisterSignal(sm, COMSIG_PARENT_QDELETING, .proc/clear_supermatter) + RegisterSignal(sm, COMSIG_PARENT_QDELETING, PROC_REF(clear_supermatter)) /datum/computer_file/program/supermatter_monitor/ui_static_data(mob/user) var/list/data = list() @@ -93,7 +93,7 @@ return if(focused_supermatter) unfocus_supermatter() - RegisterSignal(sm, COMSIG_SUPERMATTER_DELAM_ALARM, .proc/send_alert) + RegisterSignal(sm, COMSIG_SUPERMATTER_DELAM_ALARM, PROC_REF(send_alert)) focused_supermatter = sm /datum/computer_file/program/supermatter_monitor/proc/unfocus_supermatter() diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 8b7ecfc7c8d..0704ad20260 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -208,6 +208,6 @@ credits -= total_price say("Enjoy your new product!") state = 3 - addtimer(CALLBACK(src, .proc/reset_order), 100) + addtimer(CALLBACK(src, PROC_REF(reset_order)), 100) return TRUE return FALSE diff --git a/code/modules/ninja/ninjaDrainAct.dm b/code/modules/ninja/ninjaDrainAct.dm index 24b1ad5939e..8e82921d99d 100644 --- a/code/modules/ninja/ninjaDrainAct.dm +++ b/code/modules/ninja/ninjaDrainAct.dm @@ -15,7 +15,7 @@ /obj/machinery/power/apc/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) if(!ninja || !hacking_module) return NONE - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/machinery/power/apc/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) @@ -52,7 +52,7 @@ /obj/machinery/power/smes/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) if(!ninja || !hacking_module) return NONE - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/machinery/power/smes/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) @@ -83,7 +83,7 @@ /obj/item/stock_parts/cell/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) if(!ninja || !hacking_module) return NONE - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/item/stock_parts/cell/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) @@ -108,7 +108,7 @@ to_chat(ninja, span_notice("Hacking \the [src]...")) AI_notify_hack() to_chat(ninja, span_notice("Encrypted source code detected. Overloading storage device...")) - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/machinery/rnd/server/master/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) @@ -127,7 +127,7 @@ if(!ninja || !hacking_module) return NONE to_chat(ninja, span_notice("Research notes detected. Corrupting data...")) - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/machinery/rnd/server/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) @@ -150,11 +150,11 @@ return NONE AI_notify_hack() - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/machinery/computer/secure_data/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) - if(!do_after(ninja, 20 SECONDS, src, extra_checks = CALLBACK(src, .proc/can_hack, ninja))) + if(!do_after(ninja, 20 SECONDS, src, extra_checks = CALLBACK(src, PROC_REF(can_hack), ninja))) return for(var/datum/data/record/rec in sort_record(GLOB.data_core.general, sortBy, order)) for(var/datum/data/record/security_record in GLOB.data_core.security) @@ -184,7 +184,7 @@ return NONE if(hacking_module.communication_console_hack_success) return NONE - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/machinery/computer/communications/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) @@ -204,7 +204,7 @@ if(!ninja || !hacking_module) return NONE if(!operating && density && hasPower() && !(obj_flags & EMAGGED)) - INVOKE_ASYNC(src, /atom.proc/emag_act) + INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, emag_act)) hacking_module.door_hack_counter++ var/datum/antagonist/ninja/ninja_antag = ninja.mind.has_antag_datum(/datum/antagonist/ninja) if(!ninja_antag) @@ -218,7 +218,7 @@ /obj/structure/cable/ninjadrain_act(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) if(!ninja || !hacking_module) return NONE - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/structure/cable/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) @@ -254,7 +254,7 @@ if(!ninja || !hacking_module) return NONE to_chat(occupants, "[icon2html(src, occupants)][span_danger("Warning: Unauthorized access through sub-route 4, block H, detected.")]") - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/vehicle/sealed/mecha/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) @@ -285,7 +285,7 @@ return NONE to_chat(src, span_danger("Warni-***BZZZZZZZZZRT*** UPLOADING SPYDERPATCHER VERSION 9.5.2...")) - INVOKE_ASYNC(src, .proc/ninjadrain_charge, ninja, hacking_module) + INVOKE_ASYNC(src, PROC_REF(ninjadrain_charge), ninja, hacking_module) return COMPONENT_CANCEL_ATTACK_CHAIN /mob/living/silicon/robot/proc/ninjadrain_charge(mob/living/carbon/human/ninja, obj/item/mod/module/hacker/hacking_module) diff --git a/code/modules/pai/card.dm b/code/modules/pai/card.dm index 3a1deca17e7..a184c5da803 100644 --- a/code/modules/pai/card.dm +++ b/code/modules/pai/card.dm @@ -172,7 +172,7 @@ return COOLDOWN_START(src, alert_cooldown, 5 SECONDS) add_alert() - addtimer(CALLBACK(src, .proc/remove_alert), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(remove_alert)), 5 SECONDS) playsound(src, 'sound/machines/ping.ogg', 30, TRUE) visible_message(span_notice("[src] flashes a message across its screen: New personalities available for download!"), blind_message = span_notice("[src] vibrates with an alert.")) diff --git a/code/modules/pai/door_jack.dm b/code/modules/pai/door_jack.dm index 89816fd3c4d..17fe129622d 100644 --- a/code/modules/pai/door_jack.dm +++ b/code/modules/pai/door_jack.dm @@ -49,8 +49,8 @@ /** Tracks the associated pai */ /mob/living/silicon/pai/proc/track_pai() - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/handle_move) - RegisterSignal(card, COMSIG_MOVABLE_MOVED, .proc/handle_move) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) + RegisterSignal(card, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) /** Untracks the associated pai */ /mob/living/silicon/pai/proc/untrack_pai() @@ -59,10 +59,10 @@ /** Tracks the associated hacking_cable */ /mob/living/silicon/pai/proc/track_thing(atom/movable/thing) - RegisterSignal(thing, COMSIG_MOVABLE_MOVED, .proc/handle_move) + RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) var/list/locations = get_nested_locs(thing, include_turf = FALSE) for(var/atom/movable/location in locations) - RegisterSignal(location, COMSIG_MOVABLE_MOVED, .proc/handle_move) + RegisterSignal(location, COMSIG_MOVABLE_MOVED, PROC_REF(handle_move)) /** Untracks the associated hacking */ /mob/living/silicon/pai/proc/untrack_thing(atom/movable/thing) diff --git a/code/modules/pai/pai.dm b/code/modules/pai/pai.dm index c4739c37d09..b35342ab376 100644 --- a/code/modules/pai/pai.dm +++ b/code/modules/pai/pai.dm @@ -226,7 +226,7 @@ ADD_TRAIT(src, TRAIT_HANDS_BLOCKED, PAI_FOLDED) desc = "A pAI hard-light holographics emitter. This one appears in the form of a [chassis]." - RegisterSignal(src, COMSIG_LIVING_CULT_SACRIFICED, .proc/on_cult_sacrificed) + RegisterSignal(src, COMSIG_LIVING_CULT_SACRIFICED, PROC_REF(on_cult_sacrificed)) /mob/living/silicon/pai/make_laws() laws = new /datum/ai_laws/pai() diff --git a/code/modules/pai/shell.dm b/code/modules/pai/shell.dm index 133af192ba1..e1f685a2d05 100644 --- a/code/modules/pai/shell.dm +++ b/code/modules/pai/shell.dm @@ -55,7 +55,7 @@ skins += list("[holochassis_option]" = item_image) sort_list(skins) var/atom/anchor = get_atom_on_turf(src) - var/choice = show_radial_menu(src, anchor, skins, custom_check = CALLBACK(src, .proc/check_menu, anchor), radius = 40, require_near = TRUE) + var/choice = show_radial_menu(src, anchor, skins, custom_check = CALLBACK(src, PROC_REF(check_menu), anchor), radius = 40, require_near = TRUE) if(!choice) return FALSE set_holochassis(choice) diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 4ce2fbfbaac..27f28eba558 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -104,7 +104,7 @@ return if(toppaper) UnregisterSignal(toppaper, COMSIG_ATOM_UPDATED_ICON) - RegisterSignal(weapon, COMSIG_ATOM_UPDATED_ICON, .proc/on_top_paper_change) + RegisterSignal(weapon, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_top_paper_change)) toppaper_ref = WEAKREF(weapon) to_chat(user, span_notice("You clip [weapon] onto [src].")) else if(istype(weapon, /obj/item/pen) && !pen) diff --git a/code/modules/paperwork/fax.dm b/code/modules/paperwork/fax.dm index 9c0c1f682bd..846705c61e4 100644 --- a/code/modules/paperwork/fax.dm +++ b/code/modules/paperwork/fax.dm @@ -294,7 +294,7 @@ return FALSE FAX.receive(loaded, fax_name) history_add("Send", FAX.fax_name) - INVOKE_ASYNC(src, .proc/animate_object_travel, loaded, "fax_receive", find_overlay_state(loaded, "send")) + INVOKE_ASYNC(src, PROC_REF(animate_object_travel), loaded, "fax_receive", find_overlay_state(loaded, "send")) playsound(src, 'sound/machines/high_tech_confirm.ogg', 50, FALSE) return TRUE return FALSE @@ -309,10 +309,10 @@ */ /obj/machinery/fax/proc/receive(obj/item/loaded, sender_name) playsound(src, 'sound/machines/printer.ogg', 50, FALSE) - INVOKE_ASYNC(src, .proc/animate_object_travel, loaded, "fax_receive", find_overlay_state(loaded, "receive")) + INVOKE_ASYNC(src, PROC_REF(animate_object_travel), loaded, "fax_receive", find_overlay_state(loaded, "receive")) say("Received correspondence from [sender_name].") history_add("Receive", sender_name) - addtimer(CALLBACK(src, .proc/vend_item, loaded), 1.9 SECONDS) + addtimer(CALLBACK(src, PROC_REF(vend_item), loaded), 1.9 SECONDS) /** * Procedure for animating an object entering or leaving the fax machine. @@ -325,7 +325,7 @@ icon_state = animation_state var/mutable_appearance/overlay = mutable_appearance(icon, overlay_state) overlays += overlay - addtimer(CALLBACK(src, .proc/travel_animation_complete, overlay), 2 SECONDS) + addtimer(CALLBACK(src, PROC_REF(travel_animation_complete), overlay), 2 SECONDS) /** * Called when the travel animation should end. Reset animation and overlay states. diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 317e1416e0b..4f34bc57b21 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -273,7 +273,7 @@ throw_speed_on = 4, \ sharpness_on = SHARP_EDGED, \ w_class_on = WEIGHT_CLASS_NORMAL) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /obj/item/pen/edagger/suicide_act(mob/living/user) if(extended) @@ -356,7 +356,7 @@ w_class_on = WEIGHT_CLASS_SMALL, \ sharpness_on = TRUE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/toggle_screwdriver) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(toggle_screwdriver)) AddElement(/datum/element/update_icon_updates_onmob) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 4159e664f51..01e22329990 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -129,19 +129,19 @@ return FALSE // Basic paper if(istype(paper_copy, /obj/item/paper)) - do_copy_loop(CALLBACK(src, .proc/make_paper_copy), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_paper_copy)), usr) return TRUE // Copying photo. if(photo_copy) - do_copy_loop(CALLBACK(src, .proc/make_photo_copy), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_photo_copy)), usr) return TRUE // Copying Documents. if(document_copy) - do_copy_loop(CALLBACK(src, .proc/make_document_copy), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_document_copy)), usr) return TRUE // ASS COPY. By Miauw if(ass) - do_copy_loop(CALLBACK(src, .proc/make_ass_copy), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_ass_copy)), usr) return TRUE // Remove the paper/photo/document from the photocopier. @@ -206,7 +206,7 @@ if (toner_cartridge.charges - PAPER_TONER_USE < 0) to_chat(usr, span_warning("There is not enough toner in [src] to print the form, please replace the cartridge.")) return FALSE - do_copy_loop(CALLBACK(src, .proc/make_blank_print), usr) + do_copy_loop(CALLBACK(src, PROC_REF(make_blank_print)), usr) var/obj/item/paper/printblank = new /obj/item/paper (loc) var/printname = sanitize(params["name"]) var/list/printinfo @@ -248,7 +248,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 559881ce4fb..7eec115e3a1 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -216,7 +216,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/ticket_machine, 32) tickets += theirticket if(obj_flags & EMAGGED) //Emag the machine to destroy the HOP's life. ready = FALSE - addtimer(CALLBACK(src, .proc/reset_cooldown), cooldown)//Small cooldown to prevent piles of flaming tickets + addtimer(CALLBACK(src, PROC_REF(reset_cooldown)), cooldown)//Small cooldown to prevent piles of flaming tickets theirticket.fire_act() user.dropItemToGround(theirticket) user.adjust_fire_stacks(1) diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index add48b961da..df87b3f72b1 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -142,11 +142,11 @@ return on = FALSE - addtimer(CALLBACK(src, .proc/cooldown), cooldown) + addtimer(CALLBACK(src, PROC_REF(cooldown)), cooldown) icon_state = state_off - INVOKE_ASYNC(src, .proc/captureimage, target, user, picture_size_x - 1, picture_size_y - 1) + INVOKE_ASYNC(src, PROC_REF(captureimage), target, user, picture_size_x - 1, picture_size_y - 1) /obj/item/camera/proc/cooldown() @@ -163,7 +163,7 @@ /obj/item/camera/proc/captureimage(atom/target, mob/user, size_x = 1, size_y = 1) if(flash_enabled) set_light_on(TRUE) - addtimer(CALLBACK(src, .proc/flash_end), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(flash_end)), FLASH_LIGHT_DURATION, TIMER_OVERRIDE|TIMER_UNIQUE) blending = TRUE var/turf/target_turf = get_turf(target) if(!isturf(target_turf)) @@ -280,13 +280,13 @@ picture_target = add_input_port("Picture Target", PORT_TYPE_ATOM) picture_coord_x = add_input_port("Picture Coordinate X", PORT_TYPE_NUMBER) picture_coord_y = add_input_port("Picture Coordinate Y", PORT_TYPE_NUMBER) - adjust_size_x = add_input_port("Picture Size X", PORT_TYPE_NUMBER, trigger = .proc/sanitize_picture_size) - adjust_size_y = add_input_port("Picture Size Y", PORT_TYPE_NUMBER, trigger = .proc/sanitize_picture_size) + adjust_size_x = add_input_port("Picture Size X", PORT_TYPE_NUMBER, trigger = PROC_REF(sanitize_picture_size)) + adjust_size_y = add_input_port("Picture Size Y", PORT_TYPE_NUMBER, trigger = PROC_REF(sanitize_picture_size)) /obj/item/circuit_component/camera/register_shell(atom/movable/shell) . = ..() camera = shell - RegisterSignal(shell, COMSIG_CAMERA_IMAGE_CAPTURED, .proc/on_image_captured) + RegisterSignal(shell, COMSIG_CAMERA_IMAGE_CAPTURED, PROC_REF(on_image_captured)) /obj/item/circuit_component/camera/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_CAMERA_IMAGE_CAPTURED) @@ -311,6 +311,6 @@ return if(!camera.can_target(target)) return - INVOKE_ASYNC(camera, /obj/item/camera.proc/captureimage, target, null, camera.picture_size_y - 1, camera.picture_size_y - 1) + INVOKE_ASYNC(camera, TYPE_PROC_REF(/obj/item/camera, captureimage), target, null, camera.picture_size_y - 1, camera.picture_size_y - 1) #undef CAMERA_PICTURE_SIZE_HARD_LIMIT diff --git a/code/modules/plumbing/ducts.dm b/code/modules/plumbing/ducts.dm index 6faa86ab488..273f9f12853 100644 --- a/code/modules/plumbing/ducts.dm +++ b/code/modules/plumbing/ducts.dm @@ -123,7 +123,7 @@ All the important duct code: add_neighbour(other, direction) //Delegate to timer subsystem so its handled the next tick and doesnt cause byond to mistake it for an infinite loop and kill the game - addtimer(CALLBACK(other, .proc/attempt_connect)) + addtimer(CALLBACK(other, PROC_REF(attempt_connect))) return TRUE diff --git a/code/modules/plumbing/plumbers/fermenter.dm b/code/modules/plumbing/plumbers/fermenter.dm index dd8b32e02b5..b5d26ccbbc3 100644 --- a/code/modules/plumbing/plumbers/fermenter.dm +++ b/code/modules/plumbing/plumbers/fermenter.dm @@ -15,7 +15,7 @@ . = ..() AddComponent(/datum/component/plumbing/simple_supply, bolt, layer) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm index eb7e7f53c3c..54a8b48f2d2 100644 --- a/code/modules/plumbing/plumbers/grinder_chemical.dm +++ b/code/modules/plumbing/plumbers/grinder_chemical.dm @@ -14,7 +14,7 @@ . = ..() AddComponent(/datum/component/plumbing/simple_supply, bolt, layer) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/plumbing/plumbers/plumbing_buffer.dm b/code/modules/plumbing/plumbers/plumbing_buffer.dm index 823573b98ee..5ebd5f65aa0 100644 --- a/code/modules/plumbing/plumbers/plumbing_buffer.dm +++ b/code/modules/plumbing/plumbers/plumbing_buffer.dm @@ -20,8 +20,8 @@ /obj/machinery/plumbing/buffer/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/machinery/plumbing/buffer/proc/on_reagents_del(datum/reagents/reagents) @@ -68,7 +68,7 @@ neighbour.attempt_connect() //technically this would runtime if you made about 200~ buffers add_overlay(icon_state + "_alert") - addtimer(CALLBACK(src, /atom/.proc/cut_overlay, icon_state + "_alert"), 20) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, cut_overlay), icon_state + "_alert"), 20) /obj/machinery/plumbing/buffer/attack_hand_secondary(mob/user, modifiers) . = ..() diff --git a/code/modules/plumbing/plumbers/reaction_chamber.dm b/code/modules/plumbing/plumbers/reaction_chamber.dm index d1b3610fff2..353cc137849 100644 --- a/code/modules/plumbing/plumbers/reaction_chamber.dm +++ b/code/modules/plumbing/plumbers/reaction_chamber.dm @@ -27,8 +27,8 @@ /obj/machinery/plumbing/reaction_chamber/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/machinery/plumbing/reaction_chamber/proc/on_reagents_del(datum/reagents/reagents) diff --git a/code/modules/point/point.dm b/code/modules/point/point.dm index e8e025f7546..3a3d97e2565 100644 --- a/code/modules/point/point.dm +++ b/code/modules/point/point.dm @@ -58,7 +58,7 @@ add_overlay(thought_bubble) LAZYADD(update_overlays_on_z, thought_bubble) - addtimer(CALLBACK(src, .proc/clear_point_bubble, thought_bubble), POINT_TIME) + addtimer(CALLBACK(src, PROC_REF(clear_point_bubble), thought_bubble), POINT_TIME) /atom/movable/proc/clear_point_bubble(mutable_appearance/thought_bubble) LAZYREMOVE(update_overlays_on_z, thought_bubble) @@ -101,7 +101,7 @@ if(istype(A, /obj/effect/temp_visual/point)) return FALSE - DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/_pointed, A)) + DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(_pointed), A)) /// possibly delayed verb that finishes the pointing process starting in [/mob/verb/pointed()]. /// either called immediately or in the tick after pointed() was called, as per the [DEFAULT_QUEUE_OR_CALL_VERB()] macro diff --git a/code/modules/power/apc/apc_attack.dm b/code/modules/power/apc/apc_attack.dm index b7f074e3748..56e967544d3 100644 --- a/code/modules/power/apc/apc_attack.dm +++ b/code/modules/power/apc/apc_attack.dm @@ -204,13 +204,13 @@ return if(ethereal.combat_mode) if(cell.charge <= (cell.maxcharge / 2)) // ethereals can't drain APCs under half charge, this is so that they are forced to look to alternative power sources if the station is running low - addtimer(CALLBACK(src, /atom.proc/balloon_alert, ethereal, "safeties prevent draining!"), alert_timer_duration) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "safeties prevent draining!"), alert_timer_duration) return if(stomach.crystal_charge > charge_limit) - addtimer(CALLBACK(src, /atom.proc/balloon_alert, ethereal, "charge is full!"), alert_timer_duration) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "charge is full!"), alert_timer_duration) return stomach.drain_time = world.time + APC_DRAIN_TIME - addtimer(CALLBACK(src, /atom.proc/balloon_alert, ethereal, "draining power"), alert_timer_duration) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "draining power"), alert_timer_duration) if(do_after(user, APC_DRAIN_TIME, target = src)) if(cell.charge <= (cell.maxcharge / 2) || (stomach.crystal_charge > charge_limit)) return @@ -220,13 +220,13 @@ return if(cell.charge >= cell.maxcharge - APC_POWER_GAIN) - addtimer(CALLBACK(src, /atom.proc/balloon_alert, ethereal, "APC can't receive more power!"), alert_timer_duration) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "APC can't receive more power!"), alert_timer_duration) return if(stomach.crystal_charge < APC_POWER_GAIN) - addtimer(CALLBACK(src, /atom.proc/balloon_alert, ethereal, "charge is too low!"), alert_timer_duration) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "charge is too low!"), alert_timer_duration) return stomach.drain_time = world.time + APC_DRAIN_TIME - addtimer(CALLBACK(src, /atom.proc/balloon_alert, ethereal, "transfering power"), alert_timer_duration) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, balloon_alert), ethereal, "transfering power"), alert_timer_duration) if(!do_after(user, APC_DRAIN_TIME, target = src)) return if((cell.charge >= (cell.maxcharge - APC_POWER_GAIN)) || (stomach.crystal_charge < APC_POWER_GAIN)) diff --git a/code/modules/power/apc/apc_main.dm b/code/modules/power/apc/apc_main.dm index c0744ddaf8c..8500cb734f8 100644 --- a/code/modules/power/apc/apc_main.dm +++ b/code/modules/power/apc/apc_main.dm @@ -127,7 +127,7 @@ name = "\improper [get_area_name(area, TRUE)] APC" set_machine_stat(machine_stat | MAINT) update_appearance() - addtimer(CALLBACK(src, .proc/update), 5) + addtimer(CALLBACK(src, PROC_REF(update)), 5) dir = ndir switch(dir) @@ -180,7 +180,7 @@ make_terminal() - addtimer(CALLBACK(src, .proc/update), 5) + addtimer(CALLBACK(src, PROC_REF(update)), 5) ///This is how we test to ensure that mappers use the directional subtypes of APCs, rather than use the parent and pixel-shift it themselves. if(abs(offset_old) != APC_PIXEL_OFFSET) @@ -407,7 +407,7 @@ for(var/obj/machinery/light/L in area) if(!initial(L.no_low_power)) //If there was an override set on creation, keep that override L.no_low_power = 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 @@ -496,7 +496,7 @@ alarm_manager.send_alarm(ALARM_POWER) if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights)) low_power_nightshift_lights = TRUE - INVOKE_ASYNC(src, .proc/set_nightshift, TRUE) + INVOKE_ASYNC(src, PROC_REF(set_nightshift), TRUE) else if(cell.percent() < 15 && long_term_power < 0) // <15%, turn off lighting & equipment equipment = autoset(equipment, AUTOSET_OFF) lighting = autoset(lighting, AUTOSET_OFF) @@ -504,7 +504,7 @@ alarm_manager.send_alarm(ALARM_POWER) if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights)) low_power_nightshift_lights = TRUE - INVOKE_ASYNC(src, .proc/set_nightshift, TRUE) + INVOKE_ASYNC(src, PROC_REF(set_nightshift), TRUE) else if(cell.percent() < 30 && long_term_power < 0) // <30%, turn off equipment equipment = autoset(equipment, AUTOSET_OFF) lighting = autoset(lighting, AUTOSET_ON) @@ -512,7 +512,7 @@ alarm_manager.send_alarm(ALARM_POWER) if(!nightshift_lights || (nightshift_lights && !low_power_nightshift_lights)) low_power_nightshift_lights = TRUE - INVOKE_ASYNC(src, .proc/set_nightshift, TRUE) + INVOKE_ASYNC(src, PROC_REF(set_nightshift), TRUE) else // otherwise all can be on equipment = autoset(equipment, AUTOSET_ON) lighting = autoset(lighting, AUTOSET_ON) @@ -520,7 +520,7 @@ if(nightshift_lights && low_power_nightshift_lights) low_power_nightshift_lights = FALSE if(!SSnightshift.nightshift_active) - INVOKE_ASYNC(src, .proc/set_nightshift, FALSE) + INVOKE_ASYNC(src, PROC_REF(set_nightshift), FALSE) if(cell.percent() > 75) alarm_manager.clear_alarm(ALARM_POWER) @@ -598,7 +598,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/breaked_light in area) diff --git a/code/modules/power/apc/apc_malf.dm b/code/modules/power/apc/apc_malf.dm index a2087369782..2f738bbede5 100644 --- a/code/modules/power/apc/apc_malf.dm +++ b/code/modules/power/apc/apc_malf.dm @@ -19,7 +19,7 @@ return to_chat(malf, span_notice("Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.")) malf.malfhack = src - malf.malfhacking = addtimer(CALLBACK(malf, /mob/living/silicon/ai/.proc/malfhacked, src), 600, TIMER_STOPPABLE) + malf.malfhacking = addtimer(CALLBACK(malf, TYPE_PROC_REF(/mob/living/silicon/ai/, malfhacked), src), 600, TIMER_STOPPABLE) var/atom/movable/screen/alert/hackingapc/hacking_apc hacking_apc = malf.throw_alert(ALERT_HACKING_APC, /atom/movable/screen/alert/hackingapc) diff --git a/code/modules/power/apc/apc_tool_act.dm b/code/modules/power/apc/apc_tool_act.dm index 780172428f1..2448152bc54 100644 --- a/code/modules/power/apc/apc_tool_act.dm +++ b/code/modules/power/apc/apc_tool_act.dm @@ -203,7 +203,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/proc/togglelock(mob/living/user) if(obj_flags & EMAGGED) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 76dd771fb22..2fb9b468449 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri GLOB.cable_list += src //add it to the global cable list Connect_cable() AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) - RegisterSignal(src, COMSIG_RAT_INTERACT, .proc/on_rat_eat) + RegisterSignal(src, COMSIG_RAT_INTERACT, PROC_REF(on_rat_eat)) if(isturf(loc)) var/turf/turf_loc = loc turf_loc.add_blueprints_preround(src) @@ -397,7 +397,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri if(first) first = FALSE continue - addtimer(CALLBACK(O, .proc/auto_propagate_cut_cable, O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables + addtimer(CALLBACK(O, PROC_REF(auto_propagate_cut_cable), O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables /////////////////////////////////////////////// // The cable coil object, used for laying cable @@ -511,7 +511,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri "Cable restraints" = restraints_icon ) - var/layer_result = show_radial_menu(user, src, radial_menu, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/layer_result = show_radial_menu(user, src, radial_menu, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return switch(layer_result) @@ -715,7 +715,7 @@ GLOBAL_LIST(hub_radial_layer_list) "Machinery" = image(icon = 'icons/obj/power.dmi', icon_state = "smes") ) - var/layer_result = show_radial_menu(user, src, GLOB.hub_radial_layer_list, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/layer_result = show_radial_menu(user, src, GLOB.hub_radial_layer_list, custom_check = CALLBACK(src, PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) if(!check_menu(user)) return var/CL @@ -763,7 +763,7 @@ GLOBAL_LIST(hub_radial_layer_list) /obj/structure/cable/multilayer/CtrlClick(mob/living/user) to_chat(user, span_warning("You push the reset button.")) - addtimer(CALLBACK(src, .proc/Reload), 10, TIMER_UNIQUE) //spam protect + addtimer(CALLBACK(src, PROC_REF(Reload)), 10, TIMER_UNIQUE) //spam protect // This is a mapping aid. In order for this to be placed on a map and function, all three layers need to have their nodes active /obj/structure/cable/multilayer/connected diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index af6fda2769a..c6ca12c5576 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -60,9 +60,9 @@ desc += " This one has a rating of [display_energy(maxcharge)][prob(10) ? ", and you should not swallow it" : ""]." //joke works better if it's not on every cell update_appearance() - RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, .proc/on_magic_charge) + RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, PROC_REF(on_magic_charge)) var/static/list/loc_connections = list( - COMSIG_ITEM_MAGICALLY_CHARGED = .proc/on_magic_charge, + COMSIG_ITEM_MAGICALLY_CHARGED = PROC_REF(on_magic_charge), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -104,8 +104,8 @@ /obj/item/stock_parts/cell/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/item/stock_parts/cell/proc/on_reagents_del(datum/reagents/reagents) diff --git a/code/modules/power/lighting/light.dm b/code/modules/power/lighting/light.dm index 93793635988..055e52f2a3b 100644 --- a/code/modules/power/lighting/light.dm +++ b/code/modules/power/lighting/light.dm @@ -88,7 +88,7 @@ if(start_with_cell && !no_low_power) cell = new/obj/item/stock_parts/cell/emergency_light(src) - RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, .proc/on_light_eater) + RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) AddElement(/datum/element/atmos_sensitive, mapload) return INITIALIZE_HINT_LATELOAD @@ -156,11 +156,11 @@ if(!.) return var/area/our_area =get_room_area(src) - RegisterSignal(our_area, COMSIG_AREA_FIRE_CHANGED, .proc/handle_fire) + RegisterSignal(our_area, COMSIG_AREA_FIRE_CHANGED, PROC_REF(handle_fire)) /obj/machinery/light/on_enter_area(datum/source, area/area_to_register) ..() - RegisterSignal(area_to_register, COMSIG_AREA_FIRE_CHANGED, .proc/handle_fire) + RegisterSignal(area_to_register, COMSIG_AREA_FIRE_CHANGED, PROC_REF(handle_fire)) handle_fire(area_to_register, area_to_register.fire) /obj/machinery/light/on_exit_area(datum/source, area/area_to_unregister) @@ -219,7 +219,7 @@ maploaded = FALSE else if(!turning_on) turning_on = TRUE - addtimer(CALLBACK(src, .proc/turn_on, trigger, play_sound), rand(LIGHT_ON_DELAY_LOWER, LIGHT_ON_DELAY_UPPER)) + addtimer(CALLBACK(src, PROC_REF(turn_on), trigger, play_sound), rand(LIGHT_ON_DELAY_LOWER, LIGHT_ON_DELAY_UPPER)) //SKYRAT EDIT END else if(has_emergency_power(LIGHT_EMERGENCY_POWER_USE) && !turned_off()) use_power = IDLE_POWER_USE @@ -263,7 +263,7 @@ if(!start_only) do_sparks(3, TRUE, src) var/delay = rand(BROKEN_SPARKS_MIN, BROKEN_SPARKS_MAX) - addtimer(CALLBACK(src, .proc/broken_sparks), delay, TIMER_UNIQUE | TIMER_NO_HASH_WAIT) + addtimer(CALLBACK(src, PROC_REF(broken_sparks)), delay, TIMER_UNIQUE | TIMER_NO_HASH_WAIT) /obj/machinery/light/process(delta_time) if(has_power()) //If the light is being powered by the station. diff --git a/code/modules/power/lighting/light_items.dm b/code/modules/power/lighting/light_items.dm index 7354025b23a..90301fb32d9 100644 --- a/code/modules/power/lighting/light_items.dm +++ b/code/modules/power/lighting/light_items.dm @@ -76,7 +76,7 @@ AddComponent(/datum/component/caltrop, min_damage = force) update() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index 091bbc89fcd..926982601df 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -225,7 +225,7 @@ By design, d1 is the smallest direction and d2 is the highest pipe_icon.color = pipe_cleaner_colors[color] possible_colors += list("[color]" = pipe_icon) - var/selected_color = show_radial_menu(user, src, possible_colors, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 40, require_near = TRUE) + var/selected_color = show_radial_menu(user, src, possible_colors, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 40, require_near = TRUE) if(!selected_color) return set_pipecleaner_color(selected_color) diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index a9b86e439ac..c6c9e477b9e 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -28,7 +28,7 @@ /obj/machinery/power/Destroy() disconnect_from_network() - addtimer(CALLBACK(GLOBAL_PROC, .proc/update_cable_icons_on_turf, get_turf(src)), 3) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(update_cable_icons_on_turf), get_turf(src)), 3) return ..() /////////////////////////////// diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm index fb2492c835b..4982de1a750 100644 --- a/code/modules/power/rtg.dm +++ b/code/modules/power/rtg.dm @@ -72,7 +72,7 @@ span_hear("You hear a loud electrical crack!")) playsound(src.loc, 'sound/magic/lightningshock.ogg', 100, TRUE, extrarange = 5) tesla_zap(src, 5, power_gen * 0.05) - addtimer(CALLBACK(GLOBAL_PROC, .proc/explosion, src, 2, 3, 4, null, 8), 10 SECONDS) // Not a normal explosion. + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(explosion), src, 2, 3, 4, null, 8), 10 SECONDS) // Not a normal explosion. /obj/machinery/power/rtg/abductor/bullet_act(obj/projectile/Proj) . = ..() diff --git a/code/modules/power/singularity/boh_tear.dm b/code/modules/power/singularity/boh_tear.dm index 9aebf3e1190..50ec97946d7 100644 --- a/code/modules/power/singularity/boh_tear.dm +++ b/code/modules/power/singularity/boh_tear.dm @@ -25,7 +25,7 @@ /obj/boh_tear/Initialize(mapload) . = ..() QDEL_IN(src, 10 SECONDS) // vanishes after 10 seconds - addtimer(CALLBACK(src, .proc/add_singularity), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(add_singularity)), 5 SECONDS) /obj/boh_tear/proc/add_singularity() // the grav_pull was BOH_TEAR_GRAV_PULL (25), but that is a whole lot diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 1e645eb7706..032be1d3e5d 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -22,9 +22,9 @@ /obj/machinery/field/containment/Initialize(mapload) . = ..() air_update_turf(TRUE, TRUE) - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity) + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -162,4 +162,4 @@ to_chat(considered_atom, span_userdanger("The field repels you with tremendous force!")) playsound(src, 'sound/effects/gravhit.ogg', 50, TRUE) considered_atom.throw_at(target, 200, 4) - addtimer(CALLBACK(src, .proc/clear_shock), 5) + addtimer(CALLBACK(src, PROC_REF(clear_shock)), 5) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index c7ca90dd54c..4a85da226f3 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -65,7 +65,7 @@ no power level overlay is currently in the overlays list. /obj/machinery/field/generator/Initialize(mapload) . = ..() AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) - RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, .proc/block_singularity_if_active) + RegisterSignal(src, COMSIG_ATOM_SINGULARITY_TRY_MOVE, PROC_REF(block_singularity_if_active)) /obj/machinery/field/generator/anchored/Initialize(mapload) . = ..() @@ -196,8 +196,8 @@ no power level overlay is currently in the overlays list. active = FG_OFFLINE can_atmos_pass = ATMOS_PASS_YES air_update_turf(TRUE, FALSE) - INVOKE_ASYNC(src, .proc/cleanup) - addtimer(CALLBACK(src, .proc/cool_down), 5 SECONDS) + INVOKE_ASYNC(src, PROC_REF(cleanup)) + addtimer(CALLBACK(src, PROC_REF(cool_down)), 5 SECONDS) /obj/machinery/field/generator/proc/cool_down() if(active || warming_up <= 0) @@ -205,11 +205,11 @@ no power level overlay is currently in the overlays list. warming_up-- update_appearance() if(warming_up > 0) - addtimer(CALLBACK(src, .proc/cool_down), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(cool_down)), 5 SECONDS) /obj/machinery/field/generator/proc/turn_on() active = FG_CHARGING - addtimer(CALLBACK(src, .proc/warm_up), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(warm_up)), 5 SECONDS) /obj/machinery/field/generator/proc/warm_up() if(!active) @@ -219,7 +219,7 @@ no power level overlay is currently in the overlays list. if(warming_up >= 3) start_fields() else - addtimer(CALLBACK(src, .proc/warm_up), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(warm_up)), 5 SECONDS) /obj/machinery/field/generator/proc/calc_power(set_power_draw) var/power_draw = 2 + fields.len @@ -272,10 +272,10 @@ no power level overlay is currently in the overlays list. move_resist = INFINITY can_atmos_pass = ATMOS_PASS_NO air_update_turf(TRUE, TRUE) - addtimer(CALLBACK(src, .proc/setup_field, 1), 1) - addtimer(CALLBACK(src, .proc/setup_field, 2), 2) - addtimer(CALLBACK(src, .proc/setup_field, 4), 3) - addtimer(CALLBACK(src, .proc/setup_field, 8), 4) + addtimer(CALLBACK(src, PROC_REF(setup_field), 1), 1) + addtimer(CALLBACK(src, PROC_REF(setup_field), 2), 2) + addtimer(CALLBACK(src, PROC_REF(setup_field), 4), 3) + addtimer(CALLBACK(src, PROC_REF(setup_field), 8), 4) addtimer(VARSET_CALLBACK(src, active, FG_ONLINE), 5) /obj/machinery/field/generator/proc/setup_field(NSEW) diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index bb251c0fc48..74f972294e1 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -44,7 +44,7 @@ singularity = WEAKREF(AddComponent( /datum/component/singularity, \ bsa_targetable = FALSE, \ - consume_callback = CALLBACK(src, .proc/consume), \ + consume_callback = CALLBACK(src, PROC_REF(consume)), \ consume_range = NARSIE_CONSUME_RANGE, \ disregard_failed_movements = TRUE, \ grav_pull = NARSIE_GRAV_PULL, \ @@ -87,7 +87,7 @@ souls_needed[player] = TRUE soul_goal = round(1 + LAZYLEN(souls_needed) * 0.75) - INVOKE_ASYNC(GLOBAL_PROC, .proc/begin_the_end) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(begin_the_end)) /obj/narsie/Destroy() send_to_playing_players(span_narsie("\"[pick("Nooooo...", "Not die. How-", "Die. Mort-", "Sas tyen re-")]\"")) @@ -194,7 +194,7 @@ /obj/narsie/proc/narsie_spawn_animation() setDir(SOUTH) flick("narsie_spawn_anim", src) - addtimer(CALLBACK(src, .proc/narsie_spawn_animation_end), 3.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(narsie_spawn_animation_end)), 3.5 SECONDS) /obj/narsie/proc/narsie_spawn_animation_end() var/datum/component/singularity/singularity_component = singularity.resolve() @@ -211,34 +211,34 @@ * * [/proc/cult_ending_helper()] */ /proc/begin_the_end() - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_end_begin_check), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_end_begin_check)), 5 SECONDS) ///First crew last second win check and flufftext for [/proc/begin_the_end()] /proc/narsie_end_begin_check() if(QDELETED(GLOB.cult_narsie)) // uno priority_announce("Status report? We detected an anomaly, but it disappeared almost immediately.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg') GLOB.cult_narsie = null - addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper, CULT_FAILURE_NARSIE_KILLED), 2 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_FAILURE_NARSIE_KILLED), 2 SECONDS) return priority_announce("An acausal dimensional event has been detected in your sector. Event has been flagged EXTINCTION-CLASS. Directing all available assets toward simulating solutions. SOLUTION ETA: 60 SECONDS.","Central Command Higher Dimensional Affairs", 'sound/misc/airraid.ogg') - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_end_second_check), 50 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_end_second_check)), 50 SECONDS) ///Second crew last second win check and flufftext for [/proc/begin_the_end()] /proc/narsie_end_second_check() if(QDELETED(GLOB.cult_narsie)) // dos priority_announce("Simulations aborted, sensors report that the acasual event is normalizing. Good work, crew.","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg') GLOB.cult_narsie = null - addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper, CULT_FAILURE_NARSIE_KILLED), 2 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_FAILURE_NARSIE_KILLED), 2 SECONDS) return priority_announce("Simulations on acausal dimensional event complete. Deploying solution package now. Deployment ETA: ONE MINUTE. ","Central Command Higher Dimensional Affairs") - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_start_destroy_station), 5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_start_destroy_station)), 5 SECONDS) ///security level and shuttle lockdowns for [/proc/begin_the_end()] /proc/narsie_start_destroy_station() SSsecurity_level.set_level(SEC_LEVEL_GAMMA) //SKYRAT EDIT CHANGE - ALERTS - ORIGINAL "delta" SSshuttle.registerHostileEnvironment(GLOB.cult_narsie) SSshuttle.lockdown = TRUE - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_apocalypse), 1 MINUTES) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_apocalypse)), 1 MINUTES) ///Third crew last second win check and flufftext for [/proc/begin_the_end()] /proc/narsie_apocalypse() @@ -246,18 +246,18 @@ priority_announce("Normalization detected! Abort the solution package!","Central Command Higher Dimensional Affairs", 'sound/misc/notice1.ogg') SSshuttle.clearHostileEnvironment(GLOB.cult_narsie) GLOB.cult_narsie = null - addtimer(CALLBACK(GLOBAL_PROC, .proc/narsie_last_second_win), 2 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(narsie_last_second_win)), 2 SECONDS) return if(GLOB.cult_narsie.resolved == FALSE) GLOB.cult_narsie.resolved = TRUE sound_to_playing_players('sound/machines/alarm.ogg') - addtimer(CALLBACK(GLOBAL_PROC, .proc/cult_ending_helper), 12 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper)), 12 SECONDS) ///Called only if the crew managed to destroy narsie at the very last second for [/proc/begin_the_end()] /proc/narsie_last_second_win() SSsecurity_level.set_level(SEC_LEVEL_RED) SSshuttle.lockdown = FALSE - INVOKE_ASYNC(GLOBAL_PROC, .proc/cult_ending_helper, CULT_FAILURE_NARSIE_KILLED) + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(cult_ending_helper), CULT_FAILURE_NARSIE_KILLED) ///Helper to set the round to end asap. Current usage Cult round end code /proc/ending_helper() @@ -271,15 +271,15 @@ switch(ending_type) // Narsie was killed if(CULT_FAILURE_NARSIE_KILLED) - play_cinematic(/datum/cinematic/cult_fail, world, CALLBACK(GLOBAL_PROC, /proc/ending_helper)) + play_cinematic(/datum/cinematic/cult_fail, world, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper))) // The cult "converted" (harvested) most of the station if(CULT_VICTORY_MASS_CONVERSION) - play_cinematic(/datum/cinematic/cult_arm, world, CALLBACK(GLOBAL_PROC, /proc/ending_helper)) + play_cinematic(/datum/cinematic/cult_arm, world, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper))) // The cult won, but centcom deployed a nuke. Default if(CULT_VICTORY_NUKE) - play_cinematic(/datum/cinematic/nuke/cult, world, CALLBACK(GLOBAL_PROC, /proc/ending_helper)) + play_cinematic(/datum/cinematic/nuke/cult, world, CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(ending_helper))) #undef NARSIE_CHANCE_TO_PICK_NEW_TARGET #undef NARSIE_CONSUME_RANGE diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 64c6320cd2c..40dac3f8bcb 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -50,7 +50,7 @@ //SKYRAT EDIT ADDITION BEGIN new /obj/effect/singularity_creation(loc) - addtimer(CALLBACK(src, .proc/make_visible), 62) + addtimer(CALLBACK(src, PROC_REF(make_visible)), 62) energy = starting_energy //SKYRAT EDIT END @@ -60,7 +60,7 @@ var/datum/component/singularity/new_component = AddComponent( /datum/component/singularity, \ - consume_callback = CALLBACK(src, .proc/consume), \ + consume_callback = CALLBACK(src, PROC_REF(consume)), \ ) singularity_component = WEAKREF(new_component) @@ -109,7 +109,7 @@ rip_u.dismember(BURN) //nice try jedi qdel(rip_u) return - addtimer(CALLBACK(GLOBAL_PROC, .proc/carbon_tk_part_two, jedi), 0.1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(carbon_tk_part_two), jedi), 0.1 SECONDS) /obj/singularity/proc/carbon_tk_part_two(mob/living/carbon/jedi) if(QDELETED(jedi)) @@ -125,7 +125,7 @@ rip_u.dismember(BURN) qdel(rip_u) return - addtimer(CALLBACK(GLOBAL_PROC, .proc/carbon_tk_part_three, jedi), 0.1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(carbon_tk_part_three), jedi), 0.1 SECONDS) /obj/singularity/proc/carbon_tk_part_three(mob/living/carbon/jedi) if(QDELETED(jedi)) @@ -448,7 +448,7 @@ return gain /obj/singularity/deadchat_plays(mode = DEMOCRACY_MODE, cooldown = 12 SECONDS) - . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list(), cooldown, CALLBACK(src, .proc/stop_deadchat_plays)) + . = AddComponent(/datum/component/deadchat_control/cardinal_movement, mode, list(), cooldown, CALLBACK(src, PROC_REF(stop_deadchat_plays))) if(. == COMPONENT_INCOMPATIBLE) return diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 2cb055e3ff0..1fcea0897f7 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -38,7 +38,7 @@ 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 @@ -384,7 +384,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 f28e86b80c1..7a5791a35eb 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -187,14 +187,14 @@ 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/force_delam) + RegisterSignal(src, COMSIG_ATOM_BSA_BEAM, PROC_REF(force_delam)) var/static/list/loc_connections = list( - COMSIG_TURF_INDUSTRIAL_LIFT_ENTER = .proc/tram_contents_consume, + COMSIG_TURF_INDUSTRIAL_LIFT_ENTER = PROC_REF(tram_contents_consume), ) AddElement(/datum/element/connect_loc, loc_connections) //Speficially for the tram, hacky - AddComponent(/datum/component/supermatter_crystal, CALLBACK(src, .proc/wrench_act_callback), CALLBACK(src, .proc/consume_callback)) + AddComponent(/datum/component/supermatter_crystal, CALLBACK(src, PROC_REF(wrench_act_callback)), CALLBACK(src, PROC_REF(consume_callback))) soundloop = new(src, TRUE) diff --git a/code/modules/power/supermatter/supermatter_delamination/cascade_delam.dm b/code/modules/power/supermatter/supermatter_delamination/cascade_delam.dm index 6baaf3ab8b7..6dae89496de 100644 --- a/code/modules/power/supermatter/supermatter_delamination/cascade_delam.dm +++ b/code/modules/power/supermatter/supermatter_delamination/cascade_delam.dm @@ -40,7 +40,7 @@ animate(sm.warp, time = 1, transform = matrix().Scale(0.5,0.5)) animate(time = 9, transform = matrix()) - addtimer(CALLBACK(src, .proc/announce_cascade, sm), 2 MINUTES) + addtimer(CALLBACK(src, PROC_REF(announce_cascade), sm), 2 MINUTES) /datum/sm_delam/cascade/on_deselect(obj/machinery/power/supermatter_crystal/sm) message_admins("[sm] will no longer cascade. [ADMIN_VERBOSEJMP(sm)]") @@ -62,7 +62,7 @@ effect_strand_shuttle() sleep(5 SECONDS) var/obj/cascade_portal/rift = effect_evac_rift_start() - RegisterSignal(rift, COMSIG_PARENT_QDELETING, .proc/end_round_holder) + RegisterSignal(rift, COMSIG_PARENT_QDELETING, PROC_REF(end_round_holder)) SSsupermatter_cascade.can_fire = TRUE SSsupermatter_cascade.cascade_initiated = TRUE effect_crystal_mass(sm, rift) @@ -94,4 +94,4 @@ /// Signal calls cant sleep, we gotta do this. /datum/sm_delam/cascade/proc/end_round_holder() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/effect_evac_rift_end) + INVOKE_ASYNC(src, PROC_REF(effect_evac_rift_end)) diff --git a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm index 39b49657ef9..60d644946fe 100644 --- a/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm +++ b/code/modules/power/supermatter/supermatter_delamination/delamination_effects.dm @@ -64,7 +64,7 @@ var/extended_spawn = 0 if(DT_PROB(1, next_spawn)) extended_spawn = rand(5 MINUTES, 15 MINUTES) - addtimer(CALLBACK(GLOBAL_PROC, .proc/supermatter_anomaly_gen, anomaly_location, anomaly_to_spawn, TRUE), current_spawn + extended_spawn) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(supermatter_anomaly_gen), anomaly_location, anomaly_to_spawn, TRUE), current_spawn + extended_spawn) return TRUE /// Explodes diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 0901ae0bb0e..e732b0704a1 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -127,7 +127,7 @@ energy_to_raise = energy_to_raise * 1.25 playsound(src.loc, 'sound/magic/lightning_chargeup.ogg', 100, TRUE, extrarange = 30) - addtimer(CALLBACK(src, .proc/new_mini_ball), 100) + addtimer(CALLBACK(src, PROC_REF(new_mini_ball)), 100) else if(energy < energy_to_lower && orbiting_balls.len) energy_to_raise = energy_to_raise / 1.25 energy_to_lower = (energy_to_raise / 1.25) - 20 diff --git a/code/modules/power/tracker.dm b/code/modules/power/tracker.dm index cb18b9ac0a4..3242144235a 100644 --- a/code/modules/power/tracker.dm +++ b/code/modules/power/tracker.dm @@ -30,7 +30,7 @@ Make(S) connect_to_network() - RegisterSignal(SSsun, COMSIG_SUN_MOVED, .proc/sun_update) + RegisterSignal(SSsun, COMSIG_SUN_MOVED, PROC_REF(sun_update)) /obj/machinery/power/tracker/Destroy() unset_control() //remove from control computer diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm index 546a5bfdbc8..faecf0a92b7 100644 --- a/code/modules/procedural_mapping/mapGenerator.dm +++ b/code/modules/procedural_mapping/mapGenerator.dm @@ -107,7 +107,7 @@ if(!modules || !modules.len) return for(var/datum/map_generator_module/mod in modules) - INVOKE_ASYNC(mod, /datum/map_generator_module.proc/generate) + INVOKE_ASYNC(mod, TYPE_PROC_REF(/datum/map_generator_module, generate)) //Requests the mapGeneratorModule(s) to (re)generate this one turf @@ -118,7 +118,7 @@ if(!modules || !modules.len) return for(var/datum/map_generator_module/mod in modules) - INVOKE_ASYNC(mod, /datum/map_generator_module.proc/place, T) + INVOKE_ASYNC(mod, TYPE_PROC_REF(/datum/map_generator_module, place), T) //Replaces all paths in the module list with actual module datums diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm index 52bc291b094..2b0a06095ab 100644 --- a/code/modules/projectiles/ammunition/_ammunition.dm +++ b/code/modules/projectiles/ammunition/_ammunition.dm @@ -58,7 +58,7 @@ return ..() /obj/item/ammo_casing/add_weapon_description() - AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_ammo) + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_ammo)) /** * @@ -139,6 +139,6 @@ SpinAnimation(10, 1) var/turf/T = get_turf(src) if(still_warm && T?.bullet_sizzle) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, 'sound/items/welder.ogg', 20, 1), bounce_delay) //If the turf is made of water and the shell casing is still hot, make a sizzling sound when it's ejected. + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, 'sound/items/welder.ogg', 20, 1), bounce_delay) //If the turf is made of water and the shell casing is still hot, make a sizzling sound when it's ejected. else if(T?.bullet_bounce_sound) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, src, T.bullet_bounce_sound, 20, 1), bounce_delay) //Soft / non-solid turfs that shouldn't make a sound when a shell casing is ejected over them. + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), src, T.bullet_bounce_sound, 20, 1), bounce_delay) //Soft / non-solid turfs that shouldn't make a sound when a shell casing is ejected over them. diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index c5a2ff95bb0..1a3328011f4 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -45,7 +45,7 @@ top_off(starting=TRUE) /obj/item/ammo_box/add_weapon_description() - AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_box) + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_box)) /obj/item/ammo_box/proc/add_notes_box() var/list/readout = list() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 15e7393c766..075de5a93ab 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -262,7 +262,7 @@ else if(G.can_trigger_gun(user)) bonus_spread += dual_wield_spread loop_counter++ - addtimer(CALLBACK(G, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread), loop_counter) + addtimer(CALLBACK(G, TYPE_PROC_REF(/obj/item/gun, process_fire), target, user, TRUE, params, null, bonus_spread), loop_counter) return process_fire(target, user, TRUE, params, null, bonus_spread) @@ -370,7 +370,7 @@ if(burst_size > 1) firing_burst = TRUE for(var/i = 1 to burst_size) - addtimer(CALLBACK(src, .proc/process_burst, user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i), modified_delay * (i - 1)) + addtimer(CALLBACK(src, PROC_REF(process_burst), user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i), modified_delay * (i - 1)) else if(chambered) if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal. @@ -393,7 +393,7 @@ process_chamber() update_appearance() semicd = TRUE - addtimer(CALLBACK(src, .proc/reset_semicd), modified_delay) + addtimer(CALLBACK(src, PROC_REF(reset_semicd)), modified_delay) if(user) user.update_held_items() diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index 00dc835350b..01796c6cbbf 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -131,10 +131,10 @@ else chamber_round(replace_new_round = TRUE) update_appearance() - RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_reload) + RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_reload)) /obj/item/gun/ballistic/add_weapon_description() - AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_ballistic) + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_ballistic)) /obj/item/gun/ballistic/fire_sounds() var/frequency_to_use = sin((90/magazine?.max_ammo) * get_ammo()) @@ -554,7 +554,7 @@ var/turf/target = get_ranged_target_turf(user, turn(user.dir, 180), BRAINS_BLOWN_THROW_RANGE) B.Remove(user) B.forceMove(T) - var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, /proc/spawn_atom_to_turf, /obj/effect/gibspawner/generic, B, 1, FALSE, user) + var/datum/callback/gibspawner = CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(spawn_atom_to_turf), /obj/effect/gibspawner/generic, B, 1, FALSE, user) B.throw_at(target, BRAINS_BLOWN_THROW_RANGE, BRAINS_BLOWN_THROW_SPEED, callback=gibspawner) return BRUTELOSS else diff --git a/code/modules/projectiles/guns/ballistic/bow.dm b/code/modules/projectiles/guns/ballistic/bow.dm index 58686fe06c4..86290a4207c 100644 --- a/code/modules/projectiles/guns/ballistic/bow.dm +++ b/code/modules/projectiles/guns/ballistic/bow.dm @@ -79,7 +79,7 @@ /obj/item/ammo_casing/caseless/arrow/despawning/dropped() . = ..() - addtimer(CALLBACK(src, .proc/floor_vanish), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(floor_vanish)), 5 SECONDS) /obj/item/ammo_casing/caseless/arrow/despawning/proc/floor_vanish() if(isturf(loc)) diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 1709f6cfeb4..1560e68b623 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -78,11 +78,11 @@ if(selfcharge) START_PROCESSING(SSobj, src) update_appearance() - RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_recharge) + RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_recharge)) AddElement(/datum/element/update_icon_updates_onmob) /obj/item/gun/energy/add_weapon_description() - AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_energy) + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_energy)) /** * diff --git a/code/modules/projectiles/guns/energy/beam_rifle.dm b/code/modules/projectiles/guns/energy/beam_rifle.dm index e45557cdade..daa110e95c3 100644 --- a/code/modules/projectiles/guns/energy/beam_rifle.dm +++ b/code/modules/projectiles/guns/energy/beam_rifle.dm @@ -239,7 +239,7 @@ if(aiming) delay_penalty(aiming_time_increase_user_movement) process_aim() - INVOKE_ASYNC(src, .proc/aiming_beam, TRUE) + INVOKE_ASYNC(src, PROC_REF(aiming_beam), TRUE) /obj/item/gun/energy/beam_rifle/proc/start_aiming() aiming_time_left = aiming_time @@ -267,7 +267,7 @@ current_user = null if(istype(user)) current_user = user - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/on_mob_move) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(on_mob_move)) listeningTo = user /obj/item/gun/energy/beam_rifle/onMouseDrag(src_object, over_object, src_location, over_location, params, mob) diff --git a/code/modules/projectiles/guns/energy/recharge.dm b/code/modules/projectiles/guns/energy/recharge.dm index 1c667e12e74..3e84b8761af 100644 --- a/code/modules/projectiles/guns/energy/recharge.dm +++ b/code/modules/projectiles/guns/energy/recharge.dm @@ -37,7 +37,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), 0.1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(empty_if_not_held)), 0.1 SECONDS) /obj/item/gun/energy/recharge/handle_chamber() . = ..() @@ -68,7 +68,7 @@ carried++ carried = max(carried, 1) deltimer(recharge_timerid) - recharge_timerid = addtimer(CALLBACK(src, .proc/reload), set_recharge_time * carried, TIMER_STOPPABLE) + recharge_timerid = addtimer(CALLBACK(src, PROC_REF(reload)), set_recharge_time * carried, TIMER_STOPPABLE) /obj/item/gun/energy/recharge/emp_act(severity) return diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index e428c0fc9d7..a20744b2af7 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -287,7 +287,7 @@ /obj/item/gun/energy/wormhole_projector/proc/create_portal(obj/projectile/beam/wormhole/W, turf/target) var/obj/effect/portal/P = new /obj/effect/portal(target, 300, null, FALSE, null) - RegisterSignal(P, COMSIG_PARENT_QDELETING, .proc/on_portal_destroy) + RegisterSignal(P, COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy)) if(istype(W, /obj/projectile/beam/wormhole/orange)) qdel(p_orange) p_orange = P diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 4541ea22ee2..884ce7c6360 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -27,7 +27,7 @@ /obj/item/gun/magic/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, .proc/on_magic_charge) + RegisterSignal(src, COMSIG_ITEM_MAGICALLY_CHARGED, PROC_REF(on_magic_charge)) /obj/item/gun/magic/fire_sounds() @@ -94,7 +94,7 @@ chambered = new ammo_type(src) if(can_charge) START_PROCESSING(SSobj, src) - RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_recharge) + RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_recharge)) /obj/item/gun/magic/Destroy() diff --git a/code/modules/projectiles/guns/special/blastcannon.dm b/code/modules/projectiles/guns/special/blastcannon.dm index 99bd696e66b..8b75e47b422 100644 --- a/code/modules/projectiles/guns/special/blastcannon.dm +++ b/code/modules/projectiles/guns/special/blastcannon.dm @@ -51,7 +51,7 @@ . = ..() if(!pin) pin = new - RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, .proc/channel_blastwave) + RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, PROC_REF(channel_blastwave)) AddElement(/datum/element/update_icon_updates_onmob) /obj/item/gun/blastcannon/Destroy() @@ -161,15 +161,15 @@ return if(!ismob(loc)) - INVOKE_ASYNC(src, .proc/fire_dropped, heavy, medium, light) + INVOKE_ASYNC(src, PROC_REF(fire_dropped), heavy, medium, light) return var/mob/holding = loc var/target = cached_target?.resolve() if(target && (holding.get_active_held_item() == src) && cached_firer && (holding == cached_firer.resolve())) - INVOKE_ASYNC(src, .proc/fire_intentionally, target, holding, heavy, medium, light, cached_modifiers) + INVOKE_ASYNC(src, PROC_REF(fire_intentionally), target, holding, heavy, medium, light, cached_modifiers) else - INVOKE_ASYNC(src, .proc/fire_accidentally, holding, heavy, medium, light) + INVOKE_ASYNC(src, PROC_REF(fire_accidentally), holding, heavy, medium, light) return /** diff --git a/code/modules/projectiles/guns/special/grenade_launcher.dm b/code/modules/projectiles/guns/special/grenade_launcher.dm index ec3e792d79c..7aa6bc9a46c 100644 --- a/code/modules/projectiles/guns/special/grenade_launcher.dm +++ b/code/modules/projectiles/guns/special/grenade_launcher.dm @@ -45,4 +45,4 @@ F.active = 1 F.icon_state = initial(F.icon_state) + "_active" playsound(user.loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3) - addtimer(CALLBACK(F, /obj/item/grenade.proc/detonate), 15) + addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade, detonate)), 15) diff --git a/code/modules/projectiles/guns/special/medbeam.dm b/code/modules/projectiles/guns/special/medbeam.dm index 677089e1e93..4d2c6dd3d43 100644 --- a/code/modules/projectiles/guns/special/medbeam.dm +++ b/code/modules/projectiles/guns/special/medbeam.dm @@ -68,7 +68,7 @@ current_target = target active = TRUE current_beam = user.Beam(current_target, icon_state="medbeam", time = 10 MINUTES, maxdistance = max_range, beam_type = /obj/effect/ebeam/medical) - RegisterSignal(current_beam, COMSIG_PARENT_QDELETING, .proc/beam_died)//this is a WAY better rangecheck than what was done before (process check) + RegisterSignal(current_beam, COMSIG_PARENT_QDELETING, PROC_REF(beam_died))//this is a WAY better rangecheck than what was done before (process check) SSblackbox.record_feedback("tally", "gun_fired", 1, type) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 175f5778431..9af011340f4 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -192,7 +192,7 @@ ///How much we want to drop the embed_chance value, if we can embed, per tile, for falloff purposes var/embed_falloff_tile var/static/list/projectile_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) //SKYRAT ADDITION START /// If this should be able to hit the target even on direct firing when `ignored_factions` applies diff --git a/code/modules/projectiles/projectile/energy/net_snare.dm b/code/modules/projectiles/projectile/energy/net_snare.dm index 6b454e1d5d8..851c2eebe94 100644 --- a/code/modules/projectiles/projectile/energy/net_snare.dm +++ b/code/modules/projectiles/projectile/energy/net_snare.dm @@ -40,7 +40,7 @@ else com.target_ref = null - addtimer(CALLBACK(src, .proc/pop, teletarget), 30) + addtimer(CALLBACK(src, PROC_REF(pop), teletarget), 30) /obj/effect/nettingportal/proc/pop(teletarget) if(teletarget) diff --git a/code/modules/projectiles/projectile/energy/stun.dm b/code/modules/projectiles/projectile/energy/stun.dm index c4210e32997..27239f32955 100644 --- a/code/modules/projectiles/projectile/energy/stun.dm +++ b/code/modules/projectiles/projectile/energy/stun.dm @@ -25,7 +25,7 @@ if(C.dna && C.dna.check_mutation(/datum/mutation/human/hulk)) C.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk") else if((C.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(C, TRAIT_STUNIMMUNE)) - addtimer(CALLBACK(C, /mob/living/carbon.proc/do_jitter_animation, 20), 5) + addtimer(CALLBACK(C, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 20), 5) /obj/projectile/energy/electrode/on_range() //to ensure the bolt sparks when it reaches the end of its range if it didn't hit a target yet do_sparks(1, TRUE, src) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 0ea51e341a1..d02a1b77231 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -303,7 +303,7 @@ /obj/structure/closet/decay/Initialize(mapload) . = ..() if(auto_destroy) - addtimer(CALLBACK(src, .proc/bust_open), 5 MINUTES) + addtimer(CALLBACK(src, PROC_REF(bust_open)), 5 MINUTES) /obj/structure/closet/decay/after_weld(weld_state) if(weld_state) @@ -319,12 +319,12 @@ icon_state = weakened_icon update_appearance() - addtimer(CALLBACK(src, .proc/decay), 15 SECONDS) + addtimer(CALLBACK(src, PROC_REF(decay)), 15 SECONDS) ///Fade away into nothing /obj/structure/closet/decay/proc/decay() animate(src, alpha = 0, time = 3 SECONDS) - addtimer(CALLBACK(src, .proc/decay_finished), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(decay_finished)), 3 SECONDS) /obj/structure/closet/decay/proc/decay_finished() dump_contents() diff --git a/code/modules/reagents/chemistry/items.dm b/code/modules/reagents/chemistry/items.dm index bc4e38861aa..f7d90e4cc9b 100644 --- a/code/modules/reagents/chemistry/items.dm +++ b/code/modules/reagents/chemistry/items.dm @@ -306,7 +306,7 @@ /obj/item/thermometer/ui_close(mob/user) . = ..() - INVOKE_ASYNC(src, .proc/remove_thermometer, user) + INVOKE_ASYNC(src, PROC_REF(remove_thermometer), user) /obj/item/thermometer/ui_status(mob/user) if(!(in_range(src, user))) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index c9409531aab..950c987d94f 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -122,18 +122,16 @@ /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)) //SKYRAT EDIT ADDITION BEGIN - Skyrat-SS13/Skyrat-tg#1931 - if(upgrade_reagents) - upgrade_reagents = sort_list(upgrade_reagents, /proc/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)) //SKYRAT EDIT ADDITION END if(is_operational) begin_processing() diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 16b6b8edbca..3ca1c7a2673 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -84,7 +84,7 @@ beaker = null if(new_beaker) beaker = new_beaker - RegisterSignal(beaker.reagents, COMSIG_REAGENTS_REACTION_STEP, .proc/on_reaction_step) + RegisterSignal(beaker.reagents, COMSIG_REAGENTS_REACTION_STEP, PROC_REF(on_reaction_step)) update_appearance() return TRUE @@ -223,7 +223,7 @@ */ /obj/machinery/chem_heater/proc/add_ui_client_list(new_ui) LAZYADD(ui_client_list, new_ui) - RegisterSignal(new_ui, COMSIG_PARENT_QDELETING, .proc/on_ui_deletion) + RegisterSignal(new_ui, COMSIG_PARENT_QDELETING, PROC_REF(on_ui_deletion)) ///This removes an open ui instance from the ui list and deregsiters the signal /obj/machinery/chem_heater/proc/remove_ui_client_list(old_ui) diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm index d250c9f3ea7..4290d364c7a 100644 --- a/code/modules/reagents/chemistry/machinery/pandemic.dm +++ b/code/modules/reagents/chemistry/machinery/pandemic.dm @@ -208,7 +208,7 @@ update_appearance() var/turf/source_turf = get_turf(src) log_virus("A culture bottle was printed for the virus [adv_disease.admin_details()] at [loc_name(source_turf)] by [key_name(usr)]") - addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_replicator_cooldown)), 5 SECONDS) return TRUE /** @@ -227,7 +227,7 @@ bottle.reagents.add_reagent(/datum/reagent/vaccine, 15, list(id)) wait = TRUE update_appearance() - addtimer(CALLBACK(src, .proc/reset_replicator_cooldown), 20 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_replicator_cooldown)), 20 SECONDS) return TRUE /** diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index e332fe777a9..25cb931ab9f 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -275,7 +275,7 @@ /obj/machinery/reagentgrinder/proc/shake_for(duration) start_shaking() //start shaking - addtimer(CALLBACK(src, .proc/stop_shaking), duration) + addtimer(CALLBACK(src, PROC_REF(stop_shaking)), duration) /obj/machinery/reagentgrinder/proc/stop_shaking() update_appearance() @@ -290,7 +290,7 @@ else playsound(src, 'sound/machines/juicer.ogg', 20, TRUE) use_power(active_power_usage * time * 0.1) // .1 needed here to convert time (in deciseconds) to seconds such that watts * seconds = joules - addtimer(CALLBACK(src, .proc/stop_operating), time / speed) + addtimer(CALLBACK(src, PROC_REF(stop_operating)), time / speed) /obj/machinery/reagentgrinder/proc/stop_operating() operating = FALSE diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index a2a1e846918..855e4649aad 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -672,7 +672,7 @@ All effects don't start immediately, but rather get worse over time; the rate is COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED, ) - RegisterSignal(drink.reagents, reagent_change_signals, .proc/on_reagent_change) + RegisterSignal(drink.reagents, reagent_change_signals, PROC_REF(on_reagent_change)) return ..() @@ -1077,7 +1077,7 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/demonsblood/on_mob_metabolize(mob/living/metabolizer) . = ..() - RegisterSignal(metabolizer, COMSIG_LIVING_BLOOD_CRAWL_PRE_CONSUMED, .proc/pre_bloodcrawl_consumed) + RegisterSignal(metabolizer, COMSIG_LIVING_BLOOD_CRAWL_PRE_CONSUMED, PROC_REF(pre_bloodcrawl_consumed)) /datum/reagent/consumable/ethanol/demonsblood/on_mob_end_metabolize(mob/living/metabolizer) . = ..() @@ -1116,7 +1116,7 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/devilskiss/on_mob_metabolize(mob/living/metabolizer) . = ..() - RegisterSignal(metabolizer, COMSIG_LIVING_BLOOD_CRAWL_CONSUMED, .proc/on_bloodcrawl_consumed) + RegisterSignal(metabolizer, COMSIG_LIVING_BLOOD_CRAWL_CONSUMED, PROC_REF(on_bloodcrawl_consumed)) /datum/reagent/consumable/ethanol/devilskiss/on_mob_end_metabolize(mob/living/metabolizer) . = ..() @@ -2265,7 +2265,7 @@ All effects don't start immediately, but rather get worse over time; the rate is var/minimum_name_percent = 0.35 name = "" - var/list/names_in_order = sortTim(names, /proc/cmp_numeric_dsc, TRUE) + var/list/names_in_order = sortTim(names, GLOBAL_PROC_REF(cmp_numeric_dsc), TRUE) var/named = FALSE for(var/fruit_name in names) if(names[fruit_name] >= minimum_name_percent) diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm index f9329a464af..7ee0ee62b92 100644 --- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm @@ -532,8 +532,8 @@ . = ..() dancer.add_mood_event("vibing", /datum/mood_event/high, name) - RegisterSignal(dancer, COMSIG_MOB_EMOTED("flip"), .proc/on_flip) - RegisterSignal(dancer, COMSIG_MOB_EMOTED("spin"), .proc/on_spin) + RegisterSignal(dancer, COMSIG_MOB_EMOTED("flip"), PROC_REF(on_flip)) + RegisterSignal(dancer, COMSIG_MOB_EMOTED("spin"), PROC_REF(on_spin)) if(!dancer.hud_used) return @@ -655,7 +655,7 @@ . = ..() playsound(invisible_man, 'sound/chemistry/saturnx_fade.ogg', 40) to_chat(invisible_man, span_nicegreen("You feel pins and needles all over your skin as your body suddenly becomes transparent!")) - addtimer(CALLBACK(src, .proc/turn_man_invisible, invisible_man), 10) //just a quick delay to synch up the sound. + addtimer(CALLBACK(src, PROC_REF(turn_man_invisible), invisible_man), 10) //just a quick delay to synch up the sound. if(!invisible_man.hud_used) return diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 542295ac52b..8480a27ddaf 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -390,7 +390,7 @@ victim.set_confusion_if_lower(5 SECONDS) victim.Knockdown(3 SECONDS) victim.add_movespeed_modifier(/datum/movespeed_modifier/reagent/pepperspray) - addtimer(CALLBACK(victim, /mob.proc/remove_movespeed_modifier, /datum/movespeed_modifier/reagent/pepperspray), 10 SECONDS) + addtimer(CALLBACK(victim, TYPE_PROC_REF(/mob, remove_movespeed_modifier), /datum/movespeed_modifier/reagent/pepperspray), 10 SECONDS) victim.update_damage_hud() if(methods & INGEST) if(!holder.has_reagent(/datum/reagent/consumable/milk)) @@ -779,7 +779,7 @@ /datum/reagent/consumable/tinlux/proc/add_reagent_light(mob/living/living_holder) var/obj/effect/dummy/lighting_obj/moblight/mob_light_obj = living_holder.mob_light(2) LAZYSET(mobs_affected, living_holder, mob_light_obj) - RegisterSignal(living_holder, COMSIG_PARENT_QDELETING, .proc/on_living_holder_deletion) + RegisterSignal(living_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_living_holder_deletion)) /datum/reagent/consumable/tinlux/proc/remove_reagent_light(mob/living/living_holder) UnregisterSignal(living_holder, COMSIG_PARENT_QDELETING) diff --git a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm index 36cefee531e..64971a4cb2e 100644 --- a/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/impure_reagents/impure_medicine_reagents.dm @@ -88,7 +88,7 @@ Basically, we fill the time between now and 2s from now with hands based off the var/hands = 1 var/time = 2 / delta_time while(hands < delta_time) //we already made a hand now so start from 1 - LAZYADD(timer_ids, addtimer(CALLBACK(src, .proc/spawn_hands, owner), (time*hands) SECONDS, TIMER_STOPPABLE)) //keep track of all the timers we set up + LAZYADD(timer_ids, addtimer(CALLBACK(src, PROC_REF(spawn_hands), owner), (time*hands) SECONDS, TIMER_STOPPABLE)) //keep track of all the timers we set up hands += time return ..() @@ -141,8 +141,8 @@ Basically, we fill the time between now and 2s from now with hands based off the var/mob/living/carbon/consumer = L if(!consumer) return - RegisterSignal(consumer, COMSIG_CARBON_GAIN_ORGAN, .proc/on_gained_organ) - RegisterSignal(consumer, COMSIG_CARBON_LOSE_ORGAN, .proc/on_removed_organ) + RegisterSignal(consumer, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(on_gained_organ)) + RegisterSignal(consumer, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(on_removed_organ)) var/obj/item/organ/internal/liver/this_liver = consumer.getorganslot(ORGAN_SLOT_LIVER) this_liver.alcohol_tolerance *= 2 @@ -368,8 +368,8 @@ Basically, we fill the time between now and 2s from now with hands based off the /datum/reagent/inverse/healing/convermol/on_mob_add(mob/living/owner, amount) . = ..() - RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, .proc/on_gained_organ) - RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, .proc/on_removed_organ) + RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(on_gained_organ)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(on_removed_organ)) var/obj/item/organ/internal/lungs/lungs = owner.getorganslot(ORGAN_SLOT_LUNGS) if(!lungs) return @@ -700,8 +700,8 @@ Basically, we fill the time between now and 2s from now with hands based off the original_heart.organ_flags |= ORGAN_FROZEN //Not actually frozen, but we want to pause decay manual_heart.Insert(carbon_mob, special = TRUE) //these last so instert doesn't call them - RegisterSignal(carbon_mob, COMSIG_CARBON_GAIN_ORGAN, .proc/on_gained_organ) - RegisterSignal(carbon_mob, COMSIG_CARBON_LOSE_ORGAN, .proc/on_removed_organ) + RegisterSignal(carbon_mob, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(on_gained_organ)) + RegisterSignal(carbon_mob, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(on_removed_organ)) to_chat(owner, span_userdanger("You feel your heart suddenly stop beating on it's own - you'll have to manually beat it!")) ..() @@ -802,7 +802,7 @@ Basically, we fill the time between now and 2s from now with hands based off the /datum/reagent/impurity/inacusiate/on_mob_metabolize(mob/living/owner, delta_time, times_fired) randomSpan = pick(list("clown", "small", "big", "hypnophrase", "alien", "cult", "alert", "danger", "emote", "yell", "brass", "sans", "papyrus", "robot", "his_grace", "phobia")) - RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/owner_hear) + RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(owner_hear)) to_chat(owner, span_warning("Your hearing seems to be a bit off!")) ..() diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index b4ec8822093..fb9adcc04f1 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -664,8 +664,8 @@ /datum/reagent/medicine/oculine/on_mob_add(mob/living/owner) if(!iscarbon(owner)) return - RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, .proc/on_gained_organ) - RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, .proc/on_removed_organ) + RegisterSignal(owner, COMSIG_CARBON_GAIN_ORGAN, PROC_REF(on_gained_organ)) + RegisterSignal(owner, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(on_removed_organ)) var/obj/item/organ/internal/eyes/eyes = owner.getorganslot(ORGAN_SLOT_EYES) if(!eyes) return @@ -741,7 +741,7 @@ /datum/reagent/medicine/inacusiate/on_mob_add(mob/living/owner, amount) . = ..() if(creation_purity >= 1) - RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/owner_hear) + RegisterSignal(owner, COMSIG_MOVABLE_HEAR, PROC_REF(owner_hear)) //Lets us hear whispers from far away! /datum/reagent/medicine/inacusiate/proc/owner_hear(datum/source, message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, list/message_mods = list()) @@ -878,9 +878,9 @@ exposed_mob.notify_ghost_cloning("Your body is being revived with Strange Reagent!") exposed_mob.do_jitter_animation(10) var/excess_healing = 5 * (reac_volume - amount_to_revive) //excess reagent will heal blood and organs across the board - addtimer(CALLBACK(exposed_mob, /mob/living/carbon.proc/do_jitter_animation, 10), 40) //jitter immediately, then again after 4 and 8 seconds - addtimer(CALLBACK(exposed_mob, /mob/living/carbon.proc/do_jitter_animation, 10), 80) - addtimer(CALLBACK(exposed_mob, /mob/living.proc/revive, FALSE, FALSE, excess_healing), 79) + addtimer(CALLBACK(exposed_mob, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 40) //jitter immediately, then again after 4 and 8 seconds + addtimer(CALLBACK(exposed_mob, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), 10), 80) + addtimer(CALLBACK(exposed_mob, TYPE_PROC_REF(/mob/living, revive), FALSE, FALSE, excess_healing), 79) return ..() /datum/reagent/medicine/strange_reagent/on_mob_life(mob/living/carbon/M, delta_time, times_fired) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 992e14b2438..9b2a3ec280f 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -2002,7 +2002,7 @@ var/datum/callback/color_callback /datum/reagent/colorful_reagent/New() - color_callback = CALLBACK(src, .proc/UpdateColor) + color_callback = CALLBACK(src, PROC_REF(UpdateColor)) SSticker.OnRoundstart(color_callback) return ..() @@ -2037,7 +2037,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/reagent/hair_dye/New() - SSticker.OnRoundstart(CALLBACK(src,.proc/UpdateColor)) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(UpdateColor))) return ..() /datum/reagent/hair_dye/proc/UpdateColor() @@ -2595,7 +2595,7 @@ /datum/reagent/gravitum/expose_obj(obj/exposed_obj, volume) . = ..() exposed_obj.AddElement(/datum/element/forced_gravity, 0) - addtimer(CALLBACK(exposed_obj, .proc/_RemoveElement, list(/datum/element/forced_gravity, 0)), volume * time_multiplier) + addtimer(CALLBACK(exposed_obj, PROC_REF(_RemoveElement), list(/datum/element/forced_gravity, 0)), volume * time_multiplier) /datum/reagent/gravitum/on_mob_metabolize(mob/living/L) L.AddElement(/datum/element/forced_gravity, 0) //0 is the gravity, and in this case weightless diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm index 41eb088e823..309c1a27562 100644 --- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm @@ -105,7 +105,7 @@ /datum/reagent/gunpowder/on_new(data) . = ..() if(holder?.my_atom) - RegisterSignal(holder.my_atom, COMSIG_ATOM_EX_ACT, .proc/on_ex_act) + RegisterSignal(holder.my_atom, COMSIG_ATOM_EX_ACT, PROC_REF(on_ex_act)) /datum/reagent/gunpowder/Destroy() if(holder?.my_atom) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 094c7066e35..796800d6d43 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -92,7 +92,7 @@ /datum/reagent/toxin/plasma/on_new(data) . = ..() - RegisterSignal(holder, COMSIG_REAGENTS_TEMP_CHANGE, .proc/on_temp_change) + RegisterSignal(holder, COMSIG_REAGENTS_TEMP_CHANGE, PROC_REF(on_temp_change)) /datum/reagent/toxin/plasma/Destroy() UnregisterSignal(holder, COMSIG_REAGENTS_TEMP_CHANGE) @@ -177,10 +177,10 @@ ..() /datum/reagent/toxin/lexorin/on_mob_metabolize(mob/living/L) - RegisterSignal(L, COMSIG_CARBON_ATTEMPT_BREATHE, .proc/block_breath) + RegisterSignal(L, COMSIG_CARBON_ATTEMPT_BREATHE, PROC_REF(block_breath)) /datum/reagent/toxin/lexorin/on_mob_end_metabolize(mob/living/L) - UnregisterSignal(L, COMSIG_CARBON_ATTEMPT_BREATHE, .proc/block_breath) + UnregisterSignal(L, COMSIG_CARBON_ATTEMPT_BREATHE, PROC_REF(block_breath)) /datum/reagent/toxin/lexorin/proc/block_breath(mob/living/source) SIGNAL_HANDLER diff --git a/code/modules/reagents/chemistry/recipes.dm b/code/modules/reagents/chemistry/recipes.dm index eecbbb91092..23864f9fb8c 100644 --- a/code/modules/reagents/chemistry/recipes.dm +++ b/code/modules/reagents/chemistry/recipes.dm @@ -68,7 +68,7 @@ /datum/chemical_reaction/New() . = ..() - SSticker.OnRoundstart(CALLBACK(src,.proc/update_info)) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(update_info))) /** * Updates information during the roundstart @@ -274,10 +274,10 @@ else if(setting_type) if(step_away(X, T) && moving_power > 1) //Can happen twice at most. So this is fine. - addtimer(CALLBACK(GLOBAL_PROC, .proc/_step_away, X, T), 2) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step_away), X, T), 2) else if(step_towards(X, T) && moving_power > 1) - addtimer(CALLBACK(GLOBAL_PROC, .proc/_step_towards, X, T), 2) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(_step_towards), X, T), 2) //////////////////Generic explosions/failures//////////////////// // It is HIGHLY, HIGHLY recomended that you consume all/a good volume of the reagents/products in an explosion - because it will just keep going forever until the reaction stops diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 482471a5666..185f61dfcc6 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -156,7 +156,7 @@ mix_message = "Sparks start flying around the gunpowder!" /datum/chemical_reaction/reagent_explosion/gunpowder_explosion/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) - addtimer(CALLBACK(src, .proc/default_explode, holder, created_volume, modifier, strengthdiv), rand(5,10) SECONDS) + addtimer(CALLBACK(src, PROC_REF(default_explode), holder, created_volume, modifier, strengthdiv), rand(5,10) SECONDS) /datum/chemical_reaction/thermite results = list(/datum/reagent/thermite = 3) @@ -546,14 +546,14 @@ var/T3 = created_volume * 120 var/added_delay = 0.5 SECONDS if(created_volume >= 75) - addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T1), added_delay) + addtimer(CALLBACK(src, PROC_REF(zappy_zappy), holder, T1), added_delay) added_delay += 1.5 SECONDS if(created_volume >= 40) - addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T2), added_delay) + addtimer(CALLBACK(src, PROC_REF(zappy_zappy), holder, T2), added_delay) added_delay += 1.5 SECONDS if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast. - addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T3), added_delay) - addtimer(CALLBACK(src, .proc/default_explode, holder, created_volume, modifier, strengthdiv), added_delay) + addtimer(CALLBACK(src, PROC_REF(zappy_zappy), holder, T3), added_delay) + addtimer(CALLBACK(src, PROC_REF(default_explode), holder, created_volume, modifier, strengthdiv), added_delay) /datum/chemical_reaction/reagent_explosion/teslium_lightning/proc/zappy_zappy(datum/reagents/holder, power) if(QDELETED(holder.my_atom)) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 293f8396046..9f6eb9e0969 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -100,25 +100,25 @@ var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) ..() - M.qdel_timer = addtimer(CALLBACK(src, .proc/delete_extract, holder), 55, TIMER_STOPPABLE) + M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE) /datum/chemical_reaction/slime/slimemobspawn/proc/summon_mobs(datum/reagents/holder, turf/T) T.visible_message(span_danger("The slime extract begins to vibrate violently!")) - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 5, "Gold Slime", HOSTILE_SPAWN), 50) + addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 5, "Gold Slime", HOSTILE_SPAWN), 50) /datum/chemical_reaction/slime/slimemobspawn/lesser required_reagents = list(/datum/reagent/blood = 1) /datum/chemical_reaction/slime/slimemobspawn/lesser/summon_mobs(datum/reagents/holder, turf/T) T.visible_message(span_danger("The slime extract begins to vibrate violently!")) - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 3, "Lesser Gold Slime", HOSTILE_SPAWN, "neutral"), 50) + addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Lesser Gold Slime", HOSTILE_SPAWN, "neutral"), 50) /datum/chemical_reaction/slime/slimemobspawn/friendly required_reagents = list(/datum/reagent/water = 1) /datum/chemical_reaction/slime/slimemobspawn/friendly/summon_mobs(datum/reagents/holder, turf/T) T.visible_message(span_danger("The slime extract begins to vibrate adorably!")) - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 1, "Friendly Gold Slime", FRIENDLY_SPAWN, "neutral"), 50) + addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 1, "Friendly Gold Slime", FRIENDLY_SPAWN, "neutral"), 50) /datum/chemical_reaction/slime/slimemobspawn/spider required_reagents = list(/datum/reagent/spider_extract = 1) @@ -126,7 +126,7 @@ /datum/chemical_reaction/slime/slimemobspawn/spider/summon_mobs(datum/reagents/holder, turf/T) T.visible_message(span_danger("The slime extract begins to vibrate crikey-ingly!")) - addtimer(CALLBACK(src, .proc/chemical_mob_spawn, holder, 3, "Traitor Spider Slime", /mob/living/simple_animal/hostile/giant_spider/midwife, "neutral", FALSE), 50) + addtimer(CALLBACK(src, PROC_REF(chemical_mob_spawn), holder, 3, "Traitor Spider Slime", /mob/living/simple_animal/hostile/giant_spider/midwife, "neutral", FALSE), 50) //Silver @@ -200,11 +200,11 @@ /datum/chemical_reaction/slime/slimefreeze/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) var/turf/T = get_turf(holder.my_atom) T.visible_message(span_danger("The slime extract starts to feel extremely cold!")) - addtimer(CALLBACK(src, .proc/freeze, holder), 50) + addtimer(CALLBACK(src, PROC_REF(freeze), holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) ..() - M.qdel_timer = addtimer(CALLBACK(src, .proc/delete_extract, holder), 55, TIMER_STOPPABLE) + M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE) /datum/chemical_reaction/slime/slimefreeze/proc/freeze(datum/reagents/holder) if(holder?.my_atom) @@ -238,11 +238,11 @@ /datum/chemical_reaction/slime/slimefire/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) var/turf/T = get_turf(holder.my_atom) T.visible_message(span_danger("The slime extract begins to vibrate adorably!")) - addtimer(CALLBACK(src, .proc/slime_burn, holder), 50) + addtimer(CALLBACK(src, PROC_REF(slime_burn), holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) ..() - M.qdel_timer = addtimer(CALLBACK(src, .proc/delete_extract, holder), 55, TIMER_STOPPABLE) + M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE) /datum/chemical_reaction/slime/slimefire/proc/slime_burn(datum/reagents/holder) if(holder?.my_atom) @@ -395,11 +395,11 @@ message_admins("Slime Explosion reaction started at [ADMIN_VERBOSEJMP(T)]. Last Fingerprint: [touch_msg]") log_game("Slime Explosion reaction started at [AREACOORD(T)]. Last Fingerprint: [lastkey ? lastkey : "N/A"].") T.visible_message(span_danger("The slime extract begins to vibrate violently !")) - addtimer(CALLBACK(src, .proc/boom, holder), 50) + addtimer(CALLBACK(src, PROC_REF(boom), holder), 50) var/obj/item/slime_extract/M = holder.my_atom deltimer(M.qdel_timer) ..() - M.qdel_timer = addtimer(CALLBACK(src, .proc/delete_extract, holder), 55, TIMER_STOPPABLE) + M.qdel_timer = addtimer(CALLBACK(src, PROC_REF(delete_extract), holder), 55, TIMER_STOPPABLE) /datum/chemical_reaction/slime/slimeexplosion/proc/boom(datum/reagents/holder) if(holder?.my_atom) @@ -498,7 +498,7 @@ required_other = TRUE /datum/chemical_reaction/slime/slimestop/on_reaction(datum/reagents/holder, datum/equilibrium/reaction, created_volume) - addtimer(CALLBACK(src, .proc/slime_stop, holder), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(slime_stop), holder), 5 SECONDS) /datum/chemical_reaction/slime/slimestop/proc/slime_stop(datum/reagents/holder) var/obj/item/slime_extract/sepia/extract = holder.my_atom @@ -563,7 +563,7 @@ S.visible_message(span_danger("Infused with plasma, the core begins to expand uncontrollably!")) S.icon_state = "[S.base_state]_active" S.active = TRUE - addtimer(CALLBACK(S, /obj/item/grenade.proc/detonate), rand(15,60)) + addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, detonate)), rand(15,60)) else var/mob/living/simple_animal/slime/random/S = new (get_turf(holder.my_atom)) S.visible_message(span_danger("Infused with plasma, the core begins to quiver and grow, and a new baby slime emerges from it!")) @@ -580,7 +580,7 @@ S.visible_message(span_danger("Infused with slime jelly, the core begins to expand uncontrollably!")) S.icon_state = "[S.base_state]_active" S.active = TRUE - addtimer(CALLBACK(S, /obj/item/grenade.proc/detonate), rand(15,60)) + addtimer(CALLBACK(S, TYPE_PROC_REF(/obj/item/grenade, detonate)), rand(15,60)) var/lastkey = holder.my_atom.fingerprintslast var/touch_msg = "N/A" if(lastkey) diff --git a/code/modules/reagents/chemistry/recipes/special.dm b/code/modules/reagents/chemistry/recipes/special.dm index 4889e0afc4e..dbb9fefa5b3 100644 --- a/code/modules/reagents/chemistry/recipes/special.dm +++ b/code/modules/reagents/chemistry/recipes/special.dm @@ -300,7 +300,7 @@ GLOBAL_LIST_INIT(medicine_reagents, build_medicine_reagents()) if(SSpersistence.initialized) UpdateInfo() else - SSticker.OnRoundstart(CALLBACK(src,.proc/UpdateInfo)) + SSticker.OnRoundstart(CALLBACK(src, PROC_REF(UpdateInfo))) /obj/item/paper/secretrecipe/ui_static_data(mob/living/user) . = ..() diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 97e2fccecdf..8b09d211326 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -31,7 +31,7 @@ add_initial_reagents() //SKYRAT EDIT ADDITION - AddComponent(/datum/component/liquids_interaction, /obj/item/reagent_containers/cup/beaker/.proc/attack_on_liquids_turf) + AddComponent(/datum/component/liquids_interaction, TYPE_PROC_REF(/obj/item/reagent_containers/cup/beaker, attack_on_liquids_turf)) /obj/item/reagent_containers/proc/attack_on_liquids_turf(obj/item/reagent_containers/my_beaker, turf/T, mob/living/user, obj/effect/abstract/liquid_turf/liquids) if(user.combat_mode) @@ -70,8 +70,8 @@ /obj/item/reagent_containers/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /obj/item/reagent_containers/attack(mob/living/target_mob, mob/living/user, params) if (!user.combat_mode) diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index c7060759e4a..a7ed1fb2d71 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -331,8 +331,8 @@ /obj/item/reagent_containers/condiment/pack/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_add, TRUE) - RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, .proc/on_reagent_del, TRUE) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_add), TRUE) + RegisterSignal(reagents, COMSIG_REAGENTS_DEL_REAGENT, PROC_REF(on_reagent_del), TRUE) /obj/item/reagent_containers/condiment/pack/update_icon() SHOULD_CALL_PARENT(FALSE) diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index e2c4b7c2430..c3726445a7d 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -606,7 +606,7 @@ to_chat(user, span_info("You light [src] on fire.")) add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay) if(!isGlass) - addtimer(CALLBACK(src, .proc/explode), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(explode)), 5 SECONDS) /obj/item/reagent_containers/cup/glass/bottle/molotov/proc/explode() if(!active) @@ -643,7 +643,7 @@ /obj/item/reagent_containers/cup/glass/bottle/pruno/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/check_fermentation) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(check_fermentation)) /obj/item/reagent_containers/cup/glass/bottle/pruno/Destroy() UnregisterSignal(src, COMSIG_MOVABLE_MOVED) @@ -664,7 +664,7 @@ return if(!fermentation_time_remaining) fermentation_time_remaining = fermentation_time - fermentation_timer = addtimer(CALLBACK(src, .proc/do_fermentation), fermentation_time_remaining, TIMER_UNIQUE|TIMER_STOPPABLE) + fermentation_timer = addtimer(CALLBACK(src, PROC_REF(do_fermentation)), fermentation_time_remaining, TIMER_UNIQUE|TIMER_STOPPABLE) fermentation_time_remaining = null // actually ferment diff --git a/code/modules/reagents/reagent_containers/misc.dm b/code/modules/reagents/reagent_containers/misc.dm index 47b0fdcaa7e..bfddf6bb475 100644 --- a/code/modules/reagents/reagent_containers/misc.dm +++ b/code/modules/reagents/reagent_containers/misc.dm @@ -131,7 +131,7 @@ /obj/item/reagent_containers/cup/rag/Initialize(mapload) . = ..() - AddComponent(/datum/component/cleaner, 3 SECONDS, pre_clean_callback=CALLBACK(src, .proc/should_clean)) + AddComponent(/datum/component/cleaner, 3 SECONDS, pre_clean_callback=CALLBACK(src, PROC_REF(should_clean))) /obj/item/reagent_containers/cup/rag/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] is smothering [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!")) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index e713c3976a2..be09715ef63 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -47,7 +47,7 @@ ///Runs the consumption code, can be overriden for special effects /obj/item/reagent_containers/pill/proc/on_consumption(mob/M, mob/user) if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, M, span_notice("[pick(strings(REDPILL_FILE, "redpill_questions"))]")), 50) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), M, span_notice("[pick(strings(REDPILL_FILE, "redpill_questions"))]")), 50) if(reagents.total_volume) reagents.trans_to(M, reagents.total_volume, transfered_by = user, methods = apply_type) diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm index fdb00223c40..60ee00b1444 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -99,7 +99,7 @@ assembliesoverlay.pixel_x += 6 assembliesoverlay.pixel_y += 1 add_overlay(assembliesoverlay) - RegisterSignal(src, COMSIG_IGNITER_ACTIVATE, .proc/rig_boom) + RegisterSignal(src, COMSIG_IGNITER_ACTIVATE, PROC_REF(rig_boom)) log_bomber(user, "attached [holder.name] to ", src) last_rigger = user user.balloon_alert_to_viewers("attached rig") diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index d8cf18f59cb..ed9f27b4cc0 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -82,9 +82,9 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) ///Leaving onto conveyor detection won't work at this point, but that's alright since it's an optimization anyway ///Should be fine without it var/static/list/loc_connections = list( - COMSIG_ATOM_EXITED = .proc/conveyable_exit, - COMSIG_ATOM_ENTERED = .proc/conveyable_enter, - COMSIG_ATOM_INITIALIZED_ON = .proc/conveyable_enter + COMSIG_ATOM_EXITED = PROC_REF(conveyable_exit), + COMSIG_ATOM_ENTERED = PROC_REF(conveyable_enter), + COMSIG_ATOM_INITIALIZED_ON = PROC_REF(conveyable_enter) ) AddElement(/datum/element/connect_loc, loc_connections) update_move_direction() @@ -131,10 +131,10 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) continue neighbors["[direction]"] = TRUE valid.neighbors["[DIRFLIP(direction)]"] = TRUE - RegisterSignal(valid, COMSIG_MOVABLE_MOVED, .proc/nearby_belt_changed, override=TRUE) - RegisterSignal(valid, COMSIG_PARENT_QDELETING, .proc/nearby_belt_changed, override=TRUE) - valid.RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/nearby_belt_changed, override=TRUE) - valid.RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/nearby_belt_changed, override=TRUE) + RegisterSignal(valid, COMSIG_MOVABLE_MOVED, PROC_REF(nearby_belt_changed), override=TRUE) + RegisterSignal(valid, COMSIG_PARENT_QDELETING, PROC_REF(nearby_belt_changed), override=TRUE) + valid.RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(nearby_belt_changed), override=TRUE) + valid.RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(nearby_belt_changed), override=TRUE) /obj/machinery/conveyor/proc/nearby_belt_changed(datum/source) SIGNAL_HANDLER @@ -573,7 +573,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) if(!attached_switch) return - INVOKE_ASYNC(src, .proc/update_conveyers, port) + INVOKE_ASYNC(src, PROC_REF(update_conveyers), port) /obj/item/circuit_component/conveyor_switch/proc/update_conveyers(datum/port/input/port) if(!attached_switch) diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index d15bdd14389..e9256f9b7d8 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -40,10 +40,10 @@ air_contents = new /datum/gas_mixture() //gas.volume = 1.05 * CELLSTANDARD update_appearance() - RegisterSignal(src, COMSIG_RAT_INTERACT, .proc/on_rat_rummage) - RegisterSignal(src, COMSIG_STORAGE_DUMP_CONTENT, .proc/on_storage_dump) + RegisterSignal(src, COMSIG_RAT_INTERACT, PROC_REF(on_rat_rummage)) + RegisterSignal(src, COMSIG_STORAGE_DUMP_CONTENT, PROC_REF(on_storage_dump)) var/static/list/loc_connections = list( - COMSIG_CARBON_DISARM_COLLIDE = .proc/trash_carbon, + COMSIG_CARBON_DISARM_COLLIDE = PROC_REF(trash_carbon), ) AddElement(/datum/element/connect_loc, loc_connections) return INITIALIZE_HINT_LATELOAD //we need turfs to have air @@ -525,7 +525,7 @@ /obj/machinery/disposal/proc/on_rat_rummage(datum/source, mob/living/simple_animal/hostile/regalrat/king) SIGNAL_HANDLER - INVOKE_ASYNC(src, /obj/machinery/disposal/.proc/rat_rummage, king) + INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/machinery/disposal/, rat_rummage), king) /obj/machinery/disposal/proc/trash_carbon(datum/source, mob/living/carbon/shover, mob/living/carbon/target, shove_blocked) SIGNAL_HANDLER diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm index 40e719a950b..b2185ae7b60 100644 --- a/code/modules/recycling/disposal/construction.dm +++ b/code/modules/recycling/disposal/construction.dm @@ -33,7 +33,7 @@ pipename = initial(pipe_type.name) - AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, .proc/AfterRotation)) + AddComponent(/datum/component/simple_rotation, AfterRotation = CALLBACK(src, PROC_REF(AfterRotation))) AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) if(flip) diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index 229894ce352..393d0a25dc7 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -36,7 +36,7 @@ if(M.client) M.reset_perspective(src) hasmob = TRUE - RegisterSignal(M, COMSIG_LIVING_RESIST, .proc/struggle_prep, M) + RegisterSignal(M, COMSIG_LIVING_RESIST, PROC_REF(struggle_prep), M) //Checks 1 contents level deep. This means that players can be sent through disposals mail... //...but it should require a second person to open the package. (i.e. person inside a wrapped locker) @@ -75,9 +75,9 @@ var/delay = world.tick_lag var/datum/move_loop/our_loop = SSmove_manager.move_disposals(src, delay = delay, timeout = delay * count) if(our_loop) - RegisterSignal(our_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, .proc/pre_move) - RegisterSignal(our_loop, COMSIG_MOVELOOP_POSTPROCESS, .proc/try_expel) - RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, .proc/movement_stop) + RegisterSignal(our_loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(pre_move)) + RegisterSignal(our_loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(try_expel)) + RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, PROC_REF(movement_stop)) current_pipe = loc /obj/structure/disposalholder/proc/pre_move(datum/move_loop/source) @@ -109,7 +109,7 @@ if(escapee.loc != src) UnregisterSignal(escapee, COMSIG_LIVING_RESIST) return //Somehow they got out without telling us - INVOKE_ASYNC(src, .proc/struggle_free, escapee) + INVOKE_ASYNC(src, PROC_REF(struggle_free), escapee) /** * Completes the struggle code diff --git a/code/modules/recycling/disposal/outlet.dm b/code/modules/recycling/disposal/outlet.dm index 47b4a2297d7..43af5d69bee 100644 --- a/code/modules/recycling/disposal/outlet.dm +++ b/code/modules/recycling/disposal/outlet.dm @@ -56,9 +56,9 @@ if((start_eject + 30) < world.time) start_eject = world.time playsound(src, 'sound/machines/warning-buzzer.ogg', 50, FALSE, FALSE) - addtimer(CALLBACK(src, .proc/expel_holder, H, TRUE), 20) + addtimer(CALLBACK(src, PROC_REF(expel_holder), H, TRUE), 20) else - addtimer(CALLBACK(src, .proc/expel_holder, H), 20) + addtimer(CALLBACK(src, PROC_REF(expel_holder), H), 20) /obj/structure/disposaloutlet/proc/expel_holder(obj/structure/disposalholder/H, playsound=FALSE) if(playsound) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index e14d519fc1c..17aaa39e385 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -8,7 +8,7 @@ /obj/item/delivery/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, .proc/disposal_handling) + RegisterSignal(src, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposal_handling)) /** * Initial check if manually unwrapping diff --git a/code/modules/religion/religion_structures.dm b/code/modules/religion/religion_structures.dm index 0674a840e25..73238675619 100644 --- a/code/modules/religion/religion_structures.dm +++ b/code/modules/religion/religion_structures.dm @@ -14,7 +14,7 @@ /obj/structure/altar_of_gods/Initialize(mapload) . = ..() - AddComponent(/datum/component/religious_tool, ALL, FALSE, CALLBACK(src, .proc/reflect_sect_in_icons)) + AddComponent(/datum/component/religious_tool, ALL, FALSE, CALLBACK(src, PROC_REF(reflect_sect_in_icons))) reflect_sect_in_icons() GLOB.chaplain_altars += src AddElement(/datum/element/climbable) @@ -94,7 +94,7 @@ AddComponent(/datum/component/anti_magic, \ antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY, \ charges = 1, \ - expiration = CALLBACK(src, .proc/expire), \ + expiration = CALLBACK(src, PROC_REF(expire)), \ ) AddComponent(/datum/component/religious_tool, RELIGION_TOOL_INVOKE, FALSE) diff --git a/code/modules/religion/rites.dm b/code/modules/religion/rites.dm index d6f16b9f7f7..e3e5801fda3 100644 --- a/code/modules/religion/rites.dm +++ b/code/modules/religion/rites.dm @@ -347,7 +347,7 @@ to_chat(user, span_warning("Wait for them to decide on whether to join or not!")) return FALSE if(!(possible_crusader in sect.possible_crusaders)) - INVOKE_ASYNC(sect, /datum/religion_sect/honorbound.proc/invite_crusader, possible_crusader) + INVOKE_ASYNC(sect, TYPE_PROC_REF(/datum/religion_sect/honorbound, invite_crusader), possible_crusader) to_chat(user, span_notice("They have been given the option to consider joining the crusade against evil. Wait for them to decide and try again.")) return FALSE new_crusader = possible_crusader diff --git a/code/modules/religion/sparring/ceremonial_gear.dm b/code/modules/religion/sparring/ceremonial_gear.dm index a30bd41308c..2bab8e92310 100644 --- a/code/modules/religion/sparring/ceremonial_gear.dm +++ b/code/modules/religion/sparring/ceremonial_gear.dm @@ -32,7 +32,7 @@ speed = 4 SECONDS, \ effectiveness = 105, \ ) - RegisterSignal(src, COMSIG_ITEM_SHARPEN_ACT, .proc/block_sharpening) + RegisterSignal(src, COMSIG_ITEM_SHARPEN_ACT, PROC_REF(block_sharpening)) /obj/item/ceremonial_blade/melee_attack_chain(mob/user, atom/target, params) if(!HAS_TRAIT(target, TRAIT_SPARRING)) diff --git a/code/modules/religion/sparring/sparring_datum.dm b/code/modules/religion/sparring/sparring_datum.dm index 904d64f25d0..12ff983e3d0 100644 --- a/code/modules/religion/sparring/sparring_datum.dm +++ b/code/modules/religion/sparring/sparring_datum.dm @@ -33,26 +33,26 @@ /datum/sparring_match/proc/hook_signals(mob/living/carbon/human/sparring) //weapon conditions if(weapons_condition < CONDITION_ANY_WEAPON) - RegisterSignal(sparring, COMSIG_MOB_FIRED_GUN, .proc/gun_violation) - RegisterSignal(sparring, COMSIG_MOB_GRENADE_ARMED, .proc/grenade_violation) + RegisterSignal(sparring, COMSIG_MOB_FIRED_GUN, PROC_REF(gun_violation)) + RegisterSignal(sparring, COMSIG_MOB_GRENADE_ARMED, PROC_REF(grenade_violation)) if(weapons_condition <= CONDITION_CEREMONIAL_ONLY) - RegisterSignal(sparring, COMSIG_PARENT_ATTACKBY, .proc/melee_violation) + RegisterSignal(sparring, COMSIG_PARENT_ATTACKBY, PROC_REF(melee_violation)) //arena conditions - RegisterSignal(sparring, COMSIG_MOVABLE_MOVED, .proc/arena_violation) + RegisterSignal(sparring, COMSIG_MOVABLE_MOVED, PROC_REF(arena_violation)) //severe violations (insta violation win for other party) conditions - RegisterSignal(sparring, COMSIG_MOVABLE_POST_TELEPORT, .proc/teleport_violation) + RegisterSignal(sparring, COMSIG_MOVABLE_POST_TELEPORT, PROC_REF(teleport_violation)) //win conditions - RegisterSignal(sparring, COMSIG_MOB_STATCHANGE, .proc/check_for_victory) + RegisterSignal(sparring, COMSIG_MOB_STATCHANGE, PROC_REF(check_for_victory)) //flub conditions - RegisterSignal(sparring, COMSIG_PARENT_ATTACKBY, .proc/outsider_interference, override = TRUE) - RegisterSignal(sparring, COMSIG_ATOM_HULK_ATTACK, .proc/hulk_interference, override = TRUE) - RegisterSignal(sparring, COMSIG_ATOM_ATTACK_HAND, .proc/hand_interference, override = TRUE) - RegisterSignal(sparring, COMSIG_ATOM_ATTACK_PAW, .proc/paw_interference, override = TRUE) - RegisterSignal(sparring, COMSIG_ATOM_HITBY, .proc/thrown_interference, override = TRUE) - RegisterSignal(sparring, COMSIG_ATOM_BULLET_ACT, .proc/projectile_interference, override = TRUE) + RegisterSignal(sparring, COMSIG_PARENT_ATTACKBY, PROC_REF(outsider_interference), override = TRUE) + RegisterSignal(sparring, COMSIG_ATOM_HULK_ATTACK, PROC_REF(hulk_interference), override = TRUE) + RegisterSignal(sparring, COMSIG_ATOM_ATTACK_HAND, PROC_REF(hand_interference), override = TRUE) + RegisterSignal(sparring, COMSIG_ATOM_ATTACK_PAW, PROC_REF(paw_interference), override = TRUE) + RegisterSignal(sparring, COMSIG_ATOM_HITBY, PROC_REF(thrown_interference), override = TRUE) + RegisterSignal(sparring, COMSIG_ATOM_BULLET_ACT, PROC_REF(projectile_interference), override = TRUE) //severe flubs (insta match ender, no winners) conditions - RegisterSignal(sparring, COMSIG_LIVING_DEATH, .proc/death_flub) - RegisterSignal(sparring, COMSIG_PARENT_QDELETING, .proc/deletion_flub) + RegisterSignal(sparring, COMSIG_LIVING_DEATH, PROC_REF(death_flub)) + RegisterSignal(sparring, COMSIG_PARENT_QDELETING, PROC_REF(deletion_flub)) /datum/sparring_match/proc/unhook_signals(mob/living/carbon/human/sparring) if(!sparring) @@ -91,14 +91,14 @@ SIGNAL_HANDLER if(attacker == chaplain || attacker == opponent) return - INVOKE_ASYNC(src, .proc/flub, attacker) + INVOKE_ASYNC(src, PROC_REF(flub), attacker) /datum/sparring_match/proc/hulk_interference(datum/source, mob/attacker) SIGNAL_HANDLER if((attacker == chaplain || attacker == opponent)) // fist fighting a hulk is so dumb. i can't fathom why you would do this. return - INVOKE_ASYNC(src, .proc/flub, attacker) + INVOKE_ASYNC(src, PROC_REF(flub), attacker) /datum/sparring_match/proc/hand_interference(datum/source, mob/living/attacker) SIGNAL_HANDLER @@ -106,7 +106,7 @@ //you can pretty much always use fists as a participant return - INVOKE_ASYNC(src, .proc/flub, attacker) + INVOKE_ASYNC(src, PROC_REF(flub), attacker) /datum/sparring_match/proc/paw_interference(datum/source, mob/living/attacker) SIGNAL_HANDLER @@ -115,7 +115,7 @@ //you can pretty much always use paws as a participant return - INVOKE_ASYNC(src, .proc/flub, attacker) + INVOKE_ASYNC(src, PROC_REF(flub), attacker) /datum/sparring_match/proc/thrown_interference(datum/source, atom/movable/thrown_movable, skipcatch = FALSE, hitpush = TRUE, blocked = FALSE, datum/thrownthing/throwingdatum) SIGNAL_HANDLER @@ -124,7 +124,7 @@ var/obj/item/thrown_item = thrown_movable var/mob/thrown_by = thrown_item.thrownby?.resolve() if(thrown_item.throwforce < honorbound.health && ishuman(thrown_by)) - INVOKE_ASYNC(src, .proc/flub, thrown_by) + INVOKE_ASYNC(src, PROC_REF(flub), thrown_by) /datum/sparring_match/proc/projectile_interference(datum/participant, obj/projectile/proj) SIGNAL_HANDLER @@ -134,7 +134,7 @@ var/mob/living/interfering if(isliving(proj.firer)) interfering = proj.firer - INVOKE_ASYNC(src, .proc/flub, interfering) + INVOKE_ASYNC(src, PROC_REF(flub), interfering) ///someone randomly fucking died /datum/sparring_match/proc/death_flub(datum/deceased) diff --git a/code/modules/research/anomaly/anomaly_refinery.dm b/code/modules/research/anomaly/anomaly_refinery.dm index 5d70b73af31..21370f92695 100644 --- a/code/modules/research/anomaly/anomaly_refinery.dm +++ b/code/modules/research/anomaly/anomaly_refinery.dm @@ -40,7 +40,7 @@ /obj/machinery/research/anomaly_refinery/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, .proc/check_test) + RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, PROC_REF(check_test)) /obj/machinery/research/anomaly_refinery/examine_more(mob/user) . = ..() @@ -156,11 +156,11 @@ if (obj_flags & EMAGGED) say("ERROR: An firmware issue was detected while starting a process. Running autopatcher.") playsound(src, 'sound/machines/ding.ogg', 50, vary = TRUE) - addtimer(CALLBACK(src, .proc/error_test), 2 SECONDS, TIMER_STOPPABLE | TIMER_UNIQUE | TIMER_NO_HASH_WAIT) // Synced with the sound. + addtimer(CALLBACK(src, PROC_REF(error_test)), 2 SECONDS, TIMER_STOPPABLE | TIMER_UNIQUE | TIMER_NO_HASH_WAIT) // Synced with the sound. return inserted_bomb.toggle_valve(tank_to_target) - timeout_timer = addtimer(CALLBACK(src, .proc/timeout_test), COMPRESSION_TEST_TIME, TIMER_STOPPABLE | TIMER_UNIQUE | TIMER_NO_HASH_WAIT) + timeout_timer = addtimer(CALLBACK(src, PROC_REF(timeout_test)), COMPRESSION_TEST_TIME, TIMER_STOPPABLE | TIMER_UNIQUE | TIMER_NO_HASH_WAIT) return /** @@ -175,7 +175,7 @@ say("Issue resolved. Have a nice day!") inserted_bomb.toggle_valve(tank_to_target) eject_bomb(force = TRUE) - timeout_timer = addtimer(CALLBACK(src, .proc/timeout_test), COMPRESSION_TEST_TIME, TIMER_STOPPABLE | TIMER_UNIQUE | TIMER_NO_HASH_WAIT) // Actually start the test so they can't just put the bomb back in. + timeout_timer = addtimer(CALLBACK(src, PROC_REF(timeout_test)), COMPRESSION_TEST_TIME, TIMER_STOPPABLE | TIMER_UNIQUE | TIMER_NO_HASH_WAIT) // Actually start the test so they can't just put the bomb back in. /** * Ends a compression test. diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 7827913008b..200576794a5 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -38,7 +38,7 @@ Note: Must be placed within 3 tiles of the R&D Console loaded_item = O to_chat(user, span_notice("You add the [O.name] to the [src.name]!")) flick("d_analyzer_la", src) - addtimer(CALLBACK(src, .proc/finish_loading), 10) + addtimer(CALLBACK(src, PROC_REF(finish_loading)), 10) updateUsrDialog() /obj/machinery/rnd/destructive_analyzer/proc/finish_loading() @@ -55,7 +55,7 @@ Note: Must be placed within 3 tiles of the R&D Console if(!innermode) flick("d_analyzer_process", src) busy = TRUE - addtimer(CALLBACK(src, .proc/reset_busy), 24) + addtimer(CALLBACK(src, PROC_REF(reset_busy)), 24) use_power(250) if(thing == loaded_item) loaded_item = null diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index 9fdf3c1d9c2..dab219eb816 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -512,12 +512,12 @@ investigate_log("Experimentor has drained power from its APC", INVESTIGATE_EXPERIMENTOR) if(globalMalf == 99) visible_message(span_warning("[src] begins to glow and vibrate. It's going to blow!")) - addtimer(CALLBACK(src, .proc/boom), 50) + addtimer(CALLBACK(src, PROC_REF(boom)), 50) if(globalMalf == 100) visible_message(span_warning("[src] begins to glow and vibrate. It's going to blow!")) - addtimer(CALLBACK(src, .proc/honk), 50) + addtimer(CALLBACK(src, PROC_REF(honk)), 50) - addtimer(CALLBACK(src, .proc/reset_exp), resetTime) + addtimer(CALLBACK(src, PROC_REF(reset_exp)), resetTime) /obj/machinery/rnd/experimentor/proc/boom() explosion(src, devastation_range = 1, heavy_impact_range = 5, light_impact_range = 10, flash_range = 5, adminlog = TRUE) @@ -580,7 +580,7 @@ revealed = TRUE name = realName reset_timer = rand(reset_timer, reset_timer * 5) - realProc = pick(.proc/teleport,.proc/explode,.proc/rapidDupe,.proc/petSpray,.proc/flash,.proc/clean,.proc/corgicannon) + realProc = pick(PROC_REF(teleport), PROC_REF(explode), PROC_REF(rapidDupe), PROC_REF(petSpray), PROC_REF(flash), PROC_REF(clean), PROC_REF(corgicannon)) /obj/item/relic/attack_self(mob/user) if(!revealed) @@ -604,7 +604,7 @@ /obj/item/relic/proc/corgicannon(mob/user) playsound(src, SFX_SPARKS, rand(25,50), TRUE, SHORT_RANGE_SOUND_EXTRARANGE) var/mob/living/simple_animal/pet/dog/corgi/C = new/mob/living/simple_animal/pet/dog/corgi(get_turf(user)) - C.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, .proc/throwSmoke, C)) + C.throw_at(pick(oview(10,user)), 10, rand(3,8), callback = CALLBACK(src, PROC_REF(throwSmoke), C)) warn_admins(user, "Corgi Cannon", 0) /obj/item/relic/proc/clean(mob/user) @@ -666,7 +666,7 @@ /obj/item/relic/proc/explode(mob/user) to_chat(user, span_danger("[src] begins to heat up!")) - addtimer(CALLBACK(src, .proc/do_explode, user), rand(35, 100)) + addtimer(CALLBACK(src, PROC_REF(do_explode), user), rand(35, 100)) /obj/item/relic/proc/do_explode(mob/user) if(loc == user) @@ -677,7 +677,7 @@ /obj/item/relic/proc/teleport(mob/user) to_chat(user, span_notice("[src] begins to vibrate!")) - addtimer(CALLBACK(src, .proc/do_the_teleport, user), rand(10, 30)) + addtimer(CALLBACK(src, PROC_REF(do_the_teleport), user), rand(10, 30)) /obj/item/relic/proc/do_the_teleport(mob/user) var/turf/userturf = get_turf(user) diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index f7667d364e5..1b9e93580b5 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -46,7 +46,7 @@ RegisterSignal( stored_research, list(COMSIG_TECHWEB_ADD_DESIGN, COMSIG_TECHWEB_REMOVE_DESIGN), - .proc/on_techweb_update + PROC_REF(on_techweb_update) ) /obj/machinery/rnd/production/Destroy() @@ -59,7 +59,7 @@ // We're probably going to get more than one update (design) at a time, so batch // them together. - addtimer(CALLBACK(src, .proc/update_designs), 2 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(update_designs)), 2 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) /// Updates the list of designs this fabricator can print. /obj/machinery/rnd/production/proc/update_designs() @@ -314,8 +314,8 @@ var/time_coefficient = design.lathe_time_factor * efficiency_coeff - addtimer(CALLBACK(src, .proc/reset_busy), (30 * time_coefficient * print_quantity) ** 0.5) - addtimer(CALLBACK(src, .proc/do_print, design.build_path, print_quantity, efficient_mats, design.dangerous_construction), (32 * time_coefficient * print_quantity) ** 0.8) + addtimer(CALLBACK(src, PROC_REF(reset_busy)), (30 * time_coefficient * print_quantity) ** 0.5) + addtimer(CALLBACK(src, PROC_REF(do_print), design.build_path, print_quantity, efficient_mats, design.dangerous_construction), (32 * time_coefficient * print_quantity) ** 0.8) return TRUE diff --git a/code/modules/research/ordnance/doppler_array.dm b/code/modules/research/ordnance/doppler_array.dm index e4662d60214..ad5bcb153ee 100644 --- a/code/modules/research/ordnance/doppler_array.dm +++ b/code/modules/research/ordnance/doppler_array.dm @@ -25,9 +25,9 @@ /obj/machinery/doppler_array/Initialize(mapload) . = ..() - RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, .proc/sense_explosion) - RegisterSignal(src, COMSIG_MACHINERY_POWER_LOST, .proc/update_doppler_light) - RegisterSignal(src, COMSIG_MACHINERY_POWER_RESTORED, .proc/update_doppler_light) + RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion)) + RegisterSignal(src, COMSIG_MACHINERY_POWER_LOST, PROC_REF(update_doppler_light)) + RegisterSignal(src, COMSIG_MACHINERY_POWER_RESTORED, PROC_REF(update_doppler_light)) update_doppler_light() // Rotation determines the detectable direction. diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm index 97d52d03931..51f8e79125b 100644 --- a/code/modules/research/ordnance/tank_compressor.dm +++ b/code/modules/research/ordnance/tank_compressor.dm @@ -28,7 +28,7 @@ leaked_gas_buffer = new(200) compressor_record = list() - RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, .proc/explosion_handle) + RegisterSignal(src, COMSIG_ATOM_INTERNAL_EXPLOSION, PROC_REF(explosion_handle)) /obj/machinery/atmospherics/components/binary/tank_compressor/examine() . = ..() @@ -58,7 +58,7 @@ return ..() inserted_tank = tank_item last_recorded_pressure = 0 - RegisterSignal(inserted_tank, COMSIG_PARENT_QDELETING, .proc/tank_destruction) + RegisterSignal(inserted_tank, COMSIG_PARENT_QDELETING, PROC_REF(tank_destruction)) update_appearance() return if(istype(item, /obj/item/computer_disk)) diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index be044e954da..0206c4b35ed 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -65,7 +65,7 @@ if(. & EMP_PROTECT_SELF) return set_machine_stat(machine_stat | EMPED) - addtimer(CALLBACK(src, .proc/fix_emp), 60 SECONDS) + addtimer(CALLBACK(src, PROC_REF(fix_emp)), 60 SECONDS) refresh_working() /// Callback to un-emp the server afetr some time. diff --git a/code/modules/research/stock_parts.dm b/code/modules/research/stock_parts.dm index 1f93970109d..9d2f304122f 100644 --- a/code/modules/research/stock_parts.dm +++ b/code/modules/research/stock_parts.dm @@ -97,8 +97,8 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good atom_storage.max_total_storage = 800 atom_storage.max_specific_storage = WEIGHT_CLASS_GIGANTIC - RegisterSignal(src, COMSIG_ATOM_ENTERED, .proc/on_part_entered) - RegisterSignal(src, COMSIG_ATOM_EXITED, .proc/on_part_exited) + RegisterSignal(src, COMSIG_ATOM_ENTERED, PROC_REF(on_part_entered)) + RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_part_exited)) /** * Signal handler for when a part has been inserted into the BRPED. @@ -115,7 +115,7 @@ If you create T5+ please take a pass at mech_fabricator.dm. The parts being good if(length(inserted_component.reagents.reagent_list)) inserted_component.reagents.clear_reagents() to_chat(usr, span_notice("[src] churns as [inserted_component] has its reagents emptied into bluespace.")) - RegisterSignal(inserted_component.reagents, COMSIG_REAGENTS_PRE_ADD_REAGENT, .proc/on_insered_component_reagent_pre_add) + RegisterSignal(inserted_component.reagents, COMSIG_REAGENTS_PRE_ADD_REAGENT, PROC_REF(on_insered_component_reagent_pre_add)) if(!istype(inserted_component, /obj/item/stock_parts/cell)) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 74f4274e5ab..392859fe4cd 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -2230,7 +2230,7 @@ /datum/techweb_node/syndicate_basic/New() //Crappy way of making syndicate gear decon supported until there's another way. . = ..() if(!SSearly_assets.initialized) - RegisterSignal(SSearly_assets, COMSIG_SUBSYSTEM_POST_INITIALIZE, .proc/register_uplink_items) + RegisterSignal(SSearly_assets, COMSIG_SUBSYSTEM_POST_INITIALIZE, PROC_REF(register_uplink_items)) else register_uplink_items() diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index d3b79793b9f..f96398ed7a4 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -67,7 +67,7 @@ var/icon/bluespace /datum/status_effect/slimerecall/on_apply() - RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/resistField) + RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(resistField)) to_chat(owner, span_danger("You feel a sudden tug from an unknown force, and feel a pull to bluespace!")) to_chat(owner, span_notice("Resist if you wish avoid the force!")) bluespace = icon('icons/effects/effects.dmi',"chronofield") @@ -101,7 +101,7 @@ var/obj/structure/ice_stasis/cube /datum/status_effect/frozenstasis/on_apply() - RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/breakCube) + RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(breakCube)) cube = new /obj/structure/ice_stasis(get_turf(owner)) owner.forceMove(cube) owner.status_flags |= GODMODE @@ -915,7 +915,7 @@ var/datum/weakref/draining_ref /datum/status_effect/stabilized/black/on_apply() - RegisterSignal(owner, COMSIG_MOVABLE_SET_GRAB_STATE, .proc/on_grab) + RegisterSignal(owner, COMSIG_MOVABLE_SET_GRAB_STATE, PROC_REF(on_grab)) return ..() /datum/status_effect/stabilized/black/on_remove() diff --git a/code/modules/research/xenobiology/crossbreeding/burning.dm b/code/modules/research/xenobiology/crossbreeding/burning.dm index 66139bfa31b..14d2f980eb4 100644 --- a/code/modules/research/xenobiology/crossbreeding/burning.dm +++ b/code/modules/research/xenobiology/crossbreeding/burning.dm @@ -260,7 +260,7 @@ Burning extracts: /obj/item/slimecross/burning/oil/do_effect(mob/user) user.visible_message(span_warning("[user] activates [src]. It's going to explode!"), span_danger("You activate [src]. It crackles in anticipation")) - addtimer(CALLBACK(src, .proc/boom), 50) + addtimer(CALLBACK(src, PROC_REF(boom)), 50) /// Inflicts a blastwave upon every mob within a small radius. /obj/item/slimecross/burning/oil/proc/boom() diff --git a/code/modules/research/xenobiology/crossbreeding/charged.dm b/code/modules/research/xenobiology/crossbreeding/charged.dm index b68fc67f24b..8561ebe04af 100644 --- a/code/modules/research/xenobiology/crossbreeding/charged.dm +++ b/code/modules/research/xenobiology/crossbreeding/charged.dm @@ -199,7 +199,7 @@ Charged extracts: /obj/item/slimecross/charged/gold/do_effect(mob/user) user.visible_message(span_warning("[src] starts shuddering violently!")) - addtimer(CALLBACK(src, .proc/startTimer), 50) + addtimer(CALLBACK(src, PROC_REF(startTimer)), 50) /obj/item/slimecross/charged/gold/proc/startTimer() START_PROCESSING(SSobj, src) @@ -224,7 +224,7 @@ Charged extracts: /obj/item/slimecross/charged/oil/do_effect(mob/user) user.visible_message(span_danger("[src] begins to shake with rapidly increasing force!")) - addtimer(CALLBACK(src, .proc/boom), 50) + addtimer(CALLBACK(src, PROC_REF(boom)), 50) /obj/item/slimecross/charged/oil/proc/boom() explosion(src, devastation_range = 2, heavy_impact_range = 3, light_impact_range = 4, explosion_cause = src) //Much smaller effect than normal oils, but devastatingly strong where it does hit. diff --git a/code/modules/research/xenobiology/crossbreeding/chilling.dm b/code/modules/research/xenobiology/crossbreeding/chilling.dm index 3015bfd6a79..378e4767bf1 100644 --- a/code/modules/research/xenobiology/crossbreeding/chilling.dm +++ b/code/modules/research/xenobiology/crossbreeding/chilling.dm @@ -287,7 +287,7 @@ Chilling extracts: /obj/item/slimecross/chilling/oil/do_effect(mob/user) user.visible_message(span_danger("[src] begins to shake with muted intensity!")) - addtimer(CALLBACK(src, .proc/boom), 50) + addtimer(CALLBACK(src, PROC_REF(boom)), 50) /obj/item/slimecross/chilling/oil/proc/boom() explosion(src, devastation_range = -1, heavy_impact_range = -1, light_impact_range = 10, explosion_cause = src) //Large radius, but mostly light damage, and no flash. diff --git a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm index 6bead094b35..ab6f9381086 100644 --- a/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm +++ b/code/modules/research/xenobiology/crossbreeding/selfsustaining.dm @@ -32,7 +32,7 @@ Self-sustaining extracts: return ..() /obj/item/autoslime/attack_self(mob/user) - var/reagentselect = tgui_input_list(user, "Reagent the extract will produce.", "Self-sustaining Reaction", sort_list(extract.activate_reagents, /proc/cmp_typepaths_asc)) + var/reagentselect = tgui_input_list(user, "Reagent the extract will produce.", "Self-sustaining Reaction", sort_list(extract.activate_reagents, GLOBAL_PROC_REF(cmp_typepaths_asc))) if(isnull(reagentselect)) return var/amount = 5 diff --git a/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm b/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm index 176b4fc78e3..957e5aa0d93 100644 --- a/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm +++ b/code/modules/research/xenobiology/vatgrowing/biopsy_tool.dm @@ -9,7 +9,7 @@ ///Adds the swabbing component to the biopsy tool /obj/item/biopsy_tool/Initialize(mapload) . = ..() - AddComponent(/datum/component/swabbing, FALSE, FALSE, TRUE, CALLBACK(src, .proc/update_swab_icon), max_items = 1) + AddComponent(/datum/component/swabbing, FALSE, FALSE, TRUE, CALLBACK(src, PROC_REF(update_swab_icon)), max_items = 1) /obj/item/biopsy_tool/proc/update_swab_icon(list/swabbed_items) diff --git a/code/modules/research/xenobiology/vatgrowing/swab.dm b/code/modules/research/xenobiology/vatgrowing/swab.dm index ab9b83ad965..92dd767ea16 100644 --- a/code/modules/research/xenobiology/vatgrowing/swab.dm +++ b/code/modules/research/xenobiology/vatgrowing/swab.dm @@ -9,7 +9,7 @@ ///Adds the swabbing component to the biopsy tool /obj/item/swab/Initialize(mapload) . = ..() - AddComponent(/datum/component/swabbing, TRUE, TRUE, FALSE, null, CALLBACK(src, .proc/update_swab_icon), max_items = 1) + AddComponent(/datum/component/swabbing, TRUE, TRUE, FALSE, null, CALLBACK(src, PROC_REF(update_swab_icon)), max_items = 1) /obj/item/swab/proc/update_swab_icon(overlays, list/swabbed_items) if(LAZYLEN(swabbed_items)) diff --git a/code/modules/research/xenobiology/vatgrowing/vatgrower.dm b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm index 25160b7e5ce..f770a179146 100644 --- a/code/modules/research/xenobiology/vatgrowing/vatgrower.dm +++ b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm @@ -16,8 +16,8 @@ /obj/machinery/plumbing/growing_vat/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/machinery/plumbing/growing_vat/proc/on_reagents_del(datum/reagents/reagents) @@ -62,7 +62,7 @@ to_chat(user, span_warning("You put some of the sample in the vat!")) playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE) update_appearance() - RegisterSignal(biological_sample, COMSIG_SAMPLE_GROWTH_COMPLETED, .proc/on_sample_growth_completed) + RegisterSignal(biological_sample, COMSIG_SAMPLE_GROWTH_COMPLETED, PROC_REF(on_sample_growth_completed)) ///Adds text for when there is a sample in the vat /obj/machinery/plumbing/growing_vat/examine_more(mob/user) @@ -131,7 +131,7 @@ /obj/machinery/plumbing/growing_vat/proc/on_sample_growth_completed() SIGNAL_HANDLER if(resampler_active) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, get_turf(src), 'sound/effects/servostep.ogg', 100, 1), 1.5 SECONDS) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), get_turf(src), 'sound/effects/servostep.ogg', 100, 1), 1.5 SECONDS) biological_sample.reset_sample() return SPARE_SAMPLE UnregisterSignal(biological_sample, COMSIG_SAMPLE_GROWTH_COMPLETED) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 751e6499acf..8e5e419a10e 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -85,12 +85,12 @@ /obj/machinery/computer/camera_advanced/xenobio/GrantActions(mob/living/user) ..() - RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, .proc/XenoSlimeClickCtrl) - RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, .proc/XenoTurfClickCtrl) - RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, .proc/XenoMonkeyClickCtrl) - RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, .proc/XenoSlimeClickAlt) - RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, .proc/XenoSlimeClickShift) - RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, .proc/XenoTurfClickShift) + RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, PROC_REF(XenoSlimeClickCtrl)) + RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, PROC_REF(XenoTurfClickCtrl)) + RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, PROC_REF(XenoMonkeyClickCtrl)) + RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, PROC_REF(XenoSlimeClickAlt)) + RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, PROC_REF(XenoSlimeClickShift)) + RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, PROC_REF(XenoTurfClickShift)) //Checks for recycler on every interact, prevents issues with load order on certain maps. if(!connected_recycler) @@ -362,7 +362,7 @@ to_chat(C, span_warning("No potion loaded.")) return if(mobarea.name == E.allowed_area || (mobarea.area_flags & XENOBIOLOGY_COMPATIBLE)) - INVOKE_ASYNC(X.current_potion, /obj/item/slimepotion/slime.proc/attack, S, C) + INVOKE_ASYNC(X.current_potion, TYPE_PROC_REF(/obj/item/slimepotion/slime, attack), S, C) //Picks up slime /obj/machinery/computer/camera_advanced/xenobio/proc/XenoSlimeClickShift(mob/living/user, mob/living/simple_animal/slime/S) diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 3fb1d477b3c..c270756d7bf 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -270,7 +270,7 @@ to_chat(user, span_warning("Your glow is already enhanced!")) return species.update_glow(user, 5) - addtimer(CALLBACK(species, /datum/species/jelly/luminescent.proc/update_glow, user, LUMINESCENT_DEFAULT_GLOW), 600) + addtimer(CALLBACK(species, TYPE_PROC_REF(/datum/species/jelly/luminescent, update_glow), user, LUMINESCENT_DEFAULT_GLOW), 600) to_chat(user, span_notice("You start glowing brighter.")) if(SLIME_ACTIVATE_MAJOR) @@ -478,7 +478,7 @@ return to_chat(user, span_notice("You feel your skin harden and become more resistant.")) species.armor += 25 - addtimer(CALLBACK(src, .proc/reset_armor, species), 1200) + addtimer(CALLBACK(src, PROC_REF(reset_armor), species), 1200) return 450 if(SLIME_ACTIVATE_MAJOR) diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index c53b5c528da..99d812ebf10 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -24,7 +24,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26) /obj/machinery/keycard_auth/Initialize(mapload) . = ..() - ev = GLOB.keycard_events.addEvent("triggerEvent", CALLBACK(src, .proc/triggerEvent)) + ev = GLOB.keycard_events.addEvent("triggerEvent", CALLBACK(src, PROC_REF(triggerEvent))) /obj/machinery/keycard_auth/Destroy() GLOB.keycard_events.clearEvent("triggerEvent", ev) @@ -112,7 +112,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26) event = event_type waiting = TRUE GLOB.keycard_events.fireEvent("triggerEvent", src) - addtimer(CALLBACK(src, .proc/eventSent), 20) + addtimer(CALLBACK(src, PROC_REF(eventSent)), 20) /obj/machinery/keycard_auth/proc/eventSent() triggerer = null @@ -122,7 +122,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/keycard_auth, 26) /obj/machinery/keycard_auth/proc/triggerEvent(source) event_source = source update_appearance() - addtimer(CALLBACK(src, .proc/eventTriggered), 20) + addtimer(CALLBACK(src, PROC_REF(eventTriggered)), 20) /obj/machinery/keycard_auth/proc/eventTriggered() event_source = null diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 739aa6c05fc..6978a7286df 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -207,7 +207,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, GLOBAL_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 258572e94c9..3d5b6196ff6 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -105,7 +105,7 @@ return var/old_len = authorized.len - addtimer(CALLBACK(src, .proc/clear_recent_action, user), SHUTTLE_CONSOLE_ACTION_DELAY) + addtimer(CALLBACK(src, PROC_REF(clear_recent_action), user), SHUTTLE_CONSOLE_ACTION_DELAY) switch(action) if("authorize") @@ -504,8 +504,8 @@ mode = SHUTTLE_ESCAPE launch_status = ENDGAME_LAUNCHED setTimer(SSshuttle.emergency_escape_time * engine_coeff) - priority_announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.", null, ANNOUNCER_SHUTTLELEFT, "Priority") //SKYRAT EDIT CHANGE - ANNOUNCER_SHUTTLELEFT - INVOKE_ASYNC(SSticker, /datum/controller/subsystem/ticker.proc/poll_hearts) + priority_announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.", null, ANNOUNCER_SHUTTLELEFT, "Priority") + INVOKE_ASYNC(SSticker, TYPE_PROC_REF(/datum/controller/subsystem/ticker, poll_hearts)) bolt_all_doors() //SKYRAT EDIT ADDITION SSmapping.mapvote() //If no map vote has been run yet, start one. @@ -551,7 +551,7 @@ dock_id(destination_dock) unbolt_all_doors() //SKYRAT EDIT ADDITION - INVOKE_ASYNC(GLOBAL_PROC, /proc/process_eorg_bans) //SKYRAT EDIT ADDITION + INVOKE_ASYNC(GLOBAL_PROC, GLOBAL_PROC_REF(process_eorg_bans)) //SKYRAT EDIT ADDITION mode = SHUTTLE_ENDGAME timer = 0 @@ -599,7 +599,7 @@ /obj/machinery/computer/shuttle/pod/Initialize(mapload) AddElement(/datum/element/update_icon_blocker) . = ..() - 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/emag_act(mob/user) if(obj_flags & EMAGGED) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index b4d9d2a6041..e6ed746d248 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -202,7 +202,7 @@ All ShuttleMove procs go here for(var/obj/machinery/door/airlock/other_airlock in range(2, src)) // includes src, extended because some escape pods have 1 plating turf exposed to space other_airlock.shuttledocked = FALSE other_airlock.air_tight = TRUE - INVOKE_ASYNC(other_airlock, /obj/machinery/door/.proc/close, FALSE, TRUE) // force crush + INVOKE_ASYNC(other_airlock, TYPE_PROC_REF(/obj/machinery/door/, close), FALSE, TRUE) // force crush /obj/machinery/door/airlock/afterShuttleMove(turf/oldT, list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation) . = ..() diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm index d69bce3de54..54426bc9ae0 100644 --- a/code/modules/shuttle/ripple.dm +++ b/code/modules/shuttle/ripple.dm @@ -15,7 +15,7 @@ /obj/effect/abstract/ripple/Initialize(mapload, time_left) . = ..() animate(src, alpha=255, time=time_left) - addtimer(CALLBACK(src, .proc/stop_animation), 8, TIMER_CLIENT_TIME) + addtimer(CALLBACK(src, PROC_REF(stop_animation)), 8, TIMER_CLIENT_TIME) /obj/effect/abstract/ripple/proc/stop_animation() icon_state = "medi_holo_no_anim" diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index 37f8ca253f3..471d13b12e0 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -115,7 +115,7 @@ L.visible_message(span_revennotice("A strange purple glow wraps itself around [L] as [L.p_they()] suddenly fall[L.p_s()] unconscious."), span_revendanger("[desc]")) // Don't let them sit suround unconscious forever - addtimer(CALLBACK(src, .proc/sleeper_dreams, L), 100) + addtimer(CALLBACK(src, PROC_REF(sleeper_dreams), L), 100) // Existing sleepers for(var/i in found) @@ -170,7 +170,7 @@ . = ..() access_card.add_access(list(ACCESS_CENT_BAR)) become_area_sensitive(ROUNDSTART_TRAIT) - RegisterSignal(src, COMSIG_ENTER_AREA, .proc/check_barstaff_godmode) + RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(check_barstaff_godmode)) check_barstaff_godmode() /mob/living/simple_animal/hostile/alien/maid/barmaid @@ -193,7 +193,7 @@ ADD_TRAIT(access_card, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) become_area_sensitive(ROUNDSTART_TRAIT) - RegisterSignal(src, COMSIG_ENTER_AREA, .proc/check_barstaff_godmode) + RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(check_barstaff_godmode)) check_barstaff_godmode() /mob/living/simple_animal/hostile/alien/maid/barmaid/Destroy() @@ -221,7 +221,7 @@ /obj/structure/table/wood/shuttle_bar/Initialize(mapload, _buildstack) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm index b3f18fc1313..39dfd210c19 100644 --- a/code/modules/spells/spell.dm +++ b/code/modules/spells/spell.dm @@ -96,15 +96,15 @@ // Register some signals so our button's icon stays up to date if(spell_requirements & SPELL_REQUIRES_OFF_CENTCOM) - RegisterSignal(owner, COMSIG_MOVABLE_Z_CHANGED, .proc/update_icon_on_signal) + RegisterSignal(owner, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(update_icon_on_signal)) if(spell_requirements & (SPELL_REQUIRES_NO_ANTIMAGIC|SPELL_REQUIRES_WIZARD_GARB)) - RegisterSignal(owner, COMSIG_MOB_EQUIPPED_ITEM, .proc/update_icon_on_signal) + RegisterSignal(owner, COMSIG_MOB_EQUIPPED_ITEM, PROC_REF(update_icon_on_signal)) if(invocation_type == INVOCATION_EMOTE) - RegisterSignal(owner, list(SIGNAL_ADDTRAIT(TRAIT_EMOTEMUTE), SIGNAL_REMOVETRAIT(TRAIT_EMOTEMUTE)), .proc/update_icon_on_signal) + RegisterSignal(owner, list(SIGNAL_ADDTRAIT(TRAIT_EMOTEMUTE), SIGNAL_REMOVETRAIT(TRAIT_EMOTEMUTE)), PROC_REF(update_icon_on_signal)) if(invocation_type == INVOCATION_SHOUT || invocation_type == INVOCATION_WHISPER) - RegisterSignal(owner, list(SIGNAL_ADDTRAIT(TRAIT_MUTE), SIGNAL_REMOVETRAIT(TRAIT_MUTE)), .proc/update_icon_on_signal) + RegisterSignal(owner, list(SIGNAL_ADDTRAIT(TRAIT_MUTE), SIGNAL_REMOVETRAIT(TRAIT_MUTE)), PROC_REF(update_icon_on_signal)) - RegisterSignal(owner, list(COMSIG_MOB_ENTER_JAUNT, COMSIG_MOB_AFTER_EXIT_JAUNT), .proc/update_icon_on_signal) + RegisterSignal(owner, list(COMSIG_MOB_ENTER_JAUNT, COMSIG_MOB_AFTER_EXIT_JAUNT), PROC_REF(update_icon_on_signal)) owner.client?.stat_panel.send_message("check_spells") /datum/action/cooldown/spell/Remove(mob/living/remove_from) @@ -255,7 +255,7 @@ * * Returns a bitflag. * - SPELL_CANCEL_CAST will stop the spell from being cast. - * - SPELL_NO_FEEDBACK will prevent the spell from calling [proc/spell_feedback] on cast. (invocation, sounds) + * - SPELL_NO_FEEDBACK will prevent the spell from calling [proc/spell_feedback] on cast. (invocation), sounds) * - SPELL_NO_IMMEDIATE_COOLDOWN will prevent the spell from starting its cooldown between cast and before after_cast. */ /datum/action/cooldown/spell/proc/before_cast(atom/cast_on) diff --git a/code/modules/spells/spell_types/cone/_cone.dm b/code/modules/spells/spell_types/cone/_cone.dm index e1439be824d..e7a03426cd3 100644 --- a/code/modules/spells/spell_types/cone/_cone.dm +++ b/code/modules/spells/spell_types/cone/_cone.dm @@ -120,4 +120,4 @@ var/level_counter = 0 for(var/list/turf_list in cone_turfs) level_counter++ - addtimer(CALLBACK(src, .proc/do_cone_effects, turf_list, caster, level_counter), delay_between_level * level_counter) + addtimer(CALLBACK(src, PROC_REF(do_cone_effects), turf_list, caster, level_counter), delay_between_level * level_counter) diff --git a/code/modules/spells/spell_types/conjure_item/invisible_box.dm b/code/modules/spells/spell_types/conjure_item/invisible_box.dm index b3d55fd74d8..64e14179474 100644 --- a/code/modules/spells/spell_types/conjure_item/invisible_box.dm +++ b/code/modules/spells/spell_types/conjure_item/invisible_box.dm @@ -32,7 +32,7 @@ . = ..() var/obj/item/made_box = . made_box.alpha = 255 - addtimer(CALLBACK(src, .proc/cleanup_box, made_box), box_lifespan) + addtimer(CALLBACK(src, PROC_REF(cleanup_box), made_box), box_lifespan) /// Callback that gets rid out of box and removes the weakref from our list /datum/action/cooldown/spell/conjure_item/invisible_box/proc/cleanup_box(obj/item/storage/box/box) diff --git a/code/modules/spells/spell_types/jaunt/_jaunt.dm b/code/modules/spells/spell_types/jaunt/_jaunt.dm index fbbe1db7792..cd1c713b186 100644 --- a/code/modules/spells/spell_types/jaunt/_jaunt.dm +++ b/code/modules/spells/spell_types/jaunt/_jaunt.dm @@ -50,7 +50,7 @@ */ /datum/action/cooldown/spell/jaunt/proc/enter_jaunt(mob/living/jaunter, turf/loc_override) var/obj/effect/dummy/phased_mob/jaunt = new jaunt_type(loc_override || get_turf(jaunter), jaunter) - RegisterSignal(jaunt, COMSIG_MOB_EJECTED_FROM_JAUNT, .proc/on_jaunt_exited) + RegisterSignal(jaunt, COMSIG_MOB_EJECTED_FROM_JAUNT, PROC_REF(on_jaunt_exited)) spell_requirements |= SPELL_CASTABLE_WHILE_PHASED ADD_TRAIT(jaunter, TRAIT_MAGICALLY_PHASED, REF(src)) diff --git a/code/modules/spells/spell_types/jaunt/bloodcrawl.dm b/code/modules/spells/spell_types/jaunt/bloodcrawl.dm index 3031f73a0e6..84b6c11e9c5 100644 --- a/code/modules/spells/spell_types/jaunt/bloodcrawl.dm +++ b/code/modules/spells/spell_types/jaunt/bloodcrawl.dm @@ -23,7 +23,7 @@ /datum/action/cooldown/spell/jaunt/bloodcrawl/Grant(mob/grant_to) . = ..() - RegisterSignal(grant_to, COMSIG_MOVABLE_MOVED, .proc/update_icon_on_signal) + RegisterSignal(grant_to, COMSIG_MOVABLE_MOVED, PROC_REF(update_icon_on_signal)) /datum/action/cooldown/spell/jaunt/bloodcrawl/Remove(mob/remove_from) . = ..() @@ -87,7 +87,7 @@ jaunter.notransform = FALSE return FALSE - RegisterSignal(holder, COMSIG_MOVABLE_MOVED, .proc/update_icon_on_signal) + RegisterSignal(holder, COMSIG_MOVABLE_MOVED, PROC_REF(update_icon_on_signal)) if(equip_blood_hands && iscarbon(jaunter)) jaunter.drop_all_held_items() // Give them some bloody hands to prevent them from doing things @@ -148,7 +148,7 @@ exited.add_atom_colour(new_color, TEMPORARY_COLOUR_PRIORITY) // ...but only for a few seconds - addtimer(CALLBACK(exited, /atom/.proc/remove_atom_colour, TEMPORARY_COLOUR_PRIORITY, new_color), 6 SECONDS) + addtimer(CALLBACK(exited, TYPE_PROC_REF(/atom/, remove_atom_colour), TEMPORARY_COLOUR_PRIORITY, new_color), 6 SECONDS) /** * Slaughter demon's blood crawl @@ -202,7 +202,7 @@ /** * Consumes the [victim] from the [jaunter], fully healing them - * and calling [proc/on_victim_consumed] if successful. + * and calling [proc/on_victim_consumed] if successful.) */ /datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/proc/consume_victim(mob/living/victim, mob/living/jaunter) on_victim_start_consume(victim, jaunter) @@ -260,7 +260,7 @@ /datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/funny/Grant(mob/grant_to) . = ..() if(owner) - RegisterSignal(owner, COMSIG_LIVING_DEATH, .proc/on_death) + RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(on_death)) /datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/funny/Remove(mob/living/remove_from) UnregisterSignal(remove_from, COMSIG_LIVING_DEATH) @@ -272,8 +272,8 @@ /datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/funny/on_victim_consumed(mob/living/victim, mob/living/jaunter) to_chat(jaunter, span_clown("[victim] joins your party! Your health is fully restored.")) consumed_mobs += victim - RegisterSignal(victim, COMSIG_MOB_STATCHANGE, .proc/on_victim_statchange) - RegisterSignal(victim, COMSIG_PARENT_QDELETING, .proc/on_victim_deleted) + RegisterSignal(victim, COMSIG_MOB_STATCHANGE, PROC_REF(on_victim_statchange)) + RegisterSignal(victim, COMSIG_PARENT_QDELETING, PROC_REF(on_victim_deleted)) /** * Signal proc for COMSIG_LIVING_DEATH and COMSIG_PARENT_QDELETING diff --git a/code/modules/spells/spell_types/jaunt/ethereal_jaunt.dm b/code/modules/spells/spell_types/jaunt/ethereal_jaunt.dm index 2c89ba21c7f..2aafab3b1b7 100644 --- a/code/modules/spells/spell_types/jaunt/ethereal_jaunt.dm +++ b/code/modules/spells/spell_types/jaunt/ethereal_jaunt.dm @@ -58,7 +58,7 @@ if(jaunt_out_time > 0) ADD_TRAIT(cast_on, TRAIT_IMMOBILIZED, REF(src)) - addtimer(CALLBACK(src, .proc/do_jaunt_out, cast_on, holder), jaunt_out_time) + addtimer(CALLBACK(src, PROC_REF(do_jaunt_out), cast_on, holder), jaunt_out_time) else start_jaunt(cast_on, holder) @@ -87,8 +87,8 @@ return LAZYINITLIST(exit_point_list) - RegisterSignal(holder, COMSIG_MOVABLE_MOVED, .proc/update_exit_point, target) - addtimer(CALLBACK(src, .proc/stop_jaunt, cast_on, holder, get_turf(holder)), jaunt_duration) + RegisterSignal(holder, COMSIG_MOVABLE_MOVED, PROC_REF(update_exit_point), target) + addtimer(CALLBACK(src, PROC_REF(stop_jaunt), cast_on, holder, get_turf(holder)), jaunt_duration) /** * The stopping of the jaunt. @@ -137,7 +137,7 @@ if(2.5 SECONDS - jaunt_in_time <= 0) do_jaunt_in(cast_on, holder, found_exit) else - addtimer(CALLBACK(src, .proc/do_jaunt_in, cast_on, holder, found_exit), 2.5 SECONDS - jaunt_in_time) + addtimer(CALLBACK(src, PROC_REF(do_jaunt_in), cast_on, holder, found_exit), 2.5 SECONDS - jaunt_in_time) /** * The wind-up (wind-out?) of exiting the jaunt. @@ -153,7 +153,7 @@ cast_on.setDir(holder.dir) if(jaunt_in_time > 0) - addtimer(CALLBACK(src, .proc/end_jaunt, cast_on, holder, final_point), jaunt_in_time) + addtimer(CALLBACK(src, PROC_REF(end_jaunt), cast_on, holder, final_point), jaunt_in_time) else end_jaunt(cast_on, holder, final_point) diff --git a/code/modules/spells/spell_types/jaunt/shadow_walk.dm b/code/modules/spells/spell_types/jaunt/shadow_walk.dm index 99594b91c3d..7bd644aea28 100644 --- a/code/modules/spells/spell_types/jaunt/shadow_walk.dm +++ b/code/modules/spells/spell_types/jaunt/shadow_walk.dm @@ -10,7 +10,7 @@ /datum/action/cooldown/spell/jaunt/shadow_walk/Grant(mob/grant_to) . = ..() - RegisterSignal(grant_to, COMSIG_MOVABLE_MOVED, .proc/update_icon_on_signal) + RegisterSignal(grant_to, COMSIG_MOVABLE_MOVED, PROC_REF(update_icon_on_signal)) /datum/action/cooldown/spell/jaunt/shadow_walk/Remove(mob/remove_from) . = ..() diff --git a/code/modules/spells/spell_types/pointed/_pointed.dm b/code/modules/spells/spell_types/pointed/_pointed.dm index 21641752dd0..591d99e187f 100644 --- a/code/modules/spells/spell_types/pointed/_pointed.dm +++ b/code/modules/spells/spell_types/pointed/_pointed.dm @@ -168,7 +168,7 @@ to_fire.firer = owner to_fire.fired_from = src to_fire.preparePixelProjectile(target, owner) - RegisterSignal(to_fire, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/on_cast_hit) + RegisterSignal(to_fire, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(on_cast_hit)) if(istype(to_fire, /obj/projectile/magic)) var/obj/projectile/magic/magic_to_fire = to_fire diff --git a/code/modules/spells/spell_types/pointed/abyssal_gaze.dm b/code/modules/spells/spell_types/pointed/abyssal_gaze.dm index babaeb5bfbb..1a7243fce52 100644 --- a/code/modules/spells/spell_types/pointed/abyssal_gaze.dm +++ b/code/modules/spells/spell_types/pointed/abyssal_gaze.dm @@ -35,7 +35,7 @@ cast_on.playsound_local(get_turf(cast_on), 'sound/hallucinations/i_see_you1.ogg', 50, 1) owner.playsound_local(get_turf(owner), 'sound/effects/ghost2.ogg', 50, 1) cast_on.become_blind(ABYSSAL_GAZE_BLIND) - addtimer(CALLBACK(src, .proc/cure_blindness, cast_on), blind_duration) + addtimer(CALLBACK(src, PROC_REF(cure_blindness), cast_on), blind_duration) if(ishuman(cast_on)) var/mob/living/carbon/human/human_cast_on = cast_on human_cast_on.adjust_coretemperature(-amount_to_cool) diff --git a/code/modules/spells/spell_types/pointed/blind.dm b/code/modules/spells/spell_types/pointed/blind.dm index 2c01da24b6d..a6c14a72f7e 100644 --- a/code/modules/spells/spell_types/pointed/blind.dm +++ b/code/modules/spells/spell_types/pointed/blind.dm @@ -44,7 +44,7 @@ cast_on.blur_eyes(eye_blurry_amount) if(cast_on.dna && blind_mutation_duration > 0 SECONDS) cast_on.dna.add_mutation(/datum/mutation/human/blind) - addtimer(CALLBACK(src, .proc/fix_eyes, cast_on), blind_mutation_duration) + addtimer(CALLBACK(src, PROC_REF(fix_eyes), cast_on), blind_mutation_duration) return TRUE /datum/action/cooldown/spell/pointed/blind/proc/fix_eyes(mob/living/carbon/human/cast_on) diff --git a/code/modules/spells/spell_types/pointed/spell_cards.dm b/code/modules/spells/spell_types/pointed/spell_cards.dm index 4b6af520517..6f44f72afdf 100644 --- a/code/modules/spells/spell_types/pointed/spell_cards.dm +++ b/code/modules/spells/spell_types/pointed/spell_cards.dm @@ -47,7 +47,7 @@ range = 5, \ typecache = GLOB.typecache_living, \ amount = 1, \ - when_locked = CALLBACK(src, .proc/on_lockon_component)) + when_locked = CALLBACK(src, PROC_REF(on_lockon_component))) /datum/action/cooldown/spell/pointed/projectile/spell_cards/proc/on_lockon_component(list/locked_weakrefs) if(!length(locked_weakrefs)) diff --git a/code/modules/spells/spell_types/right_and_wrong.dm b/code/modules/spells/spell_types/right_and_wrong.dm index f6563b244c9..61b40a0bca6 100644 --- a/code/modules/spells/spell_types/right_and_wrong.dm +++ b/code/modules/spells/spell_types/right_and_wrong.dm @@ -269,7 +269,7 @@ GLOBAL_LIST_INIT(summoned_magic_objectives, list( src.survivor_probability = survivor_probability src.give_proc_path = give_proc_path - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/gear_up_new_crew) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(gear_up_new_crew)) /datum/summon_things_controller/Destroy(force, ...) . = ..() diff --git a/code/modules/spells/spell_types/self/mutate.dm b/code/modules/spells/spell_types/self/mutate.dm index 0cc578809d6..45abae0e5ba 100644 --- a/code/modules/spells/spell_types/self/mutate.dm +++ b/code/modules/spells/spell_types/self/mutate.dm @@ -26,7 +26,7 @@ . = ..() for(var/mutation in mutations_to_add) cast_on.dna.add_mutation(mutation) - addtimer(CALLBACK(src, .proc/remove_mutations, cast_on), mutation_duration, TIMER_DELETE_ME) + addtimer(CALLBACK(src, PROC_REF(remove_mutations), cast_on), mutation_duration, TIMER_DELETE_ME) /// Removes the mutations we added from casting our spell /datum/action/cooldown/spell/apply_mutations/proc/remove_mutations(mob/living/carbon/human/cast_on) diff --git a/code/modules/spells/spell_types/self/spacetime_distortion.dm b/code/modules/spells/spell_types/self/spacetime_distortion.dm index d71cb6713bc..d01a98055fe 100644 --- a/code/modules/spells/spell_types/self/spacetime_distortion.dm +++ b/code/modules/spells/spell_types/self/spacetime_distortion.dm @@ -59,7 +59,7 @@ /datum/action/cooldown/spell/spacetime_dist/after_cast() . = ..() - addtimer(CALLBACK(src, .proc/clean_turfs), duration) + addtimer(CALLBACK(src, PROC_REF(clean_turfs)), duration) /// Callback which cleans up our effects list after the duration expires. /datum/action/cooldown/spell/spacetime_dist/proc/clean_turfs() @@ -122,7 +122,7 @@ . = ..() setDir(pick(GLOB.cardinals)) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) antimagic_flags = flags diff --git a/code/modules/spells/spell_types/self/summonitem.dm b/code/modules/spells/spell_types/self/summonitem.dm index 761c2c7efad..2844954739b 100644 --- a/code/modules/spells/spell_types/self/summonitem.dm +++ b/code/modules/spells/spell_types/self/summonitem.dm @@ -22,7 +22,7 @@ /datum/action/cooldown/spell/summonitem/proc/mark_item(obj/to_mark) name = "Recall [to_mark]" marked_item = to_mark - RegisterSignal(marked_item, COMSIG_PARENT_QDELETING, .proc/on_marked_item_deleted) + RegisterSignal(marked_item, COMSIG_PARENT_QDELETING, PROC_REF(on_marked_item_deleted)) /// Unset our current marked item /datum/action/cooldown/spell/summonitem/proc/unmark_item() diff --git a/code/modules/spells/spell_types/shapeshift/_shape_status.dm b/code/modules/spells/spell_types/shapeshift/_shape_status.dm index b95abb47bce..f361c87f384 100644 --- a/code/modules/spells/spell_types/shapeshift/_shape_status.dm +++ b/code/modules/spells/spell_types/shapeshift/_shape_status.dm @@ -35,10 +35,10 @@ caster_mob.notransform = TRUE caster_mob.apply_status_effect(/datum/status_effect/grouped/stasis, STASIS_SHAPECHANGE_EFFECT) - RegisterSignal(owner, COMSIG_LIVING_PRE_WABBAJACKED, .proc/on_wabbajacked) - RegisterSignal(owner, COMSIG_LIVING_DEATH, .proc/on_shape_death) - RegisterSignal(caster_mob, COMSIG_LIVING_DEATH, .proc/on_caster_death) - RegisterSignal(caster_mob, COMSIG_PARENT_QDELETING, .proc/on_caster_deleted) + RegisterSignal(owner, COMSIG_LIVING_PRE_WABBAJACKED, PROC_REF(on_wabbajacked)) + RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(on_shape_death)) + RegisterSignal(caster_mob, COMSIG_LIVING_DEATH, PROC_REF(on_caster_death)) + RegisterSignal(caster_mob, COMSIG_PARENT_QDELETING, PROC_REF(on_caster_deleted)) SEND_SIGNAL(caster_mob, COMSIG_LIVING_SHAPESHIFTED, owner) return TRUE diff --git a/code/modules/spells/spell_types/shapeshift/_shapeshift.dm b/code/modules/spells/spell_types/shapeshift/_shapeshift.dm index dfdfde2f2a9..3cb37c3b257 100644 --- a/code/modules/spells/spell_types/shapeshift/_shapeshift.dm +++ b/code/modules/spells/spell_types/shapeshift/_shapeshift.dm @@ -64,7 +64,7 @@ cast_on, cast_on, shape_names_to_image, - custom_check = CALLBACK(src, .proc/check_menu, cast_on), + custom_check = CALLBACK(src, PROC_REF(check_menu), cast_on), radius = 38, ) diff --git a/code/modules/spells/spell_types/touch/_touch.dm b/code/modules/spells/spell_types/touch/_touch.dm index 2e07a6e1cef..f5dff19fd52 100644 --- a/code/modules/spells/spell_types/touch/_touch.dm +++ b/code/modules/spells/spell_types/touch/_touch.dm @@ -69,10 +69,10 @@ return FALSE attached_hand = new_hand - RegisterSignal(attached_hand, COMSIG_ITEM_AFTERATTACK, .proc/on_hand_hit) - RegisterSignal(attached_hand, COMSIG_ITEM_AFTERATTACK_SECONDARY, .proc/on_secondary_hand_hit) - RegisterSignal(attached_hand, COMSIG_PARENT_QDELETING, .proc/on_hand_deleted) - RegisterSignal(attached_hand, COMSIG_ITEM_DROPPED, .proc/on_hand_dropped) + RegisterSignal(attached_hand, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_hand_hit)) + RegisterSignal(attached_hand, COMSIG_ITEM_AFTERATTACK_SECONDARY, PROC_REF(on_secondary_hand_hit)) + RegisterSignal(attached_hand, COMSIG_PARENT_QDELETING, PROC_REF(on_hand_deleted)) + RegisterSignal(attached_hand, COMSIG_ITEM_DROPPED, PROC_REF(on_hand_dropped)) to_chat(cast_on, draw_message) return TRUE @@ -122,7 +122,7 @@ if(!can_cast_spell(feedback = FALSE)) return - INVOKE_ASYNC(src, .proc/do_hand_hit, source, victim, caster) + INVOKE_ASYNC(src, PROC_REF(do_hand_hit), source, victim, caster) /** * Signal proc for [COMSIG_ITEM_AFTERATTACK_SECONDARY] from our attached hand. @@ -139,7 +139,7 @@ if(!can_cast_spell(feedback = FALSE)) return - INVOKE_ASYNC(src, .proc/do_secondary_hand_hit, source, victim, caster) + INVOKE_ASYNC(src, PROC_REF(do_secondary_hand_hit), source, victim, caster) /** * Calls cast_on_hand_hit() from the caster onto the victim. diff --git a/code/modules/spells/spell_types/tower_of_babel.dm b/code/modules/spells/spell_types/tower_of_babel.dm index 70468903d69..b10038aaf65 100644 --- a/code/modules/spells/spell_types/tower_of_babel.dm +++ b/code/modules/spells/spell_types/tower_of_babel.dm @@ -8,7 +8,7 @@ GLOBAL_DATUM(tower_of_babel, /datum/tower_of_babel) log_admin("[key_name(badmin)] used the Tower of Babel.") badmin.log_message("has stricken the station with the Tower of Babel!", LOG_GAME) - RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/handle_new_player) + RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, PROC_REF(handle_new_player)) deadchat_broadcast("The [span_name("Tower of Babel")] has stricken the station, people will struggle to communicate.", message_type=DEADCHAT_ANNOUNCEMENT) for(var/mob/living/carbon/target in GLOB.player_list) diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index dcf9d3e339e..0065eb50563 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -179,8 +179,8 @@ /obj/item/bodypart/Initialize(mapload) . = ..() if(can_be_disabled) - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_gain) - RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_loss) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_gain)) + RegisterSignal(src, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_loss)) if(!IS_ORGANIC_LIMB(src)) grind_results = null @@ -623,7 +623,7 @@ last_maxed = FALSE else if(!last_maxed && owner.stat < UNCONSCIOUS) - INVOKE_ASYNC(owner, /mob.proc/emote, "scream") + INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "scream") last_maxed = TRUE set_disabled(FALSE) // we only care about the paralysis trait return @@ -632,7 +632,7 @@ if(total_damage >= max_damage * disable_threshold) if(!last_maxed) if(owner.stat < UNCONSCIOUS) - INVOKE_ASYNC(owner, /mob.proc/emote, "scream") + INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "scream") last_maxed = TRUE set_disabled(TRUE) return @@ -683,11 +683,11 @@ if(HAS_TRAIT(owner, TRAIT_NOLIMBDISABLE)) set_can_be_disabled(FALSE) needs_update_disabled = FALSE - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_NOLIMBDISABLE), .proc/on_owner_nolimbdisable_trait_loss) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_NOLIMBDISABLE), .proc/on_owner_nolimbdisable_trait_gain) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_NOLIMBDISABLE), PROC_REF(on_owner_nolimbdisable_trait_loss)) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_NOLIMBDISABLE), PROC_REF(on_owner_nolimbdisable_trait_gain)) // Bleeding stuff - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_NOBLEED), .proc/on_owner_nobleed_loss) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_NOBLEED), .proc/on_owner_nobleed_gain) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_NOBLEED), PROC_REF(on_owner_nobleed_loss)) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_NOBLEED), PROC_REF(on_owner_nobleed_gain)) if(needs_update_disabled) update_disabled() @@ -712,8 +712,8 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_NOLIMBDISABLE)) CRASH("set_can_be_disabled to TRUE with for limb whose owner has TRAIT_NOLIMBDISABLE") - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_gain) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), .proc/on_paralysis_trait_loss) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_gain)) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS), PROC_REF(on_paralysis_trait_loss)) update_disabled() else if(.) if(owner) @@ -1035,7 +1035,7 @@ if(embed in embedded_objects) // go away return // We don't need to do anything with projectile embedding, because it will never reach this point - RegisterSignal(embed, COMSIG_ITEM_EMBEDDING_UPDATE, .proc/embedded_object_changed) + RegisterSignal(embed, COMSIG_ITEM_EMBEDDING_UPDATE, PROC_REF(embedded_object_changed)) embedded_objects += embed refresh_bleed_rate() diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 73f08afb637..23f1668a4ef 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -17,7 +17,7 @@ affecting.receive_damage(clamp(brute_dam/2 * affecting.body_damage_coeff, 15, 50), clamp(burn_dam/2 * affecting.body_damage_coeff, 0, 50), wound_bonus=CANT_WOUND) //Damage the chest based on limb's existing damage if(!silent) limb_owner.visible_message(span_danger("[limb_owner]'s [name] is violently dismembered!")) - INVOKE_ASYNC(limb_owner, /mob.proc/emote, "scream") + INVOKE_ASYNC(limb_owner, TYPE_PROC_REF(/mob, emote), "scream") playsound(get_turf(limb_owner), 'sound/effects/dismember.ogg', 80, TRUE) limb_owner.add_mood_event("dismembered", /datum/mood_event/dismembered) limb_owner.mind?.add_memory(MEMORY_DISMEMBERED, list(DETAIL_LOST_LIMB = src, DETAIL_PROTAGONIST = limb_owner), story_value = STORY_VALUE_AMAZING) @@ -392,7 +392,7 @@ // Bodyparts need to be sorted for leg masking to be done properly. It also will allow for some predictable // behavior within said bodyparts list. We sort it here, as it's the only place we make changes to bodyparts. - new_limb_owner.bodyparts = sort_list(new_limb_owner.bodyparts, /proc/cmp_bodypart_by_body_part_asc) + new_limb_owner.bodyparts = sort_list(new_limb_owner.bodyparts, GLOBAL_PROC_REF(cmp_bodypart_by_body_part_asc)) synchronize_bodytypes(new_limb_owner) new_limb_owner.updatehealth() new_limb_owner.update_body() diff --git a/code/modules/surgery/bodyparts/parts.dm b/code/modules/surgery/bodyparts/parts.dm index f7e26581b98..7cf9431fe15 100644 --- a/code/modules/surgery/bodyparts/parts.dm +++ b/code/modules/surgery/bodyparts/parts.dm @@ -112,10 +112,10 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_PARALYSIS_L_ARM)) ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_loss)) else REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_gain)) if(.) var/mob/living/carbon/old_owner = . if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_ARM)) @@ -131,7 +131,7 @@ SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM) UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM)) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_loss)) ///Proc to react to the owner losing the TRAIT_PARALYSIS_L_ARM trait. @@ -139,7 +139,7 @@ SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_ARM) UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_ARM)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_ARM), PROC_REF(on_owner_paralysis_gain)) /obj/item/bodypart/arm/left/set_disabled(new_disabled) @@ -213,10 +213,10 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_PARALYSIS_R_ARM)) ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_loss)) else REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_gain)) if(.) var/mob/living/carbon/old_owner = . if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_ARM)) @@ -232,7 +232,7 @@ SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM) UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM)) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_loss)) ///Proc to react to the owner losing the TRAIT_PARALYSIS_R_ARM trait. @@ -240,7 +240,7 @@ SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_ARM) UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_ARM)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_ARM), PROC_REF(on_owner_paralysis_gain)) /obj/item/bodypart/arm/right/set_disabled(new_disabled) @@ -328,10 +328,10 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_PARALYSIS_L_LEG)) ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_loss)) else REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_gain)) if(.) var/mob/living/carbon/old_owner = . if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_L_LEG)) @@ -347,7 +347,7 @@ SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG) UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG)) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_loss)) ///Proc to react to the owner losing the TRAIT_PARALYSIS_L_LEG trait. @@ -355,7 +355,7 @@ SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_L_LEG) UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_L_LEG)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_L_LEG), PROC_REF(on_owner_paralysis_gain)) /obj/item/bodypart/leg/left/set_disabled(new_disabled) @@ -426,10 +426,10 @@ if(owner) if(HAS_TRAIT(owner, TRAIT_PARALYSIS_R_LEG)) ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG), PROC_REF(on_owner_paralysis_loss)) else REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG), PROC_REF(on_owner_paralysis_gain)) if(.) var/mob/living/carbon/old_owner = . if(HAS_TRAIT(old_owner, TRAIT_PARALYSIS_R_LEG)) @@ -445,7 +445,7 @@ SIGNAL_HANDLER ADD_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG) UnregisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG)) - RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG), .proc/on_owner_paralysis_loss) + RegisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG), PROC_REF(on_owner_paralysis_loss)) ///Proc to react to the owner losing the TRAIT_PARALYSIS_R_LEG trait. @@ -453,7 +453,7 @@ SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_PARALYSIS, TRAIT_PARALYSIS_R_LEG) UnregisterSignal(owner, SIGNAL_REMOVETRAIT(TRAIT_PARALYSIS_R_LEG)) - RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG), .proc/on_owner_paralysis_gain) + RegisterSignal(owner, SIGNAL_ADDTRAIT(TRAIT_PARALYSIS_R_LEG), PROC_REF(on_owner_paralysis_gain)) /obj/item/bodypart/leg/right/set_disabled(new_disabled) diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm index fc4ccbd1fbc..3ab324fec3b 100644 --- a/code/modules/surgery/organs/_organ.dm +++ b/code/modules/surgery/organs/_organ.dm @@ -57,7 +57,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) initial_reagents = food_reagents,\ foodtypes = RAW | MEAT | GORE,\ volume = reagent_vol,\ - after_eat = CALLBACK(src, .proc/OnEatFrom)) + after_eat = CALLBACK(src, PROC_REF(OnEatFrom))) /* * Insert the organ into the select mob. @@ -83,7 +83,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) owner = reciever moveToNullspace() - RegisterSignal(owner, COMSIG_PARENT_EXAMINE, .proc/on_owner_examine) + RegisterSignal(owner, COMSIG_PARENT_EXAMINE, PROC_REF(on_owner_examine)) update_organ_traits(reciever) for(var/datum/action/action as anything in actions) action.Grant(reciever) diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 0617dd201c1..026b5b5ceb2 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -78,8 +78,8 @@ var/side = zone == BODY_ZONE_R_ARM? RIGHT_HANDS : LEFT_HANDS hand = arm_owner.hand_bodyparts[side] if(hand) - RegisterSignal(hand, COMSIG_ITEM_ATTACK_SELF, .proc/on_item_attack_self) //If the limb gets an attack-self, open the menu. Only happens when hand is empty - RegisterSignal(arm_owner, COMSIG_KB_MOB_DROPITEM_DOWN, .proc/dropkey) //We're nodrop, but we'll watch for the drop hotkey anyway and then stow if possible. + RegisterSignal(hand, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_item_attack_self)) //If the limb gets an attack-self, open the menu. Only happens when hand is empty + RegisterSignal(arm_owner, COMSIG_KB_MOB_DROPITEM_DOWN, PROC_REF(dropkey)) //We're nodrop, but we'll watch for the drop hotkey anyway and then stow if possible. /obj/item/organ/internal/cyberimp/arm/Remove(mob/living/carbon/arm_owner, special = 0) Retract() @@ -90,7 +90,7 @@ /obj/item/organ/internal/cyberimp/arm/proc/on_item_attack_self() SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/ui_action_click) + INVOKE_ASYNC(src, PROC_REF(ui_action_click)) /obj/item/organ/internal/cyberimp/arm/emp_act(severity) . = ..() diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index 4cdc4b9b96d..010df97e729 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -23,7 +23,7 @@ synthesizing = TRUE to_chat(owner, span_notice("You feel less hungry...")) owner.adjust_nutrition(25 * delta_time) - addtimer(CALLBACK(src, .proc/synth_cool), 50) + addtimer(CALLBACK(src, PROC_REF(synth_cool)), 50) /obj/item/organ/internal/cyberimp/chest/nutriment/proc/synth_cool() synthesizing = FALSE @@ -59,7 +59,7 @@ if(reviving) switch(owner.stat) if(UNCONSCIOUS, HARD_CRIT) - addtimer(CALLBACK(src, .proc/heal), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(heal)), 3 SECONDS) else COOLDOWN_START(src, reviver_cooldown, revive_cost) reviving = FALSE @@ -105,7 +105,7 @@ if(human_owner.stat != DEAD && prob(50 / severity) && human_owner.can_heartattack()) human_owner.set_heartattack(TRUE) to_chat(human_owner, span_userdanger("You feel a horrible agony in your chest!")) - addtimer(CALLBACK(src, .proc/undo_heart_attack), 600 / severity) + addtimer(CALLBACK(src, PROC_REF(undo_heart_attack)), 600 / severity) /obj/item/organ/internal/cyberimp/chest/reviver/proc/undo_heart_attack() var/mob/living/carbon/human/human_owner = owner @@ -133,8 +133,8 @@ /obj/item/organ/internal/cyberimp/chest/thrusters/Initialize(mapload) . = ..() - get_mover = CALLBACK(src, .proc/get_user) - check_on_move = CALLBACK(src, .proc/allow_thrust, 0.01) + get_mover = CALLBACK(src, PROC_REF(get_user)) + check_on_move = CALLBACK(src, PROC_REF(allow_thrust), 0.01) refresh_jetpack() /obj/item/organ/internal/cyberimp/chest/thrusters/Destroy() diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 9e711ef1d42..89e2d73bad7 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -60,7 +60,7 @@ stored_items += held_item to_chat(owner, span_notice("Your [owner.get_held_index_name(owner.get_held_index_of_item(held_item))]'s grip tightens.")) ADD_TRAIT(held_item, TRAIT_NODROP, IMPLANT_TRAIT) - RegisterSignal(held_item, COMSIG_ITEM_DROPPED, .proc/on_held_item_dropped) + RegisterSignal(held_item, COMSIG_ITEM_DROPPED, PROC_REF(on_held_item_dropped)) else release_items() to_chat(owner, span_notice("Your hands relax...")) @@ -120,12 +120,12 @@ /obj/item/organ/internal/cyberimp/brain/anti_stun/Insert(special = FALSE, drop_if_replaced = TRUE) . = ..() - RegisterSignal(owner, signalCache, .proc/on_signal) + RegisterSignal(owner, signalCache, PROC_REF(on_signal)) /obj/item/organ/internal/cyberimp/brain/anti_stun/proc/on_signal(datum/source, amount) SIGNAL_HANDLER if(!(organ_flags & ORGAN_FAILING) && amount > 0) - addtimer(CALLBACK(src, .proc/clear_stuns), stun_cap_amount, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(clear_stuns)), stun_cap_amount, TIMER_UNIQUE|TIMER_OVERRIDE) /obj/item/organ/internal/cyberimp/brain/anti_stun/proc/clear_stuns() if(owner || !(organ_flags & ORGAN_FAILING)) @@ -139,7 +139,7 @@ if((organ_flags & ORGAN_FAILING) || . & EMP_PROTECT_SELF) return organ_flags |= ORGAN_FAILING - addtimer(CALLBACK(src, .proc/reboot), 90 / severity) + addtimer(CALLBACK(src, PROC_REF(reboot)), 90 / severity) /obj/item/organ/internal/cyberimp/brain/anti_stun/proc/reboot() organ_flags &= ~ORGAN_FAILING diff --git a/code/modules/surgery/organs/external/_external_organs.dm b/code/modules/surgery/organs/external/_external_organs.dm index 0bba6e02f76..118bb60bf3b 100644 --- a/code/modules/surgery/organs/external/_external_organs.dm +++ b/code/modules/surgery/organs/external/_external_organs.dm @@ -334,8 +334,8 @@ /obj/item/organ/external/antennae/Insert(mob/living/carbon/reciever, special, drop_if_replaced) . = ..() - RegisterSignal(reciever, COMSIG_HUMAN_BURNING, .proc/try_burn_antennae) - RegisterSignal(reciever, COMSIG_LIVING_POST_FULLY_HEAL, .proc/heal_antennae) + RegisterSignal(reciever, COMSIG_HUMAN_BURNING, PROC_REF(try_burn_antennae)) + RegisterSignal(reciever, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(heal_antennae)) /obj/item/organ/external/antennae/Remove(mob/living/carbon/organ_owner, special, moving) . = ..() diff --git a/code/modules/surgery/organs/external/tails.dm b/code/modules/surgery/organs/external/tails.dm index 7b336c1c360..789faecaade 100644 --- a/code/modules/surgery/organs/external/tails.dm +++ b/code/modules/surgery/organs/external/tails.dm @@ -26,7 +26,7 @@ /obj/item/organ/external/tail/Insert(mob/living/carbon/reciever, special, drop_if_replaced) . = ..() if(.) - RegisterSignal(reciever, COMSIG_ORGAN_WAG_TAIL, .proc/wag) + RegisterSignal(reciever, COMSIG_ORGAN_WAG_TAIL, PROC_REF(wag)) original_owner ||= reciever //One and done reciever.clear_mood_event("tail_lost") @@ -64,7 +64,7 @@ render_key = "wagging[initial(render_key)]" wag_flags |= WAG_WAGGING if(stop_after) - addtimer(CALLBACK(src, .proc/wag, FALSE), stop_after, TIMER_STOPPABLE|TIMER_DELETE_ME) + addtimer(CALLBACK(src, PROC_REF(wag), FALSE), stop_after, TIMER_STOPPABLE|TIMER_DELETE_ME) else render_key = initial(render_key) wag_flags &= ~WAG_WAGGING @@ -122,7 +122,7 @@ render_key = "wagging[initial(render_key)]" wag_flags |= WAG_WAGGING if(stop_after) - addtimer(CALLBACK(src, .proc/wag, FALSE), stop_after, TIMER_STOPPABLE|TIMER_DELETE_ME) + addtimer(CALLBACK(src, PROC_REF(wag), FALSE), stop_after, TIMER_STOPPABLE|TIMER_DELETE_ME) if(paired_spines) paired_spines.render_key = "wagging[initial(paired_spines.render_key)]" else diff --git a/code/modules/surgery/organs/external/wings.dm b/code/modules/surgery/organs/external/wings.dm index fa353392054..db2b4edc98e 100644 --- a/code/modules/surgery/organs/external/wings.dm +++ b/code/modules/surgery/organs/external/wings.dm @@ -193,9 +193,9 @@ /obj/item/organ/external/wings/moth/Insert(mob/living/carbon/reciever, special, drop_if_replaced) . = ..() - RegisterSignal(reciever, COMSIG_HUMAN_BURNING, .proc/try_burn_wings) - RegisterSignal(reciever, COMSIG_LIVING_POST_FULLY_HEAL, .proc/heal_wings) - RegisterSignal(reciever, COMSIG_MOVABLE_PRE_MOVE, .proc/update_float_move) + RegisterSignal(reciever, COMSIG_HUMAN_BURNING, PROC_REF(try_burn_wings)) + RegisterSignal(reciever, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(heal_wings)) + RegisterSignal(reciever, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(update_float_move)) /obj/item/organ/external/wings/moth/Remove(mob/living/carbon/organ_owner, special, moving) . = ..() diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 1c21338f722..c8d19858883 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -407,7 +407,7 @@ /obj/item/organ/internal/eyes/robotic/glow/Insert(mob/living/carbon/eye_owner, special = FALSE, drop_if_replaced = FALSE) . = ..() - RegisterSignal(eye_owner, COMSIG_ATOM_DIR_CHANGE, .proc/update_visuals) + RegisterSignal(eye_owner, COMSIG_ATOM_DIR_CHANGE, PROC_REF(update_visuals)) //SKYRAT EDIT ADDITION var/eye_color = owner.client?.prefs?.read_preference(/datum/preference/color/eye_color) mob_overlay.color = eye_color diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 57cddfdb183..a78388cf57a 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -30,7 +30,7 @@ /obj/item/organ/internal/heart/Remove(mob/living/carbon/heartless, special = 0) ..() if(!special) - addtimer(CALLBACK(src, .proc/stop_if_unowned), 120) + addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 120) /obj/item/organ/internal/heart/proc/stop_if_unowned() if(!owner) @@ -42,7 +42,7 @@ user.visible_message("[user] squeezes [src] to \ make it beat again!",span_notice("You squeeze [src] to make it beat again!")) Restart() - addtimer(CALLBACK(src, .proc/stop_if_unowned), 80) + addtimer(CALLBACK(src, PROC_REF(stop_if_unowned)), 80) /obj/item/organ/internal/heart/proc/Stop() beating = FALSE @@ -225,7 +225,7 @@ Stop() owner.visible_message(span_danger("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!"), \ span_userdanger("You feel a terrible pain in your chest, as if your heart has stopped!")) - addtimer(CALLBACK(src, .proc/Restart), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(Restart)), 10 SECONDS) /obj/item/organ/internal/heart/cybernetic/on_life(delta_time, times_fired) . = ..() @@ -279,9 +279,9 @@ /obj/item/organ/internal/heart/ethereal/Insert(mob/living/carbon/owner, special = FALSE, drop_if_replaced = TRUE) . = ..() - RegisterSignal(owner, COMSIG_MOB_STATCHANGE, .proc/on_stat_change) - RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, .proc/on_owner_fully_heal) - RegisterSignal(owner, COMSIG_PARENT_QDELETING, .proc/owner_deleted) + RegisterSignal(owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) + RegisterSignal(owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(on_owner_fully_heal)) + RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(owner_deleted)) /obj/item/organ/internal/heart/ethereal/Remove(mob/living/carbon/owner, special = FALSE) UnregisterSignal(owner, list(COMSIG_MOB_STATCHANGE, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_PARENT_QDELETING)) @@ -342,11 +342,11 @@ ) ADD_TRAIT(victim, TRAIT_CORPSELOCKED, SPECIES_TRAIT) - crystalize_timer_id = addtimer(CALLBACK(src, .proc/crystalize, victim), CRYSTALIZE_PRE_WAIT_TIME, TIMER_STOPPABLE) + crystalize_timer_id = addtimer(CALLBACK(src, PROC_REF(crystalize), victim), CRYSTALIZE_PRE_WAIT_TIME, TIMER_STOPPABLE) - RegisterSignal(victim, COMSIG_HUMAN_DISARM_HIT, .proc/reset_crystalizing) - RegisterSignal(victim, COMSIG_PARENT_EXAMINE, .proc/on_examine, override = TRUE) - RegisterSignal(victim, COMSIG_MOB_APPLY_DAMAGE, .proc/on_take_damage) + RegisterSignal(victim, COMSIG_HUMAN_DISARM_HIT, PROC_REF(reset_crystalizing)) + RegisterSignal(victim, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine), override = TRUE) + RegisterSignal(victim, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(on_take_damage)) ///Ran when disarmed, prevents the ethereal from reviving /obj/item/organ/internal/heart/ethereal/proc/reset_crystalizing(mob/living/defender, mob/living/attacker, zone) @@ -356,7 +356,7 @@ span_notice("The crystals on your corpse are gently broken off, and will need some time to recover."), ) deltimer(crystalize_timer_id) - crystalize_timer_id = addtimer(CALLBACK(src, .proc/crystalize, defender), CRYSTALIZE_DISARM_WAIT_TIME, TIMER_STOPPABLE) //Lets us restart the timer on disarm + crystalize_timer_id = addtimer(CALLBACK(src, PROC_REF(crystalize), defender), CRYSTALIZE_DISARM_WAIT_TIME, TIMER_STOPPABLE) //Lets us restart the timer on disarm ///Actually spawns the crystal which puts the ethereal in it. @@ -447,11 +447,11 @@ possible_chair?.unbuckle_mob(ethereal_heart.owner, force = TRUE) ethereal_heart.owner.forceMove(src) //put that ethereal in add_atom_colour(ethereal_heart.ethereal_color, FIXED_COLOUR_PRIORITY) - crystal_heal_timer = addtimer(CALLBACK(src, .proc/heal_ethereal), CRYSTALIZE_HEAL_TIME, TIMER_STOPPABLE) + crystal_heal_timer = addtimer(CALLBACK(src, PROC_REF(heal_ethereal)), CRYSTALIZE_HEAL_TIME, TIMER_STOPPABLE) set_light(4, 10, ethereal_heart.ethereal_color) update_icon() flick("ethereal_crystal_forming", src) - addtimer(CALLBACK(src, .proc/start_crystalization), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(start_crystalization)), 1 SECONDS) /obj/structure/ethereal_crystal/proc/start_crystalization() being_built = FALSE diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 5c14a8a6203..06c681b1982 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -29,7 +29,7 @@ . = ..() // If the liver handles foods like a clown, it honks like a bike horn // Don't think about it too much. - RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_COMEDY_METABOLISM), .proc/on_add_comedy_metabolism) + RegisterSignal(src, SIGNAL_ADDTRAIT(TRAIT_COMEDY_METABOLISM), PROC_REF(on_add_comedy_metabolism)) /* Signal handler for the liver gaining the TRAIT_COMEDY_METABOLISM trait * diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index 0a470ec3a29..8f7dceb5959 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -409,7 +409,7 @@ var/helium_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/helium][MOLES]) if(helium_pp > helium_speech_min && !helium_speech) helium_speech = TRUE - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_helium_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_helium_speech)) else if(helium_pp <= helium_speech_min && helium_speech) helium_speech = FALSE UnregisterSignal(owner, COMSIG_MOB_SAY) diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index bb4efd37f11..a7d767e4c21 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -23,7 +23,7 @@ owner.internal_organs_slot[slot] = src // internal_organs_slot must ALWAYS be ordered in the same way as organ_process_order // Otherwise life processing breaks down - sortTim(owner.internal_organs_slot, /proc/cmp_organ_slot_asc) + sortTim(owner.internal_organs_slot, GLOBAL_PROC_REF(cmp_organ_slot_asc)) STOP_PROCESSING(SSobj, src) diff --git a/code/modules/surgery/organs/stomach/stomach_ethereal.dm b/code/modules/surgery/organs/stomach/stomach_ethereal.dm index 1750bb55ae2..5ce55f5b4c5 100644 --- a/code/modules/surgery/organs/stomach/stomach_ethereal.dm +++ b/code/modules/surgery/organs/stomach/stomach_ethereal.dm @@ -15,8 +15,8 @@ /obj/item/organ/internal/stomach/ethereal/Insert(mob/living/carbon/carbon, special = FALSE, 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/internal/stomach/ethereal/Remove(mob/living/carbon/carbon, special = FALSE) UnregisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT) diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 838dd4ba7f7..6a2dbb9867e 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -62,7 +62,7 @@ if(say_mod && tongue_owner.dna && tongue_owner.dna.species) tongue_owner.dna.species.say_mod = say_mod if (modifies_speech) - RegisterSignal(tongue_owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(tongue_owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) tongue_owner.UnregisterSignal(tongue_owner, COMSIG_MOB_SAY) /* This could be slightly simpler, by making the removal of the @@ -79,7 +79,7 @@ if(say_mod && tongue_owner.dna && tongue_owner.dna.species) tongue_owner.dna.species.say_mod = initial(tongue_owner.dna.species.say_mod) UnregisterSignal(tongue_owner, COMSIG_MOB_SAY) - RegisterSignal(tongue_owner, COMSIG_MOB_SAY, /mob/living/carbon/.proc/handle_tongueless_speech) + tongue_owner.RegisterSignal(tongue_owner, COMSIG_MOB_SAY, TYPE_PROC_REF(/mob/living/carbon/, handle_tongueless_speech)) REMOVE_TRAIT(tongue_owner, TRAIT_AGEUSIA, ORGAN_TRAIT) // Carbons by default start with NO_TONGUE_TRAIT caused TRAIT_AGEUSIA ADD_TRAIT(tongue_owner, TRAIT_AGEUSIA, NO_TONGUE_TRAIT) @@ -147,7 +147,7 @@ /datum/action/item_action/organ_action/statue/New(Target) . = ..() statue = new - RegisterSignal(statue, COMSIG_PARENT_QDELETING, .proc/statue_destroyed) + RegisterSignal(statue, COMSIG_PARENT_QDELETING, PROC_REF(statue_destroyed)) /datum/action/item_action/organ_action/statue/Destroy() UnregisterSignal(statue, COMSIG_PARENT_QDELETING) @@ -190,7 +190,7 @@ statue.forceMove(get_turf(becoming_statue)) becoming_statue.forceMove(statue) statue.update_integrity(becoming_statue.health) - RegisterSignal(becoming_statue, COMSIG_MOVABLE_MOVED, .proc/human_left_statue) + RegisterSignal(becoming_statue, COMSIG_MOVABLE_MOVED, PROC_REF(human_left_statue)) //somehow they used an exploit/teleportation to leave statue, lets clean up /datum/action/item_action/organ_action/statue/proc/human_left_statue(atom/movable/mover, atom/oldloc, direction) @@ -546,9 +546,9 @@ GLOBAL_LIST_INIT(english_to_zombie, list()) signer.verb_yell = "emphatically signs" signer.bubble_icon = "signlang" ADD_TRAIT(signer, TRAIT_SIGN_LANG, ORGAN_TRAIT) - RegisterSignal(signer, COMSIG_LIVING_TRY_SPEECH, .proc/on_speech_check) - RegisterSignal(signer, COMSIG_LIVING_TREAT_MESSAGE, .proc/on_treat_message) - RegisterSignal(signer, COMSIG_MOVABLE_USING_RADIO, .proc/on_use_radio) + RegisterSignal(signer, COMSIG_LIVING_TRY_SPEECH, PROC_REF(on_speech_check)) + RegisterSignal(signer, COMSIG_LIVING_TREAT_MESSAGE, PROC_REF(on_treat_message)) + RegisterSignal(signer, COMSIG_MOVABLE_USING_RADIO, PROC_REF(on_use_radio)) /obj/item/organ/internal/tongue/tied/Remove(mob/living/carbon/speaker, special = FALSE) . = ..() @@ -680,7 +680,7 @@ GLOBAL_LIST_INIT(english_to_zombie, list()) // If either an exclamation or question are found if(!isnull(tonal_indicator) && owner.client?.typing_indicators) owner.add_overlay(tonal_indicator) - tonal_timerid = addtimer(CALLBACK(src, .proc/remove_tonal_indicator), 2.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE | TIMER_DELETE_ME) + tonal_timerid = addtimer(CALLBACK(src, PROC_REF(remove_tonal_indicator)), 2.5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE | TIMER_DELETE_ME) else // If we're not gonna use it, just be sure we get rid of it tonal_indicator = null diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index cb78b7e15e2..8e420b16221 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -88,7 +88,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. @@ -136,7 +136,7 @@ /obj/item/surgicaldrill/suicide_act(mob/living/user) user.visible_message(span_suicide("[user] rams [src] into [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide!")) - addtimer(CALLBACK(user, /mob/living/carbon.proc/gib, null, null, TRUE, TRUE), 25) + addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living/carbon, gib), null, null, TRUE, TRUE), 25) user.SpinAnimation(3, 10) playsound(user, 'sound/machines/juicer.ogg', 20, TRUE) return MANUAL_SUICIDE @@ -262,7 +262,7 @@ if(!(slot & ITEM_SLOT_HANDS)) UnregisterSignal(user, COMSIG_SURGERY_STARTING) return - RegisterSignal(user, COMSIG_SURGERY_STARTING, .proc/check_surgery) + RegisterSignal(user, COMSIG_SURGERY_STARTING, PROC_REF(check_surgery)) /obj/item/surgical_processor/dropped(mob/user, silent) . = ..() @@ -324,7 +324,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. @@ -369,7 +369,7 @@ hitsound_on = hitsound, \ w_class_on = w_class, \ clumsy_check = FALSE) - RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, .proc/on_transform) + RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform)) /* * Signal proc for [COMSIG_TRANSFORMING_ON_TRANSFORM]. @@ -462,8 +462,8 @@ for(var/obj/item/bodypart/thing in user.bodyparts) if(thing.body_part == CHEST) continue - addtimer(CALLBACK(thing, /obj/item/bodypart/.proc/dismember), timer) - addtimer(CALLBACK(GLOBAL_PROC, .proc/playsound, user, 'sound/weapons/bladeslice.ogg', 70), timer) + addtimer(CALLBACK(thing, TYPE_PROC_REF(/obj/item/bodypart/, dismember)), timer) + addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), user, 'sound/weapons/bladeslice.ogg', 70), timer) timer += 1 SECONDS sleep(timer) return BRUTELOSS diff --git a/code/modules/tgui/tgui.dm b/code/modules/tgui/tgui.dm index 12a21d41f62..d0e09344ca6 100644 --- a/code/modules/tgui/tgui.dm +++ b/code/modules/tgui/tgui.dm @@ -203,7 +203,7 @@ return if(!COOLDOWN_FINISHED(src, refresh_cooldown)) refreshing = TRUE - addtimer(CALLBACK(src, .proc/send_full_update, custom_data, force), COOLDOWN_TIMELEFT(src, refresh_cooldown), TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(send_full_update), custom_data, force), COOLDOWN_TIMELEFT(src, refresh_cooldown), TIMER_UNIQUE) return refreshing = FALSE var/should_update_data = force || status >= UI_UPDATE @@ -325,7 +325,7 @@ window = window, src_object = src_object) process_status() - DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, .proc/on_act_message, act_type, payload, state)) + DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(on_act_message), act_type, payload, state)) return FALSE switch(type) if("ready") diff --git a/code/modules/tgui_input/say_modal/modal.dm b/code/modules/tgui_input/say_modal/modal.dm index e1012238357..020af14cea7 100644 --- a/code/modules/tgui_input/say_modal/modal.dm +++ b/code/modules/tgui_input/say_modal/modal.dm @@ -36,7 +36,7 @@ /datum/tgui_say/New(client/client, id) src.client = client window = new(client, id) - window.subscribe(src, .proc/on_message) + window.subscribe(src, PROC_REF(on_message)) window.is_browser = TRUE /** diff --git a/code/modules/tgui_input/say_modal/typing.dm b/code/modules/tgui_input/say_modal/typing.dm index 13f0055d0a0..49357fb9b5f 100644 --- a/code/modules/tgui_input/say_modal/typing.dm +++ b/code/modules/tgui_input/say_modal/typing.dm @@ -59,7 +59,7 @@ if(!window_open || !client.typing_indicators || !client.mob.thinking_IC) return FALSE client.mob.create_typing_indicator() - addtimer(CALLBACK(src, .proc/stop_typing), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(stop_typing)), 5 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE | TIMER_STOPPABLE) /** * Callback to remove the typing indicator after a brief period of inactivity. diff --git a/code/modules/tgui_panel/tgui_panel.dm b/code/modules/tgui_panel/tgui_panel.dm index 3c927488fa1..9fb8b02b019 100644 --- a/code/modules/tgui_panel/tgui_panel.dm +++ b/code/modules/tgui_panel/tgui_panel.dm @@ -16,7 +16,7 @@ /datum/tgui_panel/New(client/client, id) src.client = client window = new(client, id) - window.subscribe(src, .proc/on_message) + window.subscribe(src, PROC_REF(on_message)) /datum/tgui_panel/Del() window.unsubscribe(src) @@ -52,7 +52,7 @@ window.send_asset(get_asset_datum(/datum/asset/spritesheet/chat)) // Other setup request_telemetry() - addtimer(CALLBACK(src, .proc/on_initialize_timed_out), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(on_initialize_timed_out)), 5 SECONDS) /** * private diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index 83bbe5f2995..c551a130a7f 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -90,7 +90,7 @@ Notes: queueHide = showing ? TRUE : FALSE if (queueHide) - addtimer(CALLBACK(src, .proc/do_hide), 1) + addtimer(CALLBACK(src, PROC_REF(do_hide)), 1) else do_hide() diff --git a/code/modules/unit_tests/combat.dm b/code/modules/unit_tests/combat.dm index d273310155a..e1c2959dda8 100644 --- a/code/modules/unit_tests/combat.dm +++ b/code/modules/unit_tests/combat.dm @@ -57,9 +57,9 @@ var/mob/living/carbon/human/victim = allocate(/mob/living/carbon/human) var/obj/item/storage/toolbox/toolbox = allocate(/obj/item/storage/toolbox) - RegisterSignal(toolbox, COMSIG_ITEM_PRE_ATTACK, .proc/pre_attack_hit) - RegisterSignal(toolbox, COMSIG_ITEM_ATTACK, .proc/attack_hit) - RegisterSignal(toolbox, COMSIG_ITEM_AFTERATTACK, .proc/post_attack_hit) + RegisterSignal(toolbox, COMSIG_ITEM_PRE_ATTACK, PROC_REF(pre_attack_hit)) + RegisterSignal(toolbox, COMSIG_ITEM_ATTACK, PROC_REF(attack_hit)) + RegisterSignal(toolbox, COMSIG_ITEM_AFTERATTACK, PROC_REF(post_attack_hit)) attacker.put_in_active_hand(toolbox, forced = TRUE) attacker.set_combat_mode(TRUE) diff --git a/code/modules/unit_tests/connect_loc.dm b/code/modules/unit_tests/connect_loc.dm index a0b4f618991..69cd4fa0985 100644 --- a/code/modules/unit_tests/connect_loc.dm +++ b/code/modules/unit_tests/connect_loc.dm @@ -63,7 +63,7 @@ . = ..() var/static/list/connections = list( - COMSIG_MOCK_SIGNAL = .proc/on_receive_mock_signal, + COMSIG_MOCK_SIGNAL = PROC_REF(on_receive_mock_signal), ) AddElement(/datum/element/connect_loc, connections) diff --git a/code/modules/unit_tests/create_and_destroy.dm b/code/modules/unit_tests/create_and_destroy.dm index c0129ea6bd3..85aad8ab12f 100644 --- a/code/modules/unit_tests/create_and_destroy.dm +++ b/code/modules/unit_tests/create_and_destroy.dm @@ -113,17 +113,21 @@ GLOBAL_VAR_INIT(running_create_and_destroy, FALSE) ignore += typesof(/obj/structure/industrial_lift) var/list/cached_contents = spawn_at.contents.Copy() - var/baseturf_count = length(spawn_at.baseturfs) + var/original_turf_type = spawn_at.type + var/original_baseturfs = islist(spawn_at.baseturfs) ? spawn_at.baseturfs.Copy() : spawn_at.baseturfs + var/original_baseturf_count = length(original_baseturfs) GLOB.running_create_and_destroy = TRUE for(var/type_path in typesof(/atom/movable, /turf) - ignore) //No areas please if(ispath(type_path, /turf)) - spawn_at.ChangeTurf(type_path, /turf/baseturf_skipover) - //We change it back to prevent pain, please don't ask - spawn_at.ChangeTurf(/turf/open/floor/wood, /turf/baseturf_skipover) - if(baseturf_count != length(spawn_at.baseturfs)) - TEST_FAIL("[type_path] changed the amount of baseturfs we have [baseturf_count] -> [length(spawn_at.baseturfs)]") - baseturf_count = length(spawn_at.baseturfs) + spawn_at.ChangeTurf(type_path) + //We change it back to prevent baseturfs stacking and hitting the limit + spawn_at.ChangeTurf(original_turf_type, original_baseturfs) + if(original_baseturf_count != length(spawn_at.baseturfs)) + TEST_FAIL("[type_path] changed the amount of baseturfs from [original_baseturf_count] to [length(spawn_at.baseturfs)]; [english_list(original_baseturfs)] to [islist(spawn_at.baseturfs) ? english_list(spawn_at.baseturfs) : spawn_at.baseturfs]") + //Warn if it changes again + original_baseturfs = islist(spawn_at.baseturfs) ? spawn_at.baseturfs.Copy() : spawn_at.baseturfs + original_baseturf_count = length(original_baseturfs) else var/atom/creation = new type_path(spawn_at) if(QDELETED(creation)) diff --git a/code/modules/unit_tests/emoting.dm b/code/modules/unit_tests/emoting.dm index 14d5e85b7a4..a472db25a93 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/find_reference_sanity.dm b/code/modules/unit_tests/find_reference_sanity.dm index 49e5625b619..8bd2a14dbf5 100644 --- a/code/modules/unit_tests/find_reference_sanity.dm +++ b/code/modules/unit_tests/find_reference_sanity.dm @@ -27,6 +27,10 @@ SSgarbage.should_save_refs = TRUE //Sanity check + #if DM_VERSION >= 515 + var/refcount = refcount(victim) + TEST_ASSERT_EQUAL(refcount, 3, "Should be: test references: 0 + baseline references: 3 (victim var,loc,allocated list)") + #endif victim.DoSearchVar(testbed, "Sanity Check", search_time = 1) //We increment search time to get around an optimization TEST_ASSERT(!victim.found_refs.len, "The ref-tracking tool found a ref where none existed") SSgarbage.should_save_refs = FALSE @@ -41,6 +45,10 @@ testbed.test_list += victim testbed.test_assoc_list["baseline"] = victim + #if DM_VERSION >= 515 + var/refcount = refcount(victim) + TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") + #endif victim.DoSearchVar(testbed, "First Run", search_time = 2) TEST_ASSERT(victim.found_refs["test"], "The ref-tracking tool failed to find a regular value") @@ -58,6 +66,10 @@ testbed.vis_contents += victim testbed.test_assoc_list[victim] = TRUE + #if DM_VERSION >= 515 + var/refcount = refcount(victim) + TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") + #endif victim.DoSearchVar(testbed, "Second Run", search_time = 3) //This is another sanity check @@ -78,6 +90,10 @@ var/list/to_find_assoc = list(victim) testbed.test_assoc_list["Nesting"] = to_find_assoc + #if DM_VERSION >= 515 + var/refcount = refcount(victim) + TEST_ASSERT_EQUAL(refcount, 6, "Should be: test references: 3 + baseline references: 3 (victim var,loc,allocated list)") + #endif victim.DoSearchVar(victim, "Third Run Self", search_time = 4) victim.DoSearchVar(testbed, "Third Run Testbed", search_time = 4) TEST_ASSERT(victim.found_refs["self_ref"], "The ref-tracking tool failed to find a self reference") @@ -92,7 +108,10 @@ //Calm before the storm testbed.test_assoc_list = list(null = victim) - + #if DM_VERSION >= 515 + var/refcount = refcount(victim) + TEST_ASSERT_EQUAL(refcount, 4, "Should be: test references: 1 + baseline references: 3 (victim var,loc,allocated list)") + #endif victim.DoSearchVar(testbed, "Fourth Run", search_time = 5) TEST_ASSERT(testbed.test_assoc_list, "The ref-tracking tool failed to find a null key'd assoc list entry") @@ -107,6 +126,10 @@ var/list/to_find_null_assoc_nested = list(victim) testbed.test_assoc_list[null] = to_find_null_assoc_nested + #if DM_VERSION >= 515 + var/refcount = refcount(victim) + TEST_ASSERT_EQUAL(refcount, 5, "Should be: test references: 2 + baseline references: 3 (victim var,loc,allocated list)") + #endif victim.DoSearchVar(testbed, "Fifth Run", search_time = 6) TEST_ASSERT(victim.found_refs[to_find_in_key], "The ref-tracking tool failed to find a nested assoc list key") TEST_ASSERT(victim.found_refs[to_find_null_assoc_nested], "The ref-tracking tool failed to find a null key'd nested assoc list entry") @@ -127,6 +150,10 @@ for(var/key in global.vars) global_vars[key] = global.vars[key] + #if DM_VERSION >= 515 + var/refcount = refcount(victim) + TEST_ASSERT_EQUAL(refcount, 5, "Should be: test references: 2 + baseline references: 3 (victim var,loc,allocated list)") + #endif victim.DoSearchVar(global_vars, "Sixth Run", search_time = 7) TEST_ASSERT(victim.found_refs[global_vars], "The ref-tracking tool failed to find a natively global variable") diff --git a/code/modules/unit_tests/heretic_rituals.dm b/code/modules/unit_tests/heretic_rituals.dm index 316d2e97bff..677d934d052 100644 --- a/code/modules/unit_tests/heretic_rituals.dm +++ b/code/modules/unit_tests/heretic_rituals.dm @@ -27,7 +27,7 @@ // Set up the blacklist for types we don't want to test here. See above for reasons. var/list/blacklist_typecache = typecacheof(list( /datum/heretic_knowledge/summon, - /datum/heretic_knowledge/final, + /datum/heretic_knowledge/ultimate, /datum/heretic_knowledge/hunt_and_sacrifice, )) var/list/all_ritual_knowledge = list() diff --git a/code/modules/unit_tests/metabolizing.dm b/code/modules/unit_tests/metabolizing.dm index 94fdd2d05a9..a1bf8610e04 100644 --- a/code/modules/unit_tests/metabolizing.dm +++ b/code/modules/unit_tests/metabolizing.dm @@ -3,10 +3,11 @@ SSmobs.pause() var/mob/living/carbon/human/human = allocate(/mob/living/carbon/human) - - for (var/reagent_type in subtypesof(/datum/reagent)) - if(reagent_type in GLOB.fake_reagent_blacklist) - continue + var/list/blacklisted_reagents = list( + /datum/reagent/eigenstate, //Creates clones after a delay which get into other tests + ) + var/list/reagents_to_check = subtypesof(/datum/reagent) - blacklisted_reagents - GLOB.fake_reagent_blacklist + for (var/reagent_type in reagents_to_check) test_reagent(human, reagent_type) /datum/unit_test/metabolization/proc/test_reagent(mob/living/carbon/C, reagent_type) diff --git a/code/modules/unit_tests/nuke_cinematic.dm b/code/modules/unit_tests/nuke_cinematic.dm index c0b377a29a7..fbbfeabbd10 100644 --- a/code/modules/unit_tests/nuke_cinematic.dm +++ b/code/modules/unit_tests/nuke_cinematic.dm @@ -31,7 +31,7 @@ // Pause the check so we don't, y'know, end the round SSticker.roundend_check_paused = TRUE - RegisterSignal(SSdcs, COMSIG_GLOB_PLAY_CINEMATIC, .proc/check_cinematic) + RegisterSignal(SSdcs, COMSIG_GLOB_PLAY_CINEMATIC, PROC_REF(check_cinematic)) // actually_explode calls really_actually_explode which sleeps, so this will take a moment. var/nuke_result = nuke.actually_explode() diff --git a/code/modules/unit_tests/objectives.dm b/code/modules/unit_tests/objectives.dm index 6e51696903a..9f58e268588 100644 --- a/code/modules/unit_tests/objectives.dm +++ b/code/modules/unit_tests/objectives.dm @@ -16,7 +16,7 @@ TEST_FAIL("[objective_typepath] is not in a traitor category and isn't an abstract type! Place it into a [/datum/traitor_objective_category] or remove it from code.") if(initial(objective_typepath.progression_minimum) == null) TEST_FAIL("[objective_typepath] has not defined a minimum progression level and isn't an abstract type! Please define the progression minimum variable on the datum") - if(!ispath(objective_typepath, /datum/traitor_objective/final) && initial(objective_typepath.progression_reward) == 0 && initial(objective_typepath.telecrystal_reward) == 0) + if(!ispath(objective_typepath, /datum/traitor_objective/ultimate) && initial(objective_typepath.progression_reward) == 0 && initial(objective_typepath.telecrystal_reward) == 0) TEST_FAIL("[objective_typepath] has not set either a progression reward or a telecrystal reward! Please set either a telecrystal or progression reward for this objective.") /datum/unit_test/objectives_category/proc/recursive_check_list(base_type, list/to_check, list/to_add_to) diff --git a/code/modules/unit_tests/say.dm b/code/modules/unit_tests/say.dm index 38ce20c43dc..9daa5134b58 100644 --- a/code/modules/unit_tests/say.dm +++ b/code/modules/unit_tests/say.dm @@ -28,7 +28,7 @@ /datum/unit_test/say_signal/Run() var/mob/living/dummy = allocate(/mob/living) - RegisterSignal(dummy, COMSIG_MOB_SAY, .proc/check_say) + RegisterSignal(dummy, COMSIG_MOB_SAY, PROC_REF(check_say)) dummy.say("Make sure the say signal gets the arglist say is past, no copies!") /datum/unit_test/say_signal/proc/check_say(mob/living/source, list/say_args) diff --git a/code/modules/unit_tests/unit_test.dm b/code/modules/unit_tests/unit_test.dm index f4d83404fac..fddcaa74f08 100644 --- a/code/modules/unit_tests/unit_test.dm +++ b/code/modules/unit_tests/unit_test.dm @@ -178,7 +178,7 @@ GLOBAL_LIST_EMPTY(unit_test_mapping_logs) 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/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index 261af6db7dc..86f92eba0de 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -162,7 +162,7 @@ /// To add a trailer to the vehicle in a manner that allows safe qdels /obj/vehicle/proc/add_trailer(obj/vehicle/added_vehicle) trailer = added_vehicle - RegisterSignal(trailer, COMSIG_PARENT_QDELETING, .proc/remove_trailer) + RegisterSignal(trailer, COMSIG_PARENT_QDELETING, PROC_REF(remove_trailer)) /// To remove a trailer from the vehicle in a manner that allows safe qdels /obj/vehicle/proc/remove_trailer() diff --git a/code/modules/vehicles/bicycle.dm b/code/modules/vehicles/bicycle.dm index 281877115ac..1771bb96133 100644 --- a/code/modules/vehicles/bicycle.dm +++ b/code/modules/vehicles/bicycle.dm @@ -39,7 +39,7 @@ audible_message(span_hear("You hear welding.")) var/did_the_thing while(atom_integrity < max_integrity) - if(W.use_tool(src, user, 2.5 SECONDS, volume=50, amount=1, extra_checks = CALLBACK(src, .proc/can_still_fix))) + if(W.use_tool(src, user, 2.5 SECONDS, volume=50, amount=1, extra_checks = CALLBACK(src, PROC_REF(can_still_fix)))) did_the_thing = TRUE atom_integrity += min(10, (max_integrity - atom_integrity)) audible_message(span_hear("You hear welding.")) diff --git a/code/modules/vehicles/cars/car.dm b/code/modules/vehicles/cars/car.dm index 66d7e39c29c..ea34f63a2bb 100644 --- a/code/modules/vehicles/cars/car.dm +++ b/code/modules/vehicles/cars/car.dm @@ -58,7 +58,7 @@ if(occupant_amount() >= max_occupants) return FALSE var/atom/old_loc = loc - if(do_mob(forcer, kidnapped, get_enter_delay(kidnapped), extra_checks=CALLBACK(src, /obj/vehicle/sealed/car.proc/is_car_stationary, old_loc))) + if(do_mob(forcer, kidnapped, get_enter_delay(kidnapped), extra_checks=CALLBACK(src, TYPE_PROC_REF(/obj/vehicle/sealed/car, is_car_stationary), old_loc))) mob_forced_enter(kidnapped, silent) return TRUE return FALSE diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 54282748c26..c570ff83efa 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -25,7 +25,7 @@ /obj/vehicle/sealed/car/clowncar/Initialize(mapload) . = ..() START_PROCESSING(SSobj,src) - RegisterSignal(src, COMSIG_MOVABLE_CROSS_OVER, .proc/check_crossed) + RegisterSignal(src, COMSIG_MOVABLE_CROSS_OVER, PROC_REF(check_crossed)) /obj/vehicle/sealed/car/clowncar/process() if(light_on && (obj_flags & EMAGGED)) @@ -42,7 +42,7 @@ var/mob/living/carbon/human/H = M if(is_clown_job(H.mind?.assigned_role)) //Ensures only clowns can drive the car. (Including more at once) add_control_flags(H, VEHICLE_CONTROL_DRIVE) - RegisterSignal(H, COMSIG_MOB_CLICKON, .proc/fire_cannon_at) + RegisterSignal(H, COMSIG_MOB_CLICKON, PROC_REF(fire_cannon_at)) M.log_message("has entered [src] as a possible driver", LOG_GAME) return add_control_flags(M, VEHICLE_CONTROL_KIDNAPPED) @@ -59,7 +59,7 @@ message_admins("[ADMIN_LOOKUPFLW(forced_mob)] was forced into a clown car with [reagent_amount] unit(s) of Irish Car Bomb, causing an explosion.") forced_mob.log_message("was forced into a clown car with [reagent_amount] unit(s) of Irish Car Bomb, causing an explosion.", LOG_GAME) audible_message(span_userdanger("You hear a rattling sound coming from the engine. That can't be good..."), null, 1) - addtimer(CALLBACK(src, .proc/irish_car_bomb), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(irish_car_bomb)), 5 SECONDS) /obj/vehicle/sealed/car/clowncar/proc/irish_car_bomb() dump_mobs() @@ -183,7 +183,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/engine/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) @@ -195,8 +195,8 @@ smoke.start(log = TRUE) 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) @@ -227,7 +227,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("[src] starts going back into mobile mode.")) else @@ -235,7 +235,7 @@ flick("clowncar_tofire", src) icon_state = "clowncar_fire" visible_message(span_danger("[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/cars/vim.dm b/code/modules/vehicles/cars/vim.dm index 466cc0b2b09..2a35593e06d 100644 --- a/code/modules/vehicles/cars/vim.dm +++ b/code/modules/vehicles/cars/vim.dm @@ -125,9 +125,9 @@ /obj/item/circuit_component/vim/register_shell(atom/movable/shell) . = ..() - RegisterSignal(shell, COMSIG_VIM_HEADLIGHTS_TOGGLED, .proc/on_headlights_toggle) - RegisterSignal(shell, COMSIG_VIM_CHIME_USED, .proc/on_chime_used) - RegisterSignal(shell, COMSIG_VIM_BUZZ_USED, .proc/on_buzz_used) + RegisterSignal(shell, COMSIG_VIM_HEADLIGHTS_TOGGLED, PROC_REF(on_headlights_toggle)) + RegisterSignal(shell, COMSIG_VIM_CHIME_USED, PROC_REF(on_chime_used)) + RegisterSignal(shell, COMSIG_VIM_BUZZ_USED, PROC_REF(on_buzz_used)) /obj/item/circuit_component/vim/unregister_shell(atom/movable/shell) . = ..() diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index 76dd493b94c..87d86211288 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -207,9 +207,9 @@ ui_view.generate_view("mech_view_[REF(src)]") if(enclosed) internal_tank = new (src) - RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE , .proc/disconnect_air) - RegisterSignal(src, COMSIG_MOVABLE_MOVED, .proc/play_stepsound) - RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, .proc/on_light_eater) + RegisterSignal(src, COMSIG_MOVABLE_PRE_MOVE , PROC_REF(disconnect_air)) + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(play_stepsound)) + RegisterSignal(src, COMSIG_LIGHT_EATER_ACT, PROC_REF(on_light_eater)) spark_system = new spark_system.set_up(2, 0, src) @@ -617,7 +617,7 @@ return if(SEND_SIGNAL(src, COMSIG_MECHA_EQUIPMENT_CLICK, livinguser, target) & COMPONENT_CANCEL_EQUIPMENT_CLICK) return - INVOKE_ASYNC(selected, /obj/item/mecha_parts/mecha_equipment.proc/action, user, target, modifiers) + INVOKE_ASYNC(selected, TYPE_PROC_REF(/obj/item/mecha_parts/mecha_equipment, action), user, target, modifiers) return if(Adjacent(target) && (selected.range & MECHA_MELEE)) if(isliving(target) && selected.harmful && HAS_TRAIT(livinguser, TRAIT_PACIFISM)) @@ -625,7 +625,7 @@ return if(SEND_SIGNAL(src, COMSIG_MECHA_EQUIPMENT_CLICK, livinguser, target) & COMPONENT_CANCEL_EQUIPMENT_CLICK) return - INVOKE_ASYNC(selected, /obj/item/mecha_parts/mecha_equipment.proc/action, user, target, modifiers) + INVOKE_ASYNC(selected, TYPE_PROC_REF(/obj/item/mecha_parts/mecha_equipment, action), user, target, modifiers) return if(!(livinguser in return_controllers_with_flag(VEHICLE_CONTROL_MELEE))) to_chat(livinguser, span_warning("You're in the wrong seat to interact with your hands.")) @@ -659,7 +659,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/effects/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/effects/talk.dmi', src, "machine[say_test(speech_args[SPEECH_MESSAGE])]",MOB_LAYER+1), speech_bubble_recipients, 30) ///////////////////////// diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm index e25f215085c..909f4c0b888 100644 --- a/code/modules/vehicles/mecha/combat/durand.dm +++ b/code/modules/vehicles/mecha/combat/durand.dm @@ -22,8 +22,8 @@ /obj/vehicle/sealed/mecha/combat/durand/Initialize(mapload) . = ..() shield = new /obj/durand_shield(loc, src, plane, 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() @@ -60,7 +60,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. @@ -170,8 +170,8 @@ own integrity back to max. Shield is automatically dropped if we run out of powe src.layer = layer SET_PLANE_EXPLICIT(src, plane, src) setDir(dir) - RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, .proc/activate) - RegisterSignal(chassis, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, .proc/shield_glide_size_update) + RegisterSignal(src, COMSIG_MECHA_ACTION_TRIGGER, PROC_REF(activate)) + RegisterSignal(chassis, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE, PROC_REF(shield_glide_size_update)) /obj/durand_shield/Destroy() @@ -228,13 +228,13 @@ 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) set_light(0) icon_state = "shield_null" - addtimer(CALLBACK(src, .proc/make_invisible), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(make_invisible)), 1 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE) UnregisterSignal(chassis, COMSIG_ATOM_DIR_CHANGE) switching = FALSE diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm index 7aae9bd224c..916b890a5cc 100644 --- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm +++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm @@ -80,7 +80,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 @@ -119,7 +119,7 @@ S_TIMER_COOLDOWN_START(chassis, COOLDOWN_MECHA_SKYFALL, skyfall_cooldown_time) button_icon_state = "mech_savannah_cooldown" UpdateButtons() - 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) @@ -136,7 +136,7 @@ SET_PLANE(chassis, GAME_PLANE_UPPER_FOV_HIDDEN, launch_turf) 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 @@ -147,7 +147,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 @@ -268,8 +268,8 @@ chassis.balloon_alert(owner, "missile mode on (click to target)") aiming_missile = TRUE rockets_left = 3 - RegisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK, .proc/on_melee_click) - RegisterSignal(chassis, COMSIG_MECHA_EQUIPMENT_CLICK, .proc/on_equipment_click) + RegisterSignal(chassis, COMSIG_MECHA_MELEE_CLICK, PROC_REF(on_melee_click)) + RegisterSignal(chassis, COMSIG_MECHA_EQUIPMENT_CLICK, PROC_REF(on_equipment_click)) owner.client.mouse_override_icon = 'icons/effects/mouse_pointers/supplypod_down_target.dmi' owner.update_mouse_pointer() owner.overlay_fullscreen("ivanov", /atom/movable/screen/fullscreen/ivanov_display, 1) @@ -325,7 +325,7 @@ )) button_icon_state = "mech_ivanov_cooldown" UpdateButtons() - 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 @@ -349,7 +349,7 @@ return INITIALIZE_HINT_QDEL src.mecha = mecha animate(src, alpha = 255, TOTAL_SKYFALL_LEAP_TIME/2, easing = CIRCULAR_EASING|EASE_OUT) - RegisterSignal(mecha, COMSIG_MOVABLE_MOVED, .proc/follow) + RegisterSignal(mecha, COMSIG_MOVABLE_MOVED, PROC_REF(follow)) QDEL_IN(src, TOTAL_SKYFALL_LEAP_TIME) //when the animations land /obj/effect/skyfall_landingzone/Destroy(force) diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm index de725ec2e1f..3a55ea6113e 100644 --- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm +++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm @@ -112,11 +112,11 @@ 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), interaction_key = interaction_key) + return do_after(user, equip_cooldown, target, extra_checks = CALLBACK(src, PROC_REF(do_after_checks), target), interaction_key = interaction_key) ///Do after wrapper for mecha equipment /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/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm index c90ea0ffbd4..081e0e5c0ad 100644 --- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm @@ -67,7 +67,7 @@ return to_chat(source, "[icon2html(src, source)][span_notice("You start putting [target] into [src]...")]") chassis.visible_message(span_warning("[chassis] starts putting [target] into \the [src].")) - if(!do_after(source, equip_cooldown, target, extra_checks=CALLBACK(src, .proc/patient_insertion_check, target, source))) + if(!do_after(source, equip_cooldown, target, extra_checks=CALLBACK(src, PROC_REF(patient_insertion_check), target, source))) return if(!chassis || !(get_dir(chassis, target) & chassis.dir)) return @@ -275,8 +275,8 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/create_reagents(max_vol, flags) . = ..() - RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), .proc/on_reagent_change) - RegisterSignal(reagents, COMSIG_PARENT_QDELETING, .proc/on_reagents_del) + RegisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT), PROC_REF(on_reagent_change)) + RegisterSignal(reagents, COMSIG_PARENT_QDELETING, PROC_REF(on_reagents_del)) /// Handles detaching signal hooks incase someone is crazy enough to make this edible. /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/on_reagents_del(datum/reagents/reagents) diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm index a7b4eb181ea..64a4bdc7c62 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm @@ -387,7 +387,7 @@ message_admins("[ADMIN_LOOKUPFLW(user)] fired a [F] in [ADMIN_VERBOSEJMP(T)]") user.log_message("fired a [F] in [AREACOORD(T)].", LOG_GAME) user.log_message("fired a [F] in [AREACOORD(T)].", LOG_ATTACK) - addtimer(CALLBACK(F, /obj/item/grenade/flashbang.proc/detonate), det_time) + addtimer(CALLBACK(F, TYPE_PROC_REF(/obj/item/grenade/flashbang, detonate)), det_time) /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze name = "\improper SOB-3 grenade launcher" diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm index 8e384046e03..8836b133690 100644 --- a/code/modules/vehicles/mecha/mech_fabricator.dm +++ b/code/modules/vehicles/mecha/mech_fabricator.dm @@ -61,7 +61,7 @@ RegisterSignal( stored_research, list(COMSIG_TECHWEB_ADD_DESIGN, COMSIG_TECHWEB_REMOVE_DESIGN), - .proc/on_techweb_update + PROC_REF(on_techweb_update) ) return ..() @@ -70,7 +70,7 @@ // We're probably going to get more than one update (design) at a time, so batch // them together. - addtimer(CALLBACK(src, .proc/update_menu_tech), 2 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(update_menu_tech)), 2 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) /obj/machinery/mecha_part_fabricator/RefreshParts() . = ..() diff --git a/code/modules/vehicles/mecha/mecha_construction_paths.dm b/code/modules/vehicles/mecha/mecha_construction_paths.dm index 9a8abe75837..86a623ad588 100644 --- a/code/modules/vehicles/mecha/mecha_construction_paths.dm +++ b/code/modules/vehicles/mecha/mecha_construction_paths.dm @@ -456,7 +456,7 @@ outer_plating_amount=1 /datum/component/construction/mecha/gygax/action(datum/source, atom/used_atom, mob/user) - return INVOKE_ASYNC(src, .proc/check_step, used_atom,user) + return INVOKE_ASYNC(src, PROC_REF(check_step), used_atom,user) //CLARKE /datum/component/construction/unordered/mecha_chassis/clarke diff --git a/code/modules/vehicles/mecha/mecha_defense.dm b/code/modules/vehicles/mecha/mecha_defense.dm index 072f47fb9e3..412b68f9b26 100644 --- a/code/modules/vehicles/mecha/mecha_defense.dm +++ b/code/modules/vehicles/mecha/mecha_defense.dm @@ -176,7 +176,7 @@ if(!equipment_disabled && LAZYLEN(occupants)) //prevent spamming this message with back-to-back EMPs to_chat(occupants, span_warning("Error -- Connection to equipment control unit has been lost.")) - addtimer(CALLBACK(src, /obj/vehicle/sealed/mecha.proc/restore_equipment), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/vehicle/sealed/mecha, restore_equipment)), 3 SECONDS, TIMER_UNIQUE | TIMER_OVERRIDE) equipment_disabled = TRUE set_mouse_pointer() diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm index fb7266973fb..06145f071bc 100644 --- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm +++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm @@ -154,9 +154,9 @@ return ..() /obj/vehicle/sealed/mecha/add_occupant(mob/M, control_flags) - RegisterSignal(M, COMSIG_LIVING_DEATH, .proc/mob_exit, TRUE) - RegisterSignal(M, COMSIG_MOB_CLICKON, .proc/on_mouseclick, TRUE) - RegisterSignal(M, COMSIG_MOB_SAY, .proc/display_speech_bubble, TRUE) + RegisterSignal(M, COMSIG_LIVING_DEATH, PROC_REF(mob_exit), TRUE) + RegisterSignal(M, COMSIG_MOB_CLICKON, PROC_REF(on_mouseclick), TRUE) + RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(display_speech_bubble), TRUE) . = ..() update_appearance() diff --git a/code/modules/vehicles/mecha/mecha_wreckage.dm b/code/modules/vehicles/mecha/mecha_wreckage.dm index 697f739d3ff..3ada0a544ba 100644 --- a/code/modules/vehicles/mecha/mecha_wreckage.dm +++ b/code/modules/vehicles/mecha/mecha_wreckage.dm @@ -32,7 +32,7 @@ return AI = AI_pilot AI.apply_damage(150, BURN) //Give the AI a bit of damage from the "shock" of being suddenly shut down - INVOKE_ASYNC(AI, /mob/living/silicon.proc/death) //The damage is not enough to kill the AI, but to be 'corrupted files' in need of repair. + INVOKE_ASYNC(AI, TYPE_PROC_REF(/mob/living/silicon, death)) //The damage is not enough to kill the AI, but to be 'corrupted files' in need of repair. AI.forceMove(src) //Put the dead AI inside the wreckage for recovery add_overlay(mutable_appearance('icons/obj/weapons/guns/projectiles.dmi', "green_laser")) //Overlay for the recovery beacon AI.controlled_equipment = null diff --git a/code/modules/vehicles/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm index 37cc9ebca17..a9a8d0f21d9 100644 --- a/code/modules/vehicles/mecha/working/clarke.dm +++ b/code/modules/vehicles/mecha/working/clarke.dm @@ -89,7 +89,7 @@ UpdateButtons() COOLDOWN_START(src, search_cooldown, SEARCH_COOLDOWN) addtimer(VARSET_CALLBACK(src, button_icon_state, "mech_search_ruins"), SEARCH_COOLDOWN) - addtimer(CALLBACK(src, .proc/UpdateButtons), SEARCH_COOLDOWN) + addtimer(CALLBACK(src, PROC_REF(UpdateButtons)), SEARCH_COOLDOWN) var/obj/pinpointed_ruin for(var/obj/effect/landmark/ruin/ruin_landmark as anything in GLOB.ruin_landmarks) if(ruin_landmark.z != chassis.z) @@ -100,7 +100,7 @@ chassis.balloon_alert(living_owner, "no ruins!") return var/datum/status_effect/agent_pinpointer/ruin_pinpointer = living_owner.apply_status_effect(/datum/status_effect/agent_pinpointer/ruin) - ruin_pinpointer.RegisterSignal(living_owner, COMSIG_MOVABLE_MOVED, /datum/status_effect/agent_pinpointer/ruin.proc/cancel_self) + ruin_pinpointer.RegisterSignal(living_owner, COMSIG_MOVABLE_MOVED, TYPE_PROC_REF(/datum/status_effect/agent_pinpointer/ruin, cancel_self)) ruin_pinpointer.scan_target = pinpointed_ruin chassis.balloon_alert(living_owner, "pinpointing nearest ruin") diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm index 71bcc07c792..58a10cb5599 100644 --- a/code/modules/vehicles/pimpin_ride.dm +++ b/code/modules/vehicles/pimpin_ride.dm @@ -42,7 +42,7 @@ return to_chat(user, span_notice("You hook the trashbag onto [src].")) trash_bag = I - RegisterSignal(trash_bag, COMSIG_PARENT_QDELETING, .proc/bag_deleted) + RegisterSignal(trash_bag, COMSIG_PARENT_QDELETING, PROC_REF(bag_deleted)) SEND_SIGNAL(src, COMSIG_VACUUM_BAG_ATTACH, I) update_appearance() else if(istype(I, /obj/item/janicart_upgrade)) @@ -88,7 +88,7 @@ */ /obj/vehicle/ridden/janicart/proc/bag_deleted(datum/source) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/try_remove_bag) + INVOKE_ASYNC(src, PROC_REF(try_remove_bag)) /** * Attempts to remove the attached trash bag, returns true if bag was removed diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index 68b3b7f576e..ccc99160214 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -154,7 +154,7 @@ victim.Paralyze(1.5 SECONDS) skater.adjustStaminaLoss(instability) victim.visible_message(span_danger("[victim] straight up gets grinded into the ground by [skater]'s [src]! Radical!")) - addtimer(CALLBACK(src, .proc/grind), 1) + addtimer(CALLBACK(src, PROC_REF(grind)), 1) /obj/vehicle/ridden/scooter/skateboard/MouseDrop(atom/over_object) . = ..() diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm index 1e3dcec1191..a7f46919506 100644 --- a/code/modules/vehicles/sealed.dm +++ b/code/modules/vehicles/sealed.dm @@ -49,14 +49,12 @@ /obj/vehicle/sealed/proc/mob_try_enter(mob/M) if(!istype(M)) return FALSE - if(occupant_amount() >= max_occupants) - return FALSE //SKYRAT EDIT ADDITION if(HAS_TRAIT(M, TRAIT_OVERSIZED)) to_chat(M, span_warning("You are far too big for this!")) return FALSE //SKYRAT EDIT END - if(do_after(M, get_enter_delay(M), src, timed_action_flags = IGNORE_HELD_ITEM, extra_checks = CALLBACK(src, .proc/enter_checks, M))) + if(do_after(M, get_enter_delay(M), src, timed_action_flags = IGNORE_HELD_ITEM, extra_checks = CALLBACK(src, PROC_REF(enter_checks), M))) mob_enter(M) return TRUE return FALSE diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm index fe2ff4d9494..e5ae645b686 100644 --- a/code/modules/vehicles/vehicle_actions.dm +++ b/code/modules/vehicles/vehicle_actions.dm @@ -351,7 +351,7 @@ rider.client.give_award(/datum/award/achievement/misc/tram_surfer, rider) vehicle.grinding = TRUE vehicle.icon_state = "[initial(vehicle.icon_state)]-grind" - addtimer(CALLBACK(vehicle, /obj/vehicle/ridden/scooter/skateboard/.proc/grind), 2) + addtimer(CALLBACK(vehicle, TYPE_PROC_REF(/obj/vehicle/ridden/scooter/skateboard/, grind)), 2) else vehicle.obj_flags &= ~BLOCK_Z_OUT_DOWN rider.spin(4, 1) diff --git a/code/modules/vehicles/vehicle_key.dm b/code/modules/vehicles/vehicle_key.dm index 996556cd069..68066dac97f 100644 --- a/code/modules/vehicles/vehicle_key.dm +++ b/code/modules/vehicles/vehicle_key.dm @@ -20,7 +20,7 @@ return SHAME user.visible_message(span_suicide("[user] is putting \the [src] in [user.p_their()] ear and starts [user.p_their()] motor! It looks like [user.p_theyre()] trying to commit suicide!")) user.say("Vroom vroom!!", forced="secway key suicide") //Not doing a shamestate here, because even if they fail to speak they're spinning. - addtimer(CALLBACK(user, /mob/living/.proc/gib), 20) + addtimer(CALLBACK(user, TYPE_PROC_REF(/mob/living/, gib)), 20) return MANUAL_SUICIDE /obj/item/key/janitor @@ -36,14 +36,14 @@ if(SKILL_LEVEL_APPRENTICE to SKILL_LEVEL_JOURNEYMAN) //At least they tried user.visible_message(span_suicide("[user] is putting \the [src] in [user.p_their()] mouth and has inefficiently become one with the janicart! It looks like [user.p_theyre()] trying to commit suicide!")) user.AddElement(/datum/element/cleaning) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 51) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 51) return MANUAL_SUICIDE if(SKILL_LEVEL_EXPERT to SKILL_LEVEL_MASTER) //They are worthy enough, but can it go even further beyond? user.visible_message(span_suicide("[user] is putting \the [src] in [user.p_their()] mouth and has skillfully become one with the janicart! It looks like [user.p_theyre()] trying to commit suicide!")) user.AddElement(/datum/element/cleaning) for(var/i in 1 to 100) addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 101) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 101) return MANUAL_SUICIDE if(SKILL_LEVEL_LEGENDARY to INFINITY) //Holy shit, look at that janny go! user.visible_message(span_suicide("[user] is putting \the [src] in [user.p_their()] mouth and has epically become one with the janicart, and they're even in overdrive mode! It looks like [user.p_theyre()] trying to commit suicide!")) @@ -52,7 +52,7 @@ user.reagents.add_reagent(/datum/reagent/drug/methamphetamine, 10) //Gotta go fast! for(var/i in 1 to 150) addtimer(CALLBACK(user, /atom/proc/add_atom_colour, (i % 2)? "#a245bb" : "#7a7d82", ADMIN_COLOUR_PRIORITY), i) - addtimer(CALLBACK(src, .proc/manual_suicide, user), 151) + addtimer(CALLBACK(src, PROC_REF(manual_suicide), user), 151) return MANUAL_SUICIDE /obj/item/key/proc/manual_suicide(mob/living/user) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 02241a3c87c..f9c398b3694 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -1003,7 +1003,7 @@ GLOBAL_LIST_EMPTY(vending_products) allowed_configs += "[initial(item.greyscale_config_inhand_right)]" var/datum/greyscale_modify_menu/menu = new( - src, usr, allowed_configs, CALLBACK(src, .proc/vend_greyscale, params), + src, usr, allowed_configs, CALLBACK(src, PROC_REF(vend_greyscale), params), starting_icon_state=initial(fake_atom.icon_state), starting_config=initial(fake_atom.greyscale_config), starting_colors=initial(fake_atom.greyscale_colors) diff --git a/code/modules/wiremod/components/abstract/module.dm b/code/modules/wiremod/components/abstract/module.dm index ff89f8b0e4a..ad544354298 100644 --- a/code/modules/wiremod/components/abstract/module.dm +++ b/code/modules/wiremod/components/abstract/module.dm @@ -171,9 +171,9 @@ /obj/item/circuit_component/module/add_to(obj/item/integrated_circuit/added_to) . = ..() - RegisterSignal(added_to, COMSIG_CIRCUIT_SET_CELL, .proc/handle_set_cell) - RegisterSignal(added_to, COMSIG_CIRCUIT_SET_ON, .proc/handle_set_on) - RegisterSignal(added_to, COMSIG_CIRCUIT_SET_SHELL, .proc/handle_set_shell) + RegisterSignal(added_to, COMSIG_CIRCUIT_SET_CELL, PROC_REF(handle_set_cell)) + RegisterSignal(added_to, COMSIG_CIRCUIT_SET_ON, PROC_REF(handle_set_on)) + RegisterSignal(added_to, COMSIG_CIRCUIT_SET_SHELL, PROC_REF(handle_set_shell)) internal_circuit.set_cell(added_to.cell) internal_circuit.set_shell(added_to.shell) internal_circuit.set_on(added_to.on) diff --git a/code/modules/wiremod/components/abstract/variable.dm b/code/modules/wiremod/components/abstract/variable.dm index 8beab633dd9..3042a7e0686 100644 --- a/code/modules/wiremod/components/abstract/variable.dm +++ b/code/modules/wiremod/components/abstract/variable.dm @@ -61,4 +61,4 @@ current_variable = variable if(should_listen) current_variable.add_listener(src) - RegisterSignal(current_variable, COMSIG_PARENT_QDELETING, .proc/remove_current_variable) + RegisterSignal(current_variable, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_variable)) diff --git a/code/modules/wiremod/components/action/mmi.dm b/code/modules/wiremod/components/action/mmi.dm index 65d248c1ecc..aad190db2b1 100644 --- a/code/modules/wiremod/components/action/mmi.dm +++ b/code/modules/wiremod/components/action/mmi.dm @@ -78,7 +78,7 @@ /obj/item/circuit_component/mmi/register_shell(atom/movable/shell) . = ..() - RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, .proc/handle_attack_by) + RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_attack_by)) /obj/item/circuit_component/mmi/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_PARENT_ATTACKBY) @@ -101,8 +101,8 @@ if(to_add.brainmob) update_mmi_mob(to_add, null, to_add.brainmob) brain = to_add - RegisterSignal(to_add, COMSIG_PARENT_QDELETING, .proc/remove_current_brain) - RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, .proc/mmi_moved) + RegisterSignal(to_add, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_brain)) + RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, PROC_REF(mmi_moved)) /obj/item/circuit_component/mmi/proc/mmi_moved(atom/movable/mmi) SIGNAL_HANDLER @@ -132,7 +132,7 @@ UnregisterSignal(old_mmi, COMSIG_MOB_CLICKON) if(new_mmi) new_mmi.remote_control = src - RegisterSignal(new_mmi, COMSIG_MOB_CLICKON, .proc/handle_mmi_attack) + RegisterSignal(new_mmi, COMSIG_MOB_CLICKON, PROC_REF(handle_mmi_attack)) /obj/item/circuit_component/mmi/relaymove(mob/living/user, direct) if(user != brain.brainmob) diff --git a/code/modules/wiremod/components/action/pathfind.dm b/code/modules/wiremod/components/action/pathfind.dm index 9a0774a8c48..e7dcb160207 100644 --- a/code/modules/wiremod/components/action/pathfind.dm +++ b/code/modules/wiremod/components/action/pathfind.dm @@ -45,7 +45,7 @@ reason_failed = add_output_port("Fail reason", PORT_TYPE_STRING) /obj/item/circuit_component/pathfind/input_received(datum/port/input/port) - INVOKE_ASYNC(src, .proc/perform_pathfinding, port) + INVOKE_ASYNC(src, PROC_REF(perform_pathfinding), port) /obj/item/circuit_component/pathfind/proc/perform_pathfinding(datum/port/input/port) var/target_X = input_X.value diff --git a/code/modules/wiremod/components/action/pull.dm b/code/modules/wiremod/components/action/pull.dm index 9b6f2e3e7f4..8c83e938b00 100644 --- a/code/modules/wiremod/components/action/pull.dm +++ b/code/modules/wiremod/components/action/pull.dm @@ -24,4 +24,4 @@ if(!istype(shell) || get_dist(shell, target_atom) > 1 || shell.z != target_atom.z) return - INVOKE_ASYNC(shell, /atom/movable.proc/start_pulling, target_atom) + INVOKE_ASYNC(shell, TYPE_PROC_REF(/atom/movable, start_pulling), target_atom) diff --git a/code/modules/wiremod/components/action/radio.dm b/code/modules/wiremod/components/action/radio.dm index 76c81b3d38b..e45b72c7f0c 100644 --- a/code/modules/wiremod/components/action/radio.dm +++ b/code/modules/wiremod/components/action/radio.dm @@ -47,7 +47,7 @@ freq.set_value(sanitize_frequency(freq.value, TRUE)) /obj/item/circuit_component/radio/input_received(datum/port/input/port) - INVOKE_ASYNC(src, .proc/handle_radio_input, port) + INVOKE_ASYNC(src, PROC_REF(handle_radio_input), port) /obj/item/circuit_component/radio/proc/handle_radio_input(datum/port/input/port) var/frequency = freq.value diff --git a/code/modules/wiremod/components/admin/animate.dm b/code/modules/wiremod/components/admin/animate.dm index 4af25578f3e..c3b26464b1b 100644 --- a/code/modules/wiremod/components/admin/animate.dm +++ b/code/modules/wiremod/components/admin/animate.dm @@ -35,7 +35,7 @@ target = add_input_port("Target", PORT_TYPE_ATOM) parallel = add_input_port("Parallel", PORT_TYPE_NUMBER, default = 1) animation_loops = add_input_port("Loops", PORT_TYPE_NUMBER) - stop_all_animations = add_input_port("Stop All Animations", PORT_TYPE_SIGNAL, trigger = .proc/stop_animations) + stop_all_animations = add_input_port("Stop All Animations", PORT_TYPE_SIGNAL, trigger = PROC_REF(stop_animations)) animate_event = add_output_port("Perform Animation", PORT_TYPE_INSTANT_SIGNAL) /obj/item/circuit_component/begin_animation/pre_input_received(datum/port/input/port) diff --git a/code/modules/wiremod/components/admin/input_request.dm b/code/modules/wiremod/components/admin/input_request.dm index b0efdb4ea42..13dfacba357 100644 --- a/code/modules/wiremod/components/admin/input_request.dm +++ b/code/modules/wiremod/components/admin/input_request.dm @@ -53,7 +53,7 @@ if(!istype(player)) return - INVOKE_ASYNC(src, .proc/request_input_from_player, player) + INVOKE_ASYNC(src, PROC_REF(request_input_from_player), player) /obj/item/circuit_component/input_request/proc/request_input_from_player(mob/player) var/new_option = input_options.value diff --git a/code/modules/wiremod/components/admin/proccall.dm b/code/modules/wiremod/components/admin/proccall.dm index 56aa5a3b7b9..56baaee1447 100644 --- a/code/modules/wiremod/components/admin/proccall.dm +++ b/code/modules/wiremod/components/admin/proccall.dm @@ -180,7 +180,7 @@ params = recursive_list_resolve(params) log_admin_circuit("[parent.get_creator()] proccalled '[to_invoke]' on [called_on] with params \[[params.Join(", ")]].") - INVOKE_ASYNC(src, .proc/do_proccall, called_on, to_invoke, params) + INVOKE_ASYNC(src, PROC_REF(do_proccall), called_on, to_invoke, params) /obj/item/circuit_component/proccall/proc/do_proccall(called_on, to_invoke, params) var/result = HandleUserlessProcCall(parent.get_creator(), called_on, to_invoke, params) diff --git a/code/modules/wiremod/components/admin/save_shell.dm b/code/modules/wiremod/components/admin/save_shell.dm index 4727d460baa..768983c9e20 100644 --- a/code/modules/wiremod/components/admin/save_shell.dm +++ b/code/modules/wiremod/components/admin/save_shell.dm @@ -19,8 +19,8 @@ /obj/item/circuit_component/save_shell/add_to(obj/item/integrated_circuit/added_to) . = ..() - RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, .proc/on_post_load) - RegisterSignal(added_to, COMSIG_CIRCUIT_PRE_SAVE_TO_JSON, .proc/on_pre_save_to_json) + RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, PROC_REF(on_post_load)) + RegisterSignal(added_to, COMSIG_CIRCUIT_PRE_SAVE_TO_JSON, PROC_REF(on_pre_save_to_json)) /obj/item/circuit_component/save_shell/removed_from(obj/item/integrated_circuit/removed_from) UnregisterSignal(removed_from, list(COMSIG_CIRCUIT_POST_LOAD, COMSIG_CIRCUIT_PRE_SAVE_TO_JSON)) diff --git a/code/modules/wiremod/components/admin/sdql.dm b/code/modules/wiremod/components/admin/sdql.dm index effa4be8976..548471e20fa 100644 --- a/code/modules/wiremod/components/admin/sdql.dm +++ b/code/modules/wiremod/components/admin/sdql.dm @@ -23,7 +23,7 @@ if(GLOB.AdminProcCaller) return TRUE - INVOKE_ASYNC(src, .proc/execute_sdql, port) + INVOKE_ASYNC(src, PROC_REF(execute_sdql), port) /obj/item/circuit_component/sdql_operation/proc/execute_sdql(datum/port/input/port) var/operation = sdql_operation.value diff --git a/code/modules/wiremod/components/admin/signal_handler/signal_handler.dm b/code/modules/wiremod/components/admin/signal_handler/signal_handler.dm index 326a24e0110..a80ba26794c 100644 --- a/code/modules/wiremod/components/admin/signal_handler/signal_handler.dm +++ b/code/modules/wiremod/components/admin/signal_handler/signal_handler.dm @@ -64,9 +64,9 @@ /obj/item/circuit_component/signal_handler/populate_ports() instant = add_input_port("Instant", PORT_TYPE_NUMBER, order = 0.5, trigger = null, default = 1) - register = add_input_port("Register", PORT_TYPE_SIGNAL, order = 2, trigger = .proc/register_signals) - unregister = add_input_port("Unregister", PORT_TYPE_SIGNAL, order = 2, trigger = .proc/unregister_signals) - unregister_all = add_input_port("Unregister All", PORT_TYPE_SIGNAL, order = 2, trigger = .proc/unregister_signals_all) + register = add_input_port("Register", PORT_TYPE_SIGNAL, order = 2, trigger = PROC_REF(register_signals)) + unregister = add_input_port("Unregister", PORT_TYPE_SIGNAL, order = 2, trigger = PROC_REF(unregister_signals)) + unregister_all = add_input_port("Unregister All", PORT_TYPE_SIGNAL, order = 2, trigger = PROC_REF(unregister_signals_all)) add_source_entity() event_triggered = add_output_port("Triggered", PORT_TYPE_INSTANT_SIGNAL, order = 2) @@ -134,7 +134,7 @@ if(target_datum) log_admin_circuit("[parent.get_creator()] registered the signal '[registered_signal]' on [target_datum]") // We override because an admin may try registering a signal on the same object/datum again, so this prevents any runtimes from occuring - RegisterSignal(target_datum, registered_signal, .proc/handle_signal_received, override = TRUE) + RegisterSignal(target_datum, registered_signal, PROC_REF(handle_signal_received), override = TRUE) registered_entities |= WEAKREF(target_datum) /obj/item/circuit_component/signal_handler/proc/load_new_ports(list/ports_to_load) @@ -148,7 +148,7 @@ signal_ports = ports_to_load for(var/list/data in signal_ports) if(data["is_response"]) - var/datum/port/input/bitflag_input = add_input_port(data["name"], PORT_TYPE_SIGNAL, order = 3, trigger = .proc/handle_bitflag_received) + var/datum/port/input/bitflag_input = add_input_port(data["name"], PORT_TYPE_SIGNAL, order = 3, trigger = PROC_REF(handle_bitflag_received)) input_signal_ports[bitflag_input] = data["bitflag"] else output_signal_ports += add_output_port(data["name"], data["type"], order = 1) diff --git a/code/modules/wiremod/components/atom/hear.dm b/code/modules/wiremod/components/atom/hear.dm index af660d2d67c..9587e1fb385 100644 --- a/code/modules/wiremod/components/atom/hear.dm +++ b/code/modules/wiremod/components/atom/hear.dm @@ -30,7 +30,7 @@ /obj/item/circuit_component/hear/register_shell(atom/movable/shell) if(parent.loc != shell) shell.become_hearing_sensitive(CIRCUIT_HEAR_TRAIT) - RegisterSignal(shell, COMSIG_MOVABLE_HEAR, .proc/on_shell_hear) + RegisterSignal(shell, COMSIG_MOVABLE_HEAR, PROC_REF(on_shell_hear)) /obj/item/circuit_component/hear/unregister_shell(atom/movable/shell) REMOVE_TRAIT(shell, TRAIT_HEARING_SENSITIVE, CIRCUIT_HEAR_TRAIT) diff --git a/code/modules/wiremod/components/bci/hud/counter_overlay.dm b/code/modules/wiremod/components/bci/hud/counter_overlay.dm index 43795b54c1f..d46c34ab047 100644 --- a/code/modules/wiremod/components/bci/hud/counter_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/counter_overlay.dm @@ -34,7 +34,7 @@ /obj/item/circuit_component/counter_overlay/register_shell(atom/movable/shell) if(istype(shell, /obj/item/organ/internal/cyberimp/bci)) bci = shell - RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed) + RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed)) /obj/item/circuit_component/counter_overlay/unregister_shell(atom/movable/shell) bci = null diff --git a/code/modules/wiremod/components/bci/hud/object_overlay.dm b/code/modules/wiremod/components/bci/hud/object_overlay.dm index 7d4bf8e6a8e..ad32a5408cd 100644 --- a/code/modules/wiremod/components/bci/hud/object_overlay.dm +++ b/code/modules/wiremod/components/bci/hud/object_overlay.dm @@ -65,7 +65,7 @@ /obj/item/circuit_component/object_overlay/register_shell(atom/movable/shell) if(istype(shell, /obj/item/organ/internal/cyberimp/bci)) bci = shell - RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed) + RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed)) /obj/item/circuit_component/object_overlay/unregister_shell(atom/movable/shell) bci = null diff --git a/code/modules/wiremod/components/bci/hud/target_intercept.dm b/code/modules/wiremod/components/bci/hud/target_intercept.dm index 4fb3c3585ea..1cd2ff997dc 100644 --- a/code/modules/wiremod/components/bci/hud/target_intercept.dm +++ b/code/modules/wiremod/components/bci/hud/target_intercept.dm @@ -25,7 +25,7 @@ /obj/item/circuit_component/target_intercept/register_shell(atom/movable/shell) if(istype(shell, /obj/item/organ/internal/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/bci/thought_listener.dm b/code/modules/wiremod/components/bci/thought_listener.dm index 7c41c56e0e7..53d50f9c54b 100644 --- a/code/modules/wiremod/components/bci/thought_listener.dm +++ b/code/modules/wiremod/components/bci/thought_listener.dm @@ -52,7 +52,7 @@ failure.set_output(COMPONENT_SIGNAL) return - INVOKE_ASYNC(src, .proc/thought_listen, owner) + INVOKE_ASYNC(src, PROC_REF(thought_listen), owner) ready = FALSE /obj/item/circuit_component/thought_listener/proc/thought_listen(mob/living/owner) diff --git a/code/modules/wiremod/components/id/access_checker.dm b/code/modules/wiremod/components/id/access_checker.dm index fe8abbb9993..31390e24aa2 100644 --- a/code/modules/wiremod/components/id/access_checker.dm +++ b/code/modules/wiremod/components/id/access_checker.dm @@ -36,7 +36,7 @@ /obj/item/circuit_component/compare/access/add_to(obj/item/integrated_circuit/added_to) . = ..() - RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, .proc/on_post_load) + RegisterSignal(added_to, COMSIG_CIRCUIT_POST_LOAD, PROC_REF(on_post_load)) /obj/item/circuit_component/compare/access/removed_from(obj/item/integrated_circuit/removed_from) UnregisterSignal(removed_from, COMSIG_CIRCUIT_POST_LOAD) diff --git a/code/modules/wiremod/components/list/filter.dm b/code/modules/wiremod/components/list/filter.dm index eddcb4e5b50..1e1756c60fd 100644 --- a/code/modules/wiremod/components/list/filter.dm +++ b/code/modules/wiremod/components/list/filter.dm @@ -49,7 +49,7 @@ /obj/item/circuit_component/filter_list/populate_ports() list_to_filter = add_input_port("List Input", PORT_TYPE_LIST(PORT_TYPE_ANY)) - accept_entry = add_input_port("Accept Entry", PORT_TYPE_SIGNAL, trigger = .proc/accept_entry_port) + accept_entry = add_input_port("Accept Entry", PORT_TYPE_SIGNAL, trigger = PROC_REF(accept_entry_port)) element = add_output_port("Element", PORT_TYPE_ANY) current_index = add_output_port("Index", PORT_TYPE_NUMBER) diff --git a/code/modules/wiremod/components/list/foreach.dm b/code/modules/wiremod/components/list/foreach.dm index 78324bf566a..a3728192960 100644 --- a/code/modules/wiremod/components/list/foreach.dm +++ b/code/modules/wiremod/components/list/foreach.dm @@ -41,8 +41,8 @@ /obj/item/circuit_component/foreach/populate_ports() list_to_iterate = add_input_port("List Input", PORT_TYPE_LIST(PORT_TYPE_ANY)) - next_index = add_input_port("Next Index", PORT_TYPE_SIGNAL, trigger = .proc/trigger_next_index) - reset_index = add_input_port("Reset And Trigger", PORT_TYPE_SIGNAL, trigger = .proc/restart) + next_index = add_input_port("Next Index", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_next_index)) + reset_index = add_input_port("Reset And Trigger", PORT_TYPE_SIGNAL, trigger = PROC_REF(restart)) element = add_output_port("Element", PORT_TYPE_ANY) current_index = add_output_port("Index", PORT_TYPE_NUMBER) diff --git a/code/modules/wiremod/components/ntnet/ntnet_receive.dm b/code/modules/wiremod/components/ntnet/ntnet_receive.dm index 1fe5d40b847..8e6addc1736 100644 --- a/code/modules/wiremod/components/ntnet/ntnet_receive.dm +++ b/code/modules/wiremod/components/ntnet/ntnet_receive.dm @@ -29,7 +29,7 @@ /obj/item/circuit_component/ntnet_receive/populate_ports() data_package = add_output_port("Data Package", PORT_TYPE_LIST(PORT_TYPE_ANY)) enc_key = add_input_port("Encryption Key", PORT_TYPE_STRING) - RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, .proc/ntnet_receive) + RegisterSignal(src, COMSIG_COMPONENT_NTNET_RECEIVE, PROC_REF(ntnet_receive)) /obj/item/circuit_component/ntnet_receive/pre_input_received(datum/port/input/port) if(port == list_options) diff --git a/code/modules/wiremod/components/utility/delay.dm b/code/modules/wiremod/components/utility/delay.dm index 5db2f327365..a1e317d6fa8 100644 --- a/code/modules/wiremod/components/utility/delay.dm +++ b/code/modules/wiremod/components/utility/delay.dm @@ -25,8 +25,8 @@ /obj/item/circuit_component/delay/populate_ports() delay_amount = add_input_port("Delay", PORT_TYPE_NUMBER, trigger = null) - trigger = add_input_port("Trigger", PORT_TYPE_SIGNAL, trigger = .proc/trigger_delay) - interrupt = add_input_port("Interrupt", PORT_TYPE_SIGNAL, trigger = .proc/interrupt_timer) + trigger = add_input_port("Trigger", PORT_TYPE_SIGNAL, trigger = PROC_REF(trigger_delay)) + interrupt = add_input_port("Interrupt", PORT_TYPE_SIGNAL, trigger = PROC_REF(interrupt_timer)) output = add_output_port("Result", PORT_TYPE_SIGNAL) @@ -35,7 +35,7 @@ var/delay = delay_amount.value if(delay > COMP_DELAY_MIN_VALUE) // Convert delay into deciseconds - timer_id = addtimer(CALLBACK(output, /datum/port/output.proc/set_output, trigger.value), delay*10, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_OVERRIDE) + timer_id = addtimer(CALLBACK(output, TYPE_PROC_REF(/datum/port/output, set_output), trigger.value), delay*10, TIMER_UNIQUE|TIMER_STOPPABLE|TIMER_OVERRIDE) else if(timer_id != TIMER_ID_NULL) deltimer(timer_id) diff --git a/code/modules/wiremod/core/component.dm b/code/modules/wiremod/core/component.dm index 19ad27da45a..12e4655c243 100644 --- a/code/modules/wiremod/core/component.dm +++ b/code/modules/wiremod/core/component.dm @@ -71,7 +71,7 @@ return /// Extension of add_input_port. Simplifies the code to make an option port to reduce boilerplate -/obj/item/circuit_component/proc/add_option_port(name, list/list_to_use, order = 0, trigger = .proc/input_received) +/obj/item/circuit_component/proc/add_option_port(name, list/list_to_use, order = 0, trigger = PROC_REF(input_received)) return add_input_port(name, PORT_TYPE_OPTION, order = order, trigger = trigger, port_type = /datum/port/input/option, extra_args = list("possible_options" = list_to_use)) /obj/item/circuit_component/Initialize(mapload) @@ -151,14 +151,14 @@ * * type - The datatype it handles * * trigger - Whether this input port triggers an update on the component when updated. */ -/obj/item/circuit_component/proc/add_input_port(name, type, order = 1, trigger = .proc/input_received, default = null, port_type = /datum/port/input, extra_args = null) +/obj/item/circuit_component/proc/add_input_port(name, type, order = 1, trigger = PROC_REF(input_received), default = null, port_type = /datum/port/input, extra_args = null) var/list/arguments = list(src) arguments += args if(extra_args) arguments += extra_args var/datum/port/input/input_port = new port_type(arglist(arguments)) input_ports += input_port - sortTim(input_ports, /proc/cmp_port_order_asc) + sortTim(input_ports, GLOBAL_PROC_REF(cmp_port_order_asc)) if(parent) SStgui.update_uis(parent) return input_port @@ -187,7 +187,7 @@ arguments += args var/datum/port/output/output_port = new(arglist(arguments)) output_ports += output_port - sortTim(output_ports, /proc/cmp_port_order_asc) + sortTim(output_ports, GLOBAL_PROC_REF(cmp_port_order_asc)) if(parent) SStgui.update_uis(parent) return output_port @@ -270,7 +270,7 @@ if(!cell?.use(power_usage_per_input)) return FALSE - if((!port || port.trigger == .proc/input_received) && (circuit_flags & CIRCUIT_FLAG_INPUT_SIGNAL) && !COMPONENT_TRIGGERED_BY(trigger_input, port)) + if((!port || port.trigger == PROC_REF(input_received)) && (circuit_flags & CIRCUIT_FLAG_INPUT_SIGNAL) && !COMPONENT_TRIGGERED_BY(trigger_input, port)) return FALSE return TRUE diff --git a/code/modules/wiremod/core/component_printer.dm b/code/modules/wiremod/core/component_printer.dm index 746fddc3ff8..139d3b91779 100644 --- a/code/modules/wiremod/core/component_printer.dm +++ b/code/modules/wiremod/core/component_printer.dm @@ -29,8 +29,8 @@ current_unlocked_designs[design.build_path] = design.id - RegisterSignal(techweb, COMSIG_TECHWEB_ADD_DESIGN, .proc/on_research) - RegisterSignal(techweb, COMSIG_TECHWEB_REMOVE_DESIGN, .proc/on_removed) + RegisterSignal(techweb, COMSIG_TECHWEB_ADD_DESIGN, PROC_REF(on_research)) + RegisterSignal(techweb, COMSIG_TECHWEB_REMOVE_DESIGN, PROC_REF(on_removed)) materials = AddComponent( \ /datum/component/remote_materials, \ @@ -348,7 +348,7 @@ /obj/machinery/module_duplicator/proc/print_module(list/design) flick("module-fab-print", src) - addtimer(CALLBACK(src, .proc/finish_module_print, design), 1.6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(finish_module_print), design), 1.6 SECONDS) /obj/machinery/module_duplicator/proc/finish_module_print(list/design) var/atom/movable/created_atom @@ -412,7 +412,7 @@ return ..() flick("module-fab-scan", src) - addtimer(CALLBACK(src, .proc/finish_module_scan, user, data), 1.4 SECONDS) + addtimer(CALLBACK(src, PROC_REF(finish_module_scan), user, data), 1.4 SECONDS) /obj/machinery/module_duplicator/proc/finish_module_scan(mob/user, data) scanned_designs += list(data) diff --git a/code/modules/wiremod/core/integrated_circuit.dm b/code/modules/wiremod/core/integrated_circuit.dm index 9caf07da840..4b3beee4296 100644 --- a/code/modules/wiremod/core/integrated_circuit.dm +++ b/code/modules/wiremod/core/integrated_circuit.dm @@ -88,7 +88,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) . = ..() @@ -184,7 +184,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 @@ -245,7 +245,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) to_add.parent = src attached_components += to_add current_size += to_add.circuit_size - RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, .proc/component_move_handler) + RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, PROC_REF(component_move_handler)) SStgui.update_uis(src) if(shell) @@ -605,7 +605,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) component.variable_name.set_input(params["variable"]) component.rel_x = text2num(params["rel_x"]) component.rel_y = text2num(params["rel_y"]) - RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_REMOVED, .proc/clear_setter_or_getter) + RegisterSignal(component, COMSIG_CIRCUIT_COMPONENT_REMOVED, PROC_REF(clear_setter_or_getter)) setter_and_getter_count++ return TRUE if("move_screen") diff --git a/code/modules/wiremod/core/marker.dm b/code/modules/wiremod/core/marker.dm index 82d34be37a7..193699dd082 100644 --- a/code/modules/wiremod/core/marker.dm +++ b/code/modules/wiremod/core/marker.dm @@ -34,7 +34,7 @@ say("Marked [target].") marked_atom = target - RegisterSignal(marked_atom, COMSIG_PARENT_QDELETING, .proc/cleanup_marked_atom) + RegisterSignal(marked_atom, COMSIG_PARENT_QDELETING, PROC_REF(cleanup_marked_atom)) update_icon() flick("multitool_circuit_flick", src) playsound(src.loc, 'sound/misc/compiler-stage2.ogg', 30, TRUE) diff --git a/code/modules/wiremod/core/port.dm b/code/modules/wiremod/core/port.dm index b43f9b4a0d9..7418a4501f2 100644 --- a/code/modules/wiremod/core/port.dm +++ b/code/modules/wiremod/core/port.dm @@ -58,7 +58,7 @@ else src.value = datatype_handler.convert_value(src, value, force) if(isdatum(value)) - RegisterSignal(value, COMSIG_PARENT_QDELETING, .proc/null_value) + RegisterSignal(value, COMSIG_PARENT_QDELETING, PROC_REF(null_value)) SEND_SIGNAL(src, COMSIG_PORT_SET_VALUE, value) /** @@ -186,9 +186,9 @@ if(output in connected_ports) return connected_ports += output - RegisterSignal(output, COMSIG_PORT_SET_VALUE, .proc/receive_value) - RegisterSignal(output, COMSIG_PORT_SET_TYPE, .proc/check_type) - RegisterSignal(output, COMSIG_PORT_DISCONNECT, .proc/disconnect) + RegisterSignal(output, COMSIG_PORT_SET_VALUE, PROC_REF(receive_value)) + RegisterSignal(output, COMSIG_PORT_SET_TYPE, PROC_REF(check_type)) + RegisterSignal(output, COMSIG_PORT_DISCONNECT, PROC_REF(disconnect)) // For signals, we don't update the input to prevent sending a signal when connecting ports. if(!(datatype_handler.datatype_flags & DATATYPE_FLAG_AVOID_VALUE_UPDATE)) set_input(output.value) @@ -223,7 +223,7 @@ */ /datum/port/input/proc/receive_value(datum/port/output/output, value) SIGNAL_HANDLER - SScircuit_component.add_callback(src, CALLBACK(src, .proc/set_input, value)) + SScircuit_component.add_callback(src, CALLBACK(src, PROC_REF(set_input), value)) /// Signal handler proc to null the input if an atom is deleted. An update is not sent because this was not set by anything. /datum/port/proc/null_value(datum/source) diff --git a/code/modules/wiremod/core/usb_cable.dm b/code/modules/wiremod/core/usb_cable.dm index f46fe91d5c9..c636037bb15 100644 --- a/code/modules/wiremod/core/usb_cable.dm +++ b/code/modules/wiremod/core/usb_cable.dm @@ -21,7 +21,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) . = ..() @@ -87,9 +87,9 @@ return OXYLOSS /obj/item/usb_cable/proc/register_circuit_signals() - RegisterSignal(attached_circuit, COMSIG_MOVABLE_MOVED, .proc/on_moved) - RegisterSignal(attached_circuit, COMSIG_PARENT_QDELETING, .proc/on_circuit_qdeling) - RegisterSignal(attached_circuit.shell, COMSIG_MOVABLE_MOVED, .proc/on_moved) + RegisterSignal(attached_circuit, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) + RegisterSignal(attached_circuit, COMSIG_PARENT_QDELETING, PROC_REF(on_circuit_qdeling)) + RegisterSignal(attached_circuit.shell, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) /obj/item/usb_cable/proc/unregister_circuit_signals(obj/item/integrated_circuit/old_circuit) UnregisterSignal(attached_circuit, list( diff --git a/code/modules/wiremod/core/variable.dm b/code/modules/wiremod/core/variable.dm index 2bebc4e7e89..b39e8161ee7 100644 --- a/code/modules/wiremod/core/variable.dm +++ b/code/modules/wiremod/core/variable.dm @@ -45,7 +45,7 @@ /// Adds a listener to receive inputs when the variable has a value that is set. /datum/circuit_variable/proc/add_listener(obj/item/circuit_component/to_add) listeners += to_add - RegisterSignal(to_add, COMSIG_PARENT_QDELETING, .proc/on_listener_qdel) + RegisterSignal(to_add, COMSIG_PARENT_QDELETING, PROC_REF(on_listener_qdel)) /// Removes a listener to receive inputs when the variable has a value that is set. Listener will usually clean themselves up /datum/circuit_variable/proc/remove_listener(obj/item/circuit_component/to_remove) diff --git a/code/modules/wiremod/dcs_components/component_add_port.dm b/code/modules/wiremod/dcs_components/component_add_port.dm index f7c192aa5cf..4327757c17f 100644 --- a/code/modules/wiremod/dcs_components/component_add_port.dm +++ b/code/modules/wiremod/dcs_components/component_add_port.dm @@ -40,9 +40,9 @@ port_list += add_port() /datum/component/circuit_component_add_port/RegisterWithParent() - RegisterSignal(parent, COMSIG_CIRCUIT_COMPONENT_PERFORM_ACTION, .proc/on_action) - RegisterSignal(parent, COMSIG_CIRCUIT_COMPONENT_SAVE_DATA, .proc/on_data_saved) - RegisterSignal(parent, COMSIG_CIRCUIT_COMPONENT_LOAD_DATA, .proc/on_data_loaded) + RegisterSignal(parent, COMSIG_CIRCUIT_COMPONENT_PERFORM_ACTION, PROC_REF(on_action)) + RegisterSignal(parent, COMSIG_CIRCUIT_COMPONENT_SAVE_DATA, PROC_REF(on_data_saved)) + RegisterSignal(parent, COMSIG_CIRCUIT_COMPONENT_LOAD_DATA, PROC_REF(on_data_loaded)) /datum/component/circuit_component_add_port/UnregisterFromParent() UnregisterSignal(parent, list( diff --git a/code/modules/wiremod/shell/airlock.dm b/code/modules/wiremod/shell/airlock.dm index e04f63ce7c7..a1261f543a2 100644 --- a/code/modules/wiremod/shell/airlock.dm +++ b/code/modules/wiremod/shell/airlock.dm @@ -88,9 +88,9 @@ . = ..() if(istype(shell, /obj/machinery/door/airlock)) attached_airlock = shell - RegisterSignal(shell, COMSIG_AIRLOCK_SET_BOLT, .proc/on_airlock_set_bolted) - RegisterSignal(shell, COMSIG_AIRLOCK_OPEN, .proc/on_airlock_open) - RegisterSignal(shell, COMSIG_AIRLOCK_CLOSE, .proc/on_airlock_closed) + RegisterSignal(shell, COMSIG_AIRLOCK_SET_BOLT, PROC_REF(on_airlock_set_bolted)) + RegisterSignal(shell, COMSIG_AIRLOCK_OPEN, PROC_REF(on_airlock_open)) + RegisterSignal(shell, COMSIG_AIRLOCK_CLOSE, PROC_REF(on_airlock_closed)) /obj/item/circuit_component/airlock/unregister_shell(atom/movable/shell) attached_airlock = null @@ -129,9 +129,9 @@ if(COMPONENT_TRIGGERED_BY(unbolt, port)) attached_airlock.unbolt() if(COMPONENT_TRIGGERED_BY(open, port) && attached_airlock.density) - INVOKE_ASYNC(attached_airlock, /obj/machinery/door/airlock.proc/open) + INVOKE_ASYNC(attached_airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, open)) if(COMPONENT_TRIGGERED_BY(close, port) && !attached_airlock.density) - INVOKE_ASYNC(attached_airlock, /obj/machinery/door/airlock.proc/close) + INVOKE_ASYNC(attached_airlock, TYPE_PROC_REF(/obj/machinery/door/airlock, close)) /obj/item/circuit_component/airlock_access_event @@ -159,7 +159,7 @@ RegisterSignal(shell, list( COMSIG_OBJ_ALLOWED, COMSIG_AIRLOCK_SHELL_ALLOWED, - ), .proc/handle_allowed) + ), PROC_REF(handle_allowed)) /obj/item/circuit_component/airlock_access_event/unregister_shell(atom/movable/shell) attached_airlock = null @@ -171,7 +171,7 @@ /obj/item/circuit_component/airlock_access_event/populate_ports() - open_airlock = add_input_port("Should Open Airlock", PORT_TYPE_RESPONSE_SIGNAL, trigger = .proc/should_open_airlock) + open_airlock = add_input_port("Should Open Airlock", PORT_TYPE_RESPONSE_SIGNAL, trigger = PROC_REF(should_open_airlock)) accessing_entity = add_output_port("Accessing Entity", PORT_TYPE_ATOM) event_triggered = add_output_port("Event Triggered", PORT_TYPE_INSTANT_SIGNAL) diff --git a/code/modules/wiremod/shell/assembly.dm b/code/modules/wiremod/shell/assembly.dm index 5bb25f73a17..35114f8dd74 100644 --- a/code/modules/wiremod/shell/assembly.dm +++ b/code/modules/wiremod/shell/assembly.dm @@ -34,7 +34,7 @@ signal = add_output_port("Signal", PORT_TYPE_SIGNAL) /obj/item/circuit_component/assembly_input/register_shell(atom/movable/shell) - RegisterSignal(shell, list(COMSIG_ASSEMBLY_PULSED, COMSIG_ITEM_ATTACK_SELF), .proc/on_pulsed) + RegisterSignal(shell, list(COMSIG_ASSEMBLY_PULSED, COMSIG_ITEM_ATTACK_SELF), PROC_REF(on_pulsed)) /obj/item/circuit_component/assembly_input/unregister_shell(atom/movable/shell) UnregisterSignal(shell, list(COMSIG_ASSEMBLY_PULSED, COMSIG_ITEM_ATTACK_SELF)) diff --git a/code/modules/wiremod/shell/bot.dm b/code/modules/wiremod/shell/bot.dm index 43d66060e8a..463dd52cc05 100644 --- a/code/modules/wiremod/shell/bot.dm +++ b/code/modules/wiremod/shell/bot.dm @@ -35,7 +35,7 @@ signal = add_output_port("Signal", PORT_TYPE_SIGNAL) /obj/item/circuit_component/bot/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) + RegisterSignal(shell, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) /obj/item/circuit_component/bot/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_ATOM_ATTACK_HAND) diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index ad16c38fa8b..e0e9d6639a1 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -123,8 +123,8 @@ charge_action = new(src) bci.actions += list(charge_action) - RegisterSignal(shell, COMSIG_ORGAN_IMPLANTED, .proc/on_organ_implanted) - RegisterSignal(shell, COMSIG_ORGAN_REMOVED, .proc/on_organ_removed) + RegisterSignal(shell, COMSIG_ORGAN_IMPLANTED, PROC_REF(on_organ_implanted)) + RegisterSignal(shell, COMSIG_ORGAN_REMOVED, PROC_REF(on_organ_removed)) /obj/item/circuit_component/bci_core/unregister_shell(atom/movable/shell) var/obj/item/organ/internal/cyberimp/bci/bci = shell @@ -162,9 +162,9 @@ user_port.set_output(owner) user = WEAKREF(owner) - RegisterSignal(owner, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, .proc/on_borg_charge) - RegisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT, .proc/on_electrocute) + RegisterSignal(owner, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(owner, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge)) + RegisterSignal(owner, COMSIG_LIVING_ELECTROCUTE_ACT, PROC_REF(on_electrocute)) /obj/item/circuit_component/bci_core/proc/on_organ_removed(datum/source, mob/living/carbon/owner) SIGNAL_HANDLER @@ -404,9 +404,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) update_use_power(IDLE_POWER_USE) @@ -457,7 +457,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 bd8c3851fef..ef9168c3b17 100644 --- a/code/modules/wiremod/shell/compact_remote.dm +++ b/code/modules/wiremod/shell/compact_remote.dm @@ -34,7 +34,7 @@ signal = add_output_port("Signal", PORT_TYPE_SIGNAL) /obj/item/circuit_component/compact_remote/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, .proc/send_trigger) + RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, PROC_REF(send_trigger)) /obj/item/circuit_component/compact_remote/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_ITEM_ATTACK_SELF) diff --git a/code/modules/wiremod/shell/controller.dm b/code/modules/wiremod/shell/controller.dm index 7aef7d02f0a..546de578327 100644 --- a/code/modules/wiremod/shell/controller.dm +++ b/code/modules/wiremod/shell/controller.dm @@ -40,9 +40,9 @@ right = add_output_port("Extra Signal", PORT_TYPE_SIGNAL) /obj/item/circuit_component/controller/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, .proc/send_trigger) - RegisterSignal(shell, COMSIG_CLICK_ALT, .proc/send_alternate_signal) - RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF_SECONDARY, .proc/send_right_signal) + RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF, PROC_REF(send_trigger)) + RegisterSignal(shell, COMSIG_CLICK_ALT, PROC_REF(send_alternate_signal)) + RegisterSignal(shell, COMSIG_ITEM_ATTACK_SELF_SECONDARY, PROC_REF(send_right_signal)) /obj/item/circuit_component/controller/unregister_shell(atom/movable/shell) UnregisterSignal(shell, list( diff --git a/code/modules/wiremod/shell/dispenser.dm b/code/modules/wiremod/shell/dispenser.dm index d8fcfce622c..92b66f0a7ba 100644 --- a/code/modules/wiremod/shell/dispenser.dm +++ b/code/modules/wiremod/shell/dispenser.dm @@ -32,8 +32,8 @@ balloon_alert(user, "inserted item") stored_items += to_add to_add.forceMove(src) - RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, .proc/handle_stored_item_moved) - RegisterSignal(to_add, COMSIG_PARENT_QDELETING, .proc/handle_stored_item_deleted) + RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, PROC_REF(handle_stored_item_moved)) + RegisterSignal(to_add, COMSIG_PARENT_QDELETING, PROC_REF(handle_stored_item_deleted)) SEND_SIGNAL(src, COMSIG_DISPENSERBOT_ADD_ITEM, to_add) /obj/structure/dispenser_bot/proc/handle_stored_item_moved(obj/item/moving_item, atom/location) @@ -123,8 +123,8 @@ /obj/item/circuit_component/dispenser_bot/register_shell(atom/movable/shell) . = ..() - RegisterSignal(shell, COMSIG_DISPENSERBOT_ADD_ITEM, .proc/on_shell_add_item) - RegisterSignal(shell, COMSIG_DISPENSERBOT_REMOVE_ITEM, .proc/on_shell_remove_item) + RegisterSignal(shell, COMSIG_DISPENSERBOT_ADD_ITEM, PROC_REF(on_shell_add_item)) + RegisterSignal(shell, COMSIG_DISPENSERBOT_REMOVE_ITEM, PROC_REF(on_shell_remove_item)) /obj/item/circuit_component/dispenser_bot/unregister_shell(atom/movable/shell) UnregisterSignal(shell, list( @@ -167,7 +167,7 @@ RegisterSignal(vendor_component, list( COMSIG_PARENT_QDELETING, COMSIG_CIRCUIT_COMPONENT_REMOVED, - ), .proc/remove_vendor_component) + ), PROC_REF(remove_vendor_component)) /obj/item/circuit_component/vendor_component display_name = "Vend" @@ -195,7 +195,7 @@ /obj/item/circuit_component/vendor_component/populate_ports() item_to_vend = add_input_port("Item", PORT_TYPE_ATOM, trigger = null) - vend_item = add_input_port("Vend Item", PORT_TYPE_SIGNAL, trigger = .proc/vend_item) + vend_item = add_input_port("Vend Item", PORT_TYPE_SIGNAL, trigger = PROC_REF(vend_item)) /obj/item/circuit_component/vendor_component/proc/vend_item(datum/port/input/port, list/return_values) CIRCUIT_TRIGGER diff --git a/code/modules/wiremod/shell/drone.dm b/code/modules/wiremod/shell/drone.dm index c5ea47e189a..8688ada7ef7 100644 --- a/code/modules/wiremod/shell/drone.dm +++ b/code/modules/wiremod/shell/drone.dm @@ -68,7 +68,7 @@ /obj/item/circuit_component/bot_circuit/register_shell(atom/movable/shell) . = ..() if(ismob(shell)) - RegisterSignal(shell, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, .proc/on_borg_charge) + RegisterSignal(shell, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, PROC_REF(on_borg_charge)) /obj/item/circuit_component/bot_circuit/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_PROCESS_BORGCHARGER_OCCUPANT) diff --git a/code/modules/wiremod/shell/gun.dm b/code/modules/wiremod/shell/gun.dm index 5851ee8eeb3..a258139cd47 100644 --- a/code/modules/wiremod/shell/gun.dm +++ b/code/modules/wiremod/shell/gun.dm @@ -56,9 +56,9 @@ signal = add_output_port("Shot", PORT_TYPE_SIGNAL) /obj/item/circuit_component/wiremod_gun/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_PROJECTILE_ON_HIT, .proc/handle_shot) + RegisterSignal(shell, COMSIG_PROJECTILE_ON_HIT, PROC_REF(handle_shot)) if(istype(shell, /obj/item/gun/energy)) - RegisterSignal(shell, COMSIG_GUN_CHAMBER_PROCESSED, .proc/handle_chamber) + RegisterSignal(shell, COMSIG_GUN_CHAMBER_PROCESSED, PROC_REF(handle_chamber)) /obj/item/circuit_component/wiremod_gun/unregister_shell(atom/movable/shell) UnregisterSignal(shell, list(COMSIG_PROJECTILE_ON_HIT, COMSIG_GUN_CHAMBER_PROCESSED)) diff --git a/code/modules/wiremod/shell/keyboard.dm b/code/modules/wiremod/shell/keyboard.dm index be7f0a531c8..cb15d710c07 100644 --- a/code/modules/wiremod/shell/keyboard.dm +++ b/code/modules/wiremod/shell/keyboard.dm @@ -33,7 +33,7 @@ /obj/item/circuit_component/keyboard_shell/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/keyboard_shell/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_ITEM_ATTACK_SELF) @@ -41,7 +41,7 @@ /obj/item/circuit_component/keyboard_shell/proc/send_trigger(atom/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/use_keyboard, user) + INVOKE_ASYNC(src, PROC_REF(use_keyboard), user) /obj/item/circuit_component/keyboard_shell/proc/use_keyboard(mob/user) if(HAS_TRAIT(user, TRAIT_ILLITERATE)) diff --git a/code/modules/wiremod/shell/module.dm b/code/modules/wiremod/shell/module.dm index 81b767a5b78..5c269e8c7e8 100644 --- a/code/modules/wiremod/shell/module.dm +++ b/code/modules/wiremod/shell/module.dm @@ -25,7 +25,7 @@ /obj/item/mod/module/circuit/on_install() if(!shell?.attached_circuit) return - RegisterSignal(shell?.attached_circuit, COMSIG_CIRCUIT_PRE_POWER_USAGE, .proc/override_power_usage) + RegisterSignal(shell?.attached_circuit, COMSIG_CIRCUIT_PRE_POWER_USAGE, PROC_REF(override_power_usage)) /obj/item/mod/module/circuit/on_uninstall(deleting = FALSE) if(!shell?.attached_circuit) @@ -137,7 +137,7 @@ . = ..() if(istype(shell, /obj/item/mod/module)) attached_module = shell - RegisterSignal(attached_module, COMSIG_MOVABLE_MOVED, .proc/on_move) + RegisterSignal(attached_module, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) /obj/item/circuit_component/mod_adapter_core/unregister_shell(atom/movable/shell) if(attached_module) @@ -153,23 +153,23 @@ if(potential_module.name == module_to_select.value) module = potential_module if(COMPONENT_TRIGGERED_BY(toggle_suit, port)) - INVOKE_ASYNC(attached_module.mod, /obj/item/mod/control.proc/toggle_activate, attached_module.mod.wearer) + INVOKE_ASYNC(attached_module.mod, TYPE_PROC_REF(/obj/item/mod/control, toggle_activate), attached_module.mod.wearer) if(COMPONENT_TRIGGERED_BY(toggle_deploy, port)) - INVOKE_ASYNC(attached_module.mod, /obj/item/mod/control.proc/quick_deploy, attached_module.mod.wearer) + INVOKE_ASYNC(attached_module.mod, TYPE_PROC_REF(/obj/item/mod/control, quick_deploy), attached_module.mod.wearer) if(attached_module.mod.active && module && COMPONENT_TRIGGERED_BY(select_module, port)) - INVOKE_ASYNC(module, /obj/item/mod/module.proc/on_select) + INVOKE_ASYNC(module, TYPE_PROC_REF(/obj/item/mod/module, on_select)) /obj/item/circuit_component/mod_adapter_core/proc/on_move(atom/movable/source, atom/old_loc, dir, forced) SIGNAL_HANDLER if(istype(source.loc, /obj/item/mod/control)) var/obj/item/mod/control/mod = source.loc - RegisterSignal(mod, COMSIG_MOD_MODULE_SELECTED, .proc/on_module_select) - RegisterSignal(mod, COMSIG_MOD_DEPLOYED, .proc/on_mod_part_toggled) - RegisterSignal(mod, COMSIG_MOD_RETRACTED, .proc/on_mod_part_toggled) - RegisterSignal(mod, COMSIG_MOD_TOGGLED, .proc/on_mod_toggled) - RegisterSignal(mod, COMSIG_MOD_MODULE_ADDED, .proc/on_module_changed) - RegisterSignal(mod, COMSIG_MOD_MODULE_REMOVED, .proc/on_module_changed) - RegisterSignal(mod, COMSIG_ITEM_EQUIPPED, .proc/equip_check) + RegisterSignal(mod, COMSIG_MOD_MODULE_SELECTED, PROC_REF(on_module_select)) + RegisterSignal(mod, COMSIG_MOD_DEPLOYED, PROC_REF(on_mod_part_toggled)) + RegisterSignal(mod, COMSIG_MOD_RETRACTED, PROC_REF(on_mod_part_toggled)) + RegisterSignal(mod, COMSIG_MOD_TOGGLED, PROC_REF(on_mod_toggled)) + RegisterSignal(mod, COMSIG_MOD_MODULE_ADDED, PROC_REF(on_module_changed)) + RegisterSignal(mod, COMSIG_MOD_MODULE_REMOVED, PROC_REF(on_module_changed)) + RegisterSignal(mod, COMSIG_ITEM_EQUIPPED, PROC_REF(equip_check)) wearer.set_output(mod.wearer) var/modules_list = list() for(var/obj/item/mod/module/module in mod.modules) diff --git a/code/modules/wiremod/shell/moneybot.dm b/code/modules/wiremod/shell/moneybot.dm index 50474b91b0a..2ee9cf6fa02 100644 --- a/code/modules/wiremod/shell/moneybot.dm +++ b/code/modules/wiremod/shell/moneybot.dm @@ -103,9 +103,9 @@ if(istype(shell, /obj/structure/money_bot)) attached_bot = shell total_money.set_output(attached_bot.stored_money) - RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, .proc/handle_money_insert) - RegisterSignal(shell, COMSIG_MONEYBOT_ADD_MONEY, .proc/handle_money_update) - RegisterSignal(parent, COMSIG_CIRCUIT_SET_LOCKED, .proc/on_set_locked) + RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_money_insert)) + RegisterSignal(shell, COMSIG_MONEYBOT_ADD_MONEY, PROC_REF(handle_money_update)) + RegisterSignal(parent, COMSIG_CIRCUIT_SET_LOCKED, PROC_REF(on_set_locked)) attached_bot.locked = parent.locked /obj/item/circuit_component/money_bot/unregister_shell(atom/movable/shell) diff --git a/code/modules/wiremod/shell/scanner.dm b/code/modules/wiremod/shell/scanner.dm index 363eb34e18f..4d3a3d1ef73 100644 --- a/code/modules/wiremod/shell/scanner.dm +++ b/code/modules/wiremod/shell/scanner.dm @@ -41,7 +41,7 @@ signal = add_output_port("Scanned", PORT_TYPE_SIGNAL) /obj/item/circuit_component/wiremod_scanner/register_shell(atom/movable/shell) - RegisterSignal(shell, COMSIG_ITEM_AFTERATTACK, .proc/handle_afterattack) + RegisterSignal(shell, COMSIG_ITEM_AFTERATTACK, PROC_REF(handle_afterattack)) /obj/item/circuit_component/wiremod_scanner/unregister_shell(atom/movable/shell) UnregisterSignal(shell, COMSIG_ITEM_AFTERATTACK) diff --git a/code/modules/wiremod/shell/scanner_gate.dm b/code/modules/wiremod/shell/scanner_gate.dm index 7c40e8bfaf4..245b8525dfe 100644 --- a/code/modules/wiremod/shell/scanner_gate.dm +++ b/code/modules/wiremod/shell/scanner_gate.dm @@ -9,7 +9,7 @@ . = ..() set_scanline("passive") var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -34,7 +34,7 @@ cut_overlays() add_overlay(type) if(duration) - addtimer(CALLBACK(src, .proc/set_scanline, "passive"), duration, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(set_scanline), "passive"), duration, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_STOPPABLE) /obj/item/circuit_component/scanner_gate display_name = "Scanner Gate" @@ -52,8 +52,8 @@ . = ..() if(istype(shell, /obj/structure/scanner_gate_shell)) attached_gate = shell - RegisterSignal(attached_gate, COMSIG_SCANGATE_SHELL_PASS, .proc/on_trigger) - RegisterSignal(parent, COMSIG_CIRCUIT_SET_LOCKED, .proc/on_set_locked) + RegisterSignal(attached_gate, COMSIG_SCANGATE_SHELL_PASS, PROC_REF(on_trigger)) + RegisterSignal(parent, COMSIG_CIRCUIT_SET_LOCKED, PROC_REF(on_set_locked)) attached_gate.locked = parent.locked /obj/item/circuit_component/scanner_gate/unregister_shell(atom/movable/shell) diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm index c4f9552c815..fe15a073024 100644 --- a/code/modules/zombie/organs.dm +++ b/code/modules/zombie/organs.dm @@ -65,7 +65,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, owner), revive_time, flags) + timer_id = addtimer(CALLBACK(src, PROC_REF(zombify), owner), revive_time, flags) /obj/item/organ/internal/zombie_infection/proc/zombify(mob/living/carbon/target) timer_id = null diff --git a/modular_skyrat/master_files/code/controllers/subsystem/dbcore.dm b/modular_skyrat/master_files/code/controllers/subsystem/dbcore.dm index 22f7c66e21b..1d83fb8361e 100644 --- a/modular_skyrat/master_files/code/controllers/subsystem/dbcore.dm +++ b/modular_skyrat/master_files/code/controllers/subsystem/dbcore.dm @@ -38,5 +38,5 @@ if(length(queued_log_entries_by_table[table]) < CONFIG_GET(number/sql_game_log_min_bundle_size)) return - INVOKE_ASYNC(src, .proc/MassInsert, table, /*rows =*/ queued_log_entries_by_table[table], /*duplicate_key =*/ FALSE, /*ignore_errors =*/ FALSE, /*delayed =*/ FALSE, /*warn =*/ FALSE, /*async =*/ TRUE, /*special_columns =*/ null) + INVOKE_ASYNC(src, PROC_REF(MassInsert), table, /*rows =*/ queued_log_entries_by_table[table], /*duplicate_key =*/ FALSE, /*ignore_errors =*/ FALSE, /*delayed =*/ FALSE, /*warn =*/ FALSE, /*async =*/ TRUE, /*special_columns =*/ null) queued_log_entries_by_table -= table diff --git a/modular_skyrat/master_files/code/datums/components/fullauto.dm b/modular_skyrat/master_files/code/datums/components/fullauto.dm index 61db895d340..a2d5c587e0f 100644 --- a/modular_skyrat/master_files/code/datums/components/fullauto.dm +++ b/modular_skyrat/master_files/code/datums/components/fullauto.dm @@ -18,10 +18,10 @@ 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_GUN_JAMMED, .proc/stop_autofiring) + 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)) + RegisterSignal(parent, COMSIG_GUN_JAMMED, PROC_REF(stop_autofiring)) if(_autofire_shot_delay) autofire_shot_delay = _autofire_shot_delay if(ismob(gun.loc)) @@ -70,12 +70,12 @@ autofire_stat = AUTOFIRE_STAT_ALERT clicker = usercli shooter = clicker.mob - RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, .proc/on_mouse_down) - RegisterSignal(shooter, COMSIG_MOB_LOGOUT, .proc/autofire_off) + RegisterSignal(clicker, COMSIG_CLIENT_MOUSEDOWN, PROC_REF(on_mouse_down)) + RegisterSignal(shooter, COMSIG_MOB_LOGOUT, PROC_REF(autofire_off)) if(!QDELETED(shooter)) UnregisterSignal(shooter, COMSIG_MOB_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) @@ -91,7 +91,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_LOGIN, .proc/on_client_login) + RegisterSignal(shooter, COMSIG_MOB_LOGIN, PROC_REF(on_client_login)) if(!QDELETED(shooter)) UnregisterSignal(shooter, COMSIG_MOB_LOGOUT) shooter = null @@ -162,10 +162,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 @@ -179,7 +179,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) @@ -272,7 +272,7 @@ if(!can_shoot()) shoot_with_empty_chamber(shooter) return FALSE - INVOKE_ASYNC(src, .proc/do_autofire_shot, source, target, shooter, params) + INVOKE_ASYNC(src, PROC_REF(do_autofire_shot), source, target, shooter, params) return COMPONENT_AUTOFIRE_SHOT_SUCCESS /obj/item/gun/proc/do_autofire_shot(datum/source, atom/target, mob/living/shooter, params) @@ -281,7 +281,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) diff --git a/modular_skyrat/master_files/code/datums/quirks/neutral.dm b/modular_skyrat/master_files/code/datums/quirks/neutral.dm index de8a7fc6be7..efb84d5e292 100644 --- a/modular_skyrat/master_files/code/datums/quirks/neutral.dm +++ b/modular_skyrat/master_files/code/datums/quirks/neutral.dm @@ -104,7 +104,7 @@ /obj/item/clothing/accessory/breathing/on_uniform_equip(obj/item/clothing/under/uniform, user) . = ..() - RegisterSignal(uniform, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(uniform, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /obj/item/clothing/accessory/breathing/on_uniform_dropped(obj/item/clothing/under/uniform, user) . = ..() diff --git a/modular_skyrat/master_files/code/game/gamemodes/objective.dm b/modular_skyrat/master_files/code/game/gamemodes/objective.dm index fc7d654c80f..53b6dc7e937 100644 --- a/modular_skyrat/master_files/code/game/gamemodes/objective.dm +++ b/modular_skyrat/master_files/code/game/gamemodes/objective.dm @@ -1,6 +1,6 @@ // For modularity, we hook into the update_explanation_text to be sure we have a target to register. /datum/objective/assassinate/update_explanation_text() - RegisterSignal(target, COMSIG_LIVING_DEATH, .proc/register_target_death) + RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(register_target_death)) return ..() /datum/objective/assassinate/proc/register_target_death(mob/living/dead_guy, gibbed) diff --git a/modular_skyrat/master_files/code/game/objects/items/devices/anomaly_neutralizer.dm b/modular_skyrat/master_files/code/game/objects/items/devices/anomaly_neutralizer.dm index 93a05e8218d..914c0ba5d3d 100644 --- a/modular_skyrat/master_files/code/game/objects/items/devices/anomaly_neutralizer.dm +++ b/modular_skyrat/master_files/code/game/objects/items/devices/anomaly_neutralizer.dm @@ -2,7 +2,7 @@ . = ..() AddComponent(/datum/component/effect_remover, \ success_feedback = "You neutralize %THEEFFECT with %THEWEAPON, frying its circuitry in the process.", \ - on_clear_callback = CALLBACK(src, .proc/on_use_cme), \ + on_clear_callback = CALLBACK(src, PROC_REF(on_use_cme)), \ effects_we_clear = list(/obj/effect/cme)) /** diff --git a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm index 572d7c77293..ab652e45335 100644 --- a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm +++ b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm @@ -57,7 +57,7 @@ contraband = new contraband_type(user.drop_location()) user.put_in_hands(contraband) user.balloon_alert(user, "[contraband] materializes in your hand") - RegisterSignal(contraband, COMSIG_ITEM_PICKUP, .proc/on_contraband_pickup) + RegisterSignal(contraband, COMSIG_ITEM_PICKUP, PROC_REF(on_contraband_pickup)) AddComponent(/datum/component/traitor_objective_register, contraband, \ succeed_signals = COMSIG_ITEM_EXPORTED, \ fail_signals = list(COMSIG_PARENT_QDELETING), \ diff --git a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm index 01de11e3886..fa42dd476dc 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm @@ -34,8 +34,8 @@ /// A associative list of language names to their typepath var/static/list/name_to_language = list() action_delegations = list( - "give_language" = .proc/give_language, - "remove_language" = .proc/remove_language, + "give_language" = PROC_REF(give_language), + "remove_language" = PROC_REF(remove_language), ) /datum/preference_middleware/languages/apply_to_human(mob/living/carbon/human/target, datum/preferences/preferences) // SKYRAT EDIT CHANGE diff --git a/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm index eced9b7ecf8..c7c18259395 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences/middleware/limbs_and_markings.dm @@ -4,15 +4,15 @@ /datum/preference_middleware/limbs_and_markings action_delegations = list( - "set_limb_aug" = .proc/set_limb_aug, - "set_limb_aug_style" = .proc/set_limb_aug_style, - "add_marking" = .proc/add_marking, - "change_marking" = .proc/change_marking, - "color_marking" = .proc/color_marking, - "remove_marking" = .proc/remove_marking, - "set_organ_aug" = .proc/set_organ_aug, - "set_preset" = .proc/set_preset, - "change_emissive" = .proc/change_emissive_marking, + "set_limb_aug" = PROC_REF(set_limb_aug), + "set_limb_aug_style" = PROC_REF(set_limb_aug_style), + "add_marking" = PROC_REF(add_marking), + "change_marking" = PROC_REF(change_marking), + "color_marking" = PROC_REF(color_marking), + "remove_marking" = PROC_REF(remove_marking), + "set_organ_aug" = PROC_REF(set_organ_aug), + "set_preset" = PROC_REF(set_preset), + "change_emissive" = PROC_REF(change_emissive_marking), ) var/list/limbs_to_process = list( "l_arm" = "Left Arm", diff --git a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm index 778ca31b37f..62decea56f6 100644 --- a/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm +++ b/modular_skyrat/master_files/code/modules/client/preferences_savefile.dm @@ -76,7 +76,7 @@ \nDO NOT DISCONNECT UNTIL THIS PROCESS HAS BEEN COMPLETED.\ "))) migrate_skyrat(save) - addtimer(CALLBACK(src, .proc/check_migration), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(check_migration)), 10 SECONDS) READ_FILE(save["headshot"], headshot) diff --git a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm index 347abcd4b90..57a290d2f55 100644 --- a/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm +++ b/modular_skyrat/master_files/code/modules/clothing/head/monkey_magnification_helmet.dm @@ -45,8 +45,8 @@ magnification = user // this polls ghosts visible_message(span_warning("[src] powers up!")) playsound(src, 'sound/machines/ping.ogg', 30, TRUE) - RegisterSignal(magnification, COMSIG_SPECIES_LOSS, .proc/make_fall_off) - INVOKE_ASYNC(src, /obj/item/clothing/head/helmet/monkey_sentience.proc/connect, user) + RegisterSignal(magnification, COMSIG_SPECIES_LOSS, PROC_REF(make_fall_off)) + INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/item/clothing/head/helmet/monkey_sentience, connect), user) /obj/item/clothing/head/helmet/monkey_sentience/proc/connect(mob/user) polling = TRUE diff --git a/modular_skyrat/master_files/code/modules/events/spacevine.dm b/modular_skyrat/master_files/code/modules/events/spacevine.dm index 4d424ce5b00..0f37fdfed7e 100644 --- a/modular_skyrat/master_files/code/modules/events/spacevine.dm +++ b/modular_skyrat/master_files/code/modules/events/spacevine.dm @@ -663,7 +663,7 @@ . = ..() add_atom_colour("#ffffff", FIXED_COLOUR_PRIORITY) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) AddElement(/datum/element/atmos_sensitive, mapload) diff --git a/modular_skyrat/master_files/code/modules/mob/living/emote_popup.dm b/modular_skyrat/master_files/code/modules/mob/living/emote_popup.dm index 96acd3c7ce3..240cdd7706c 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/emote_popup.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/emote_popup.dm @@ -20,7 +20,7 @@ emote_overlay.icon_state = state vis_contents += emote_overlay animate(emote_overlay, alpha = 255, time = 5, easing = BOUNCE_EASING, pixel_y = 10) - addtimer(CALLBACK(src, .proc/remove_emote_popup_on_mob, emote_overlay), time) + addtimer(CALLBACK(src, PROC_REF(remove_emote_popup_on_mob), emote_overlay), time) /** * A proc type that, when called, causes a image/sprite to appear above whatever entity it is called on. @@ -37,7 +37,7 @@ emote_overlay.icon_state = state vis_contents += emote_overlay animate(emote_overlay, alpha = 255, time = 5, easing = BOUNCE_EASING, pixel_y = 10) - addtimer(CALLBACK(src, .proc/remove_emote_popup_on_obj, emote_overlay), time) + addtimer(CALLBACK(src, PROC_REF(remove_emote_popup_on_obj), emote_overlay), time) /** * A proc that is automatically called whenever flick_emote_popup_on_mob's addtimer expires, and removes the popup. diff --git a/modular_skyrat/master_files/code/modules/mob/living/sillicon/robot.dm b/modular_skyrat/master_files/code/modules/mob/living/sillicon/robot.dm index 4b3a8342053..1af9fd8a2e7 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/sillicon/robot.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/sillicon/robot.dm @@ -3,7 +3,7 @@ /datum/component/robot_smoke/RegisterWithParent() add_verb(parent, /mob/living/silicon/robot/proc/toggle_smoke) - RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, .proc/dir_change) + RegisterSignal(parent, COMSIG_ATOM_DIR_CHANGE, PROC_REF(dir_change)) /datum/component/robot_smoke/UnregisterFromParent() remove_verb(parent, /mob/living/silicon/robot/proc/toggle_smoke) @@ -52,7 +52,7 @@ /mob/living/silicon/robot/proc/dissipate() particles.spawning = 0 - addtimer(CALLBACK(src, .proc/particles_qdel), 1.5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(particles_qdel)), 1.5 SECONDS) /mob/living/silicon/robot/proc/particles_qdel() QDEL_NULL(particles) diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm index eeb758360b1..03666d51ac6 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm @@ -73,11 +73,11 @@ cone.transform = cone.transform.Translate(0, -8) // Defense protocol - RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(src, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) - RegisterSignal(src, COMSIG_ATOM_HITBY, .proc/on_hitby) + RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(src, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(src, COMSIG_ATOM_HITBY, PROC_REF(on_hitby)) // For traitor objectives - RegisterSignal(src, COMSIG_ATOM_EMAG_ACT, .proc/on_emag_act) + RegisterSignal(src, COMSIG_ATOM_EMAG_ACT, PROC_REF(on_emag_act)) /mob/living/simple_animal/pet/dog/corgi/borgi/proc/on_attack_hand(datum/source, mob/living/target) if(target.combat_mode && health > 0) @@ -194,13 +194,13 @@ visible_message(span_boldwarning("[user] swipes a card through [target]!"), span_notice("You overload [target]s internal reactor...")) notify_ghosts("[user] has shortcircuited [target] to explode in 60 seconds!", source = target, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Borgi Emagged") - addtimer(CALLBACK(src, .proc/explode_imminent), 50 SECONDS) + addtimer(CALLBACK(src, PROC_REF(explode_imminent)), 50 SECONDS) /mob/living/simple_animal/pet/dog/corgi/borgi/proc/explode_imminent() visible_message(span_bolddanger("[src] makes an odd whining noise!")) do_jitter_animation(30) - addtimer(CALLBACK(src, .proc/explode), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(explode)), 10 SECONDS) /mob/living/simple_animal/pet/dog/corgi/borgi/proc/explode() explosion(get_turf(src), 1, 2, 4, 4, 6) // Should this be changed? diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm index 26d842056d2..487f4dab029 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/poppy.dm @@ -46,7 +46,7 @@ become_area_sensitive(INNATE_TRAIT) ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) - RegisterSignal(src, COMSIG_ENTER_AREA, .proc/check_area) + RegisterSignal(src, COMSIG_ENTER_AREA, PROC_REF(check_area)) qdel(GetComponent(/datum/component/butchering)) @@ -120,7 +120,7 @@ manual_emote("'s fur stands up, [src.p_their()] body trembling...") notify_ghosts("[src] was startled by the supermatter!", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Safety Inspection!") - addtimer(CALLBACK(src, .proc/calm_down), 60 SECONDS) + addtimer(CALLBACK(src, PROC_REF(calm_down)), 60 SECONDS) /mob/living/simple_animal/pet/poppy/proc/calm_down() upset = FALSE diff --git a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm index 1c7835e83c4..bdcd7f8eb19 100644 --- a/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm +++ b/modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm @@ -117,7 +117,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) @@ -388,7 +388,7 @@ else if(held_gun.can_trigger_gun(user)) bonus_spread += dual_wield_spread loop_counter++ - addtimer(CALLBACK(held_gun, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread), loop_counter) + addtimer(CALLBACK(held_gun, TYPE_PROC_REF(/obj/item/gun, process_fire), target, user, TRUE, params, null, bonus_spread), loop_counter) return process_fire(target, user, TRUE, params, null, bonus_spread) @@ -512,7 +512,7 @@ if(burst_size > 1) firing_burst = TRUE for(var/i = 1 to burst_size) - addtimer(CALLBACK(src, .proc/process_burst, user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i), fire_delay * (i - 1)) + addtimer(CALLBACK(src, PROC_REF(process_burst), user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i), fire_delay * (i - 1)) else if(chambered) if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal. @@ -535,7 +535,7 @@ process_chamber() update_appearance() semicd = TRUE - addtimer(CALLBACK(src, .proc/reset_semicd), fire_delay) + addtimer(CALLBACK(src, PROC_REF(reset_semicd)), fire_delay) if(user) user.update_held_items() diff --git a/modular_skyrat/modules/aesthetics/lights/code/lighting.dm b/modular_skyrat/modules/aesthetics/lights/code/lighting.dm index af0cf37edfa..ba1b1e03df7 100644 --- a/modular_skyrat/modules/aesthetics/lights/code/lighting.dm +++ b/modular_skyrat/modules/aesthetics/lights/code/lighting.dm @@ -44,7 +44,7 @@ constant_flickering = TRUE - flicker_timer = addtimer(CALLBACK(src, .proc/flicker_on), rand(5, 10)) + flicker_timer = addtimer(CALLBACK(src, PROC_REF(flicker_on)), rand(5, 10)) /obj/machinery/light/proc/stop_flickering() constant_flickering = FALSE @@ -64,11 +64,11 @@ /obj/machinery/light/proc/flicker_on() alter_flicker(TRUE) - flicker_timer = addtimer(CALLBACK(src, .proc/flicker_off), rand(5, 10)) + flicker_timer = addtimer(CALLBACK(src, PROC_REF(flicker_off)), rand(5, 10)) /obj/machinery/light/proc/flicker_off() alter_flicker(FALSE) - flicker_timer = addtimer(CALLBACK(src, .proc/flicker_on), rand(5, 50)) + flicker_timer = addtimer(CALLBACK(src, PROC_REF(flicker_on)), rand(5, 50)) /obj/machinery/light/proc/firealarm_on() SIGNAL_HANDLER diff --git a/modular_skyrat/modules/alerts/code/priority_announce.dm b/modular_skyrat/modules/alerts/code/priority_announce.dm index 5f74751f37e..87a1c244ba0 100644 --- a/modular_skyrat/modules/alerts/code/priority_announce.dm +++ b/modular_skyrat/modules/alerts/code/priority_announce.dm @@ -129,7 +129,7 @@ to_chat(mob_to_teleport, announcement) SEND_SOUND(mob_to_teleport, meeting_sound) //no preferences here, you must hear the funny sound mob_to_teleport.overlay_fullscreen("emergency_meeting", /atom/movable/screen/fullscreen/emergency_meeting, 1) - addtimer(CALLBACK(mob_to_teleport, /mob/.proc/clear_fullscreen, "emergency_meeting"), 3 SECONDS) + addtimer(CALLBACK(mob_to_teleport, TYPE_PROC_REF(/mob, clear_fullscreen), "emergency_meeting"), 3 SECONDS) if (is_station_level(mob_to_teleport.z)) //teleport the mob to the crew meeting var/turf/target diff --git a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm index 3d61006f81f..6c6ab2a67cc 100644 --- a/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm +++ b/modular_skyrat/modules/ammo_workbench/code/ammo_workbench.dm @@ -42,7 +42,7 @@ ) /obj/machinery/ammo_workbench/Initialize(mapload) - AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 0, MATCONTAINER_EXAMINE, allowed_items = /obj/item/stack, _after_insert = CALLBACK(src, .proc/AfterMaterialInsert)) + AddComponent(/datum/component/material_container, SSmaterials.materials_by_category[MAT_CATEGORY_ITEM_MATERIAL], 0, MATCONTAINER_EXAMINE, allowed_items = /obj/item/stack, _after_insert = CALLBACK(src, PROC_REF(AfterMaterialInsert))) . = ..() wires = new /datum/wires/ammo_workbench(src) @@ -240,7 +240,7 @@ busy = TRUE - timer_id = addtimer(CALLBACK(src, .proc/fill_round, casing_type), time_per_round, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(fill_round), casing_type), time_per_round, TIMER_STOPPABLE) /obj/machinery/ammo_workbench/proc/fill_round(casing_type) if(machine_stat & (NOPOWER|BROKEN)) @@ -291,7 +291,7 @@ updateDialog() - timer_id = addtimer(CALLBACK(src, .proc/fill_round, casing_type), time_per_round, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(fill_round), casing_type), time_per_round, TIMER_STOPPABLE) /obj/machinery/ammo_workbench/proc/ammo_fill_finish(successfully = TRUE) updateDialog() @@ -515,13 +515,13 @@ switch(wire) if(WIRE_HACK) A.adjust_hacked(!A.hacked) - addtimer(CALLBACK(A, /obj/machinery/ammo_workbench.proc/reset, wire), 60) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/ammo_workbench, reset), wire), 60) if(WIRE_SHOCK) A.shocked = !A.shocked - addtimer(CALLBACK(A, /obj/machinery/ammo_workbench.proc/reset, wire), 60) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/ammo_workbench, reset), wire), 60) if(WIRE_DISABLE) A.disabled = !A.disabled - addtimer(CALLBACK(A, /obj/machinery/ammo_workbench.proc/reset, wire), 60) + addtimer(CALLBACK(A, TYPE_PROC_REF(/obj/machinery/ammo_workbench, reset), wire), 60) /datum/wires/ammo_workbench/on_cut(wire, mend) var/obj/machinery/ammo_workbench/A = holder diff --git a/modular_skyrat/modules/armaments/code/armament_component.dm b/modular_skyrat/modules/armaments/code/armament_component.dm index 2bd95f761fd..b00c31a04e3 100644 --- a/modular_skyrat/modules/armaments/code/armament_component.dm +++ b/modular_skyrat/modules/armaments/code/armament_component.dm @@ -29,8 +29,8 @@ required_access = needed_access - RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/on_attack_hand) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) /datum/component/armament/Destroy(force, silent) if(inserted_card) @@ -66,7 +66,7 @@ to_chat(user, span_warning("You don't have the required access!")) return - INVOKE_ASYNC(src, .proc/ui_interact, user) + INVOKE_ASYNC(src, PROC_REF(ui_interact), user) /datum/component/armament/ui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm b/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm index 4456de10826..63c8f4e9a01 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/ash_farming.dm @@ -18,8 +18,8 @@ one_per_turf = set_turf_limit pixel_shift = set_shift //now lets register the signals - RegisterSignal(atom_parent, COMSIG_PARENT_ATTACKBY, .proc/check_attack) - RegisterSignal(atom_parent, COMSIG_PARENT_EXAMINE, .proc/check_examine) + RegisterSignal(atom_parent, COMSIG_PARENT_ATTACKBY, PROC_REF(check_attack)) + RegisterSignal(atom_parent, COMSIG_PARENT_EXAMINE, PROC_REF(check_examine)) /datum/component/simple_farm/Destroy(force, silent) //lets not hard del @@ -201,7 +201,7 @@ /obj/structure/simple_farm/proc/late_setup() if(!ismovable(attached_atom)) return - RegisterSignal(attached_atom, COMSIG_MOVABLE_MOVED, .proc/move_plant) + RegisterSignal(attached_atom, COMSIG_MOVABLE_MOVED, PROC_REF(move_plant)) /** * a simple proc to forcemove the plant on top of the movable atom its attached to diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm index d019a4946c1..90c8e0ea594 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/ash_tendril.dm @@ -148,7 +148,7 @@ /obj/structure/reviving_ashwalker_egg/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/do_revive), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(do_revive)), 30 SECONDS) /** * Proc that will fully revive the living content inside and then destroy itself diff --git a/modular_skyrat/modules/ashwalkers/code/buildings/tendril_cursing.dm b/modular_skyrat/modules/ashwalkers/code/buildings/tendril_cursing.dm index 5395e4696f0..a8df699a735 100644 --- a/modular_skyrat/modules/ashwalkers/code/buildings/tendril_cursing.dm +++ b/modular_skyrat/modules/ashwalkers/code/buildings/tendril_cursing.dm @@ -40,8 +40,8 @@ human_target = parent ADD_TRAIT(human_target, TRAIT_NO_TELEPORT, REF(src)) human_target.add_movespeed_modifier(/datum/movespeed_modifier/ash_cursed) - RegisterSignal(human_target, COMSIG_MOVABLE_MOVED, .proc/do_move) - RegisterSignal(human_target, COMSIG_LIVING_DEATH, .proc/remove_curse) + RegisterSignal(human_target, COMSIG_MOVABLE_MOVED, PROC_REF(do_move)) + RegisterSignal(human_target, COMSIG_LIVING_DEATH, PROC_REF(remove_curse)) /datum/component/ash_cursed/Destroy(force, silent) . = ..() @@ -74,7 +74,7 @@ if(spawned_goo) return spawned_goo = new(human_turf) - addtimer(CALLBACK(spawned_goo, /obj/effect/decal/cleanable/greenglow/ecto.proc/do_qdel), 5 MINUTES, TIMER_STOPPABLE|TIMER_DELETE_ME) + addtimer(CALLBACK(spawned_goo, TYPE_PROC_REF(/obj/effect/decal/cleanable/greenglow/ecto, do_qdel)), 5 MINUTES, TIMER_STOPPABLE|TIMER_DELETE_ME) /obj/effect/decal/cleanable/greenglow/ecto/proc/do_qdel() qdel(src) diff --git a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm index b05ab40cafe..d1e422d61e3 100644 --- a/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm +++ b/modular_skyrat/modules/ashwalkers/code/effects/ash_rituals.dm @@ -123,7 +123,7 @@ anti_endless++ new /obj/effect/particle_effect/sparks(spawn_turf) - addtimer(CALLBACK(src, .proc/spawn_megafauna, megafauna_choice, spawn_turf), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(spawn_megafauna), megafauna_choice, spawn_turf), 3 SECONDS) /** * Called within an addtimer in the ritual success of "Incite Megafauna." diff --git a/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm b/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm index aebddb07cdc..4bf1b8f00ff 100644 --- a/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm +++ b/modular_skyrat/modules/ashwalkers/code/species/Ashwalkers.dm @@ -6,7 +6,7 @@ /datum/species/lizard/ashwalker/on_species_gain(mob/living/carbon/carbon_target, datum/species/old_species) . = ..() ADD_TRAIT(carbon_target, TRAIT_ASHSTORM_IMMUNE, SPECIES_TRAIT) - RegisterSignal(carbon_target, COMSIG_MOB_ITEM_ATTACK, .proc/mob_attack) + RegisterSignal(carbon_target, COMSIG_MOB_ITEM_ATTACK, PROC_REF(mob_attack)) carbon_target.AddComponent(/datum/component/ash_age) /datum/species/lizard/ashwalker/on_species_loss(mob/living/carbon/carbon_target) @@ -51,8 +51,8 @@ // set the time that it was attached then we will compare current world time versus the evo_time plus stage_time evo_time = world.time // when the rune successfully completes the age ritual, it will send the signal... do the proc when we receive the signal - RegisterSignal(human_target, COMSIG_RUNE_EVOLUTION, .proc/check_evolution) - RegisterSignal(human_target, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(human_target, COMSIG_RUNE_EVOLUTION, PROC_REF(check_evolution)) + RegisterSignal(human_target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/ash_age/proc/check_evolution() SIGNAL_HANDLER diff --git a/modular_skyrat/modules/ashwalkers/code/species/damage_datum.dm b/modular_skyrat/modules/ashwalkers/code/species/damage_datum.dm index 66d95199b60..636f24ebb52 100644 --- a/modular_skyrat/modules/ashwalkers/code/species/damage_datum.dm +++ b/modular_skyrat/modules/ashwalkers/code/species/damage_datum.dm @@ -8,7 +8,7 @@ var/total_damage = 0 /datum/status_effect/ashwalker_damage/proc/register_mob_damage(mob/living/target) - RegisterSignal(target, COMSIG_MOB_APPLY_DAMAGE, .proc/calculate_total) + RegisterSignal(target, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(calculate_total)) /datum/status_effect/ashwalker_damage/proc/calculate_total(datum/source, damage, damagetype, def_zone) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/assault_operatives/code/base_alarm.dm b/modular_skyrat/modules/assault_operatives/code/base_alarm.dm index c4d43d9e97b..5a638f47fc2 100644 --- a/modular_skyrat/modules/assault_operatives/code/base_alarm.dm +++ b/modular_skyrat/modules/assault_operatives/code/base_alarm.dm @@ -61,14 +61,14 @@ if(!iterating_alarm.alarm_playing) iterating_alarm.alarm_playing = TRUE playsound(iterating_alarm, 'modular_skyrat/modules/assault_operatives/sound/goldeneyealarm.ogg', 30) - addtimer(CALLBACK(iterating_alarm, .proc/alarm_sound), 65) + addtimer(CALLBACK(iterating_alarm, PROC_REF(alarm_sound)), 65) /obj/machinery/base_alarm/proc/alarm_sound() if(!triggered) alarm_playing = FALSE else playsound(src, 'modular_skyrat/modules/assault_operatives/sound/goldeneyealarm.ogg', 30) - addtimer(CALLBACK(src, .proc/alarm_sound), 65) + addtimer(CALLBACK(src, PROC_REF(alarm_sound)), 65) /obj/machinery/base_alarm/proc/reset(mob/user) for(var/obj/machinery/base_alarm/iterating_alarm in alarms) diff --git a/modular_skyrat/modules/assault_operatives/code/goldeneye.dm b/modular_skyrat/modules/assault_operatives/code/goldeneye.dm index d79a28d3b81..d7af43628c1 100644 --- a/modular_skyrat/modules/assault_operatives/code/goldeneye.dm +++ b/modular_skyrat/modules/assault_operatives/code/goldeneye.dm @@ -54,7 +54,7 @@ SUBSYSTEM_DEF(goldeneye) priority_announce(message, "GoldenEye Defence Network", ANNOUNCER_ICARUS) goldeneye_activated = TRUE - addtimer(CALLBACK(src, .proc/fire_icarus), ignition_time) + addtimer(CALLBACK(src, PROC_REF(fire_icarus)), ignition_time) /datum/controller/subsystem/goldeneye/proc/fire_icarus() diff --git a/modular_skyrat/modules/assault_operatives/code/interrogator.dm b/modular_skyrat/modules/assault_operatives/code/interrogator.dm index 838b2f210d4..49494a51948 100644 --- a/modular_skyrat/modules/assault_operatives/code/interrogator.dm +++ b/modular_skyrat/modules/assault_operatives/code/interrogator.dm @@ -130,7 +130,7 @@ locked = TRUE processing = TRUE say("Starting DNA data extraction!") - timer_id = addtimer(CALLBACK(src, .proc/stage_one), rand(STAGE_PROCESS_TIME_LOWER, STAGE_PROCESS_TIME_UPPER), TIMER_STOPPABLE|TIMER_UNIQUE) //Random times so crew can't anticipate exactly when it will drop. + timer_id = addtimer(CALLBACK(src, PROC_REF(stage_one)), rand(STAGE_PROCESS_TIME_LOWER, STAGE_PROCESS_TIME_UPPER), TIMER_STOPPABLE|TIMER_UNIQUE) //Random times so crew can't anticipate exactly when it will drop. update_appearance() /obj/machinery/interrogator/proc/stage_one() @@ -142,7 +142,7 @@ playsound(loc, 'sound/items/rped.ogg', 60) say("Stage one complete!") minor_announce("SECURITY BREACH DETECTED, NETWORK COMPROMISED! READING COORDINATES...", "GoldenEye Defence Network") - timer_id = addtimer(CALLBACK(src, .proc/stage_two), rand(STAGE_PROCESS_TIME_LOWER, STAGE_PROCESS_TIME_UPPER), TIMER_STOPPABLE|TIMER_UNIQUE) + timer_id = addtimer(CALLBACK(src, PROC_REF(stage_two)), rand(STAGE_PROCESS_TIME_LOWER, STAGE_PROCESS_TIME_UPPER), TIMER_STOPPABLE|TIMER_UNIQUE) /obj/machinery/interrogator/proc/stage_two() if(!check_requirements()) @@ -156,7 +156,7 @@ playsound(src, 'sound/items/drill_use.ogg', 100) say("Stage two complete!") minor_announce("SECURITY BREACH DETECTED, NETWORK COMPROMISED! INTERROGATION COORDINATES: [x], [y], [z]", "GoldenEye Defence Network") - timer_id = addtimer(CALLBACK(src, .proc/stage_three), rand(STAGE_PROCESS_TIME_LOWER, STAGE_PROCESS_TIME_UPPER), TIMER_STOPPABLE|TIMER_UNIQUE) + timer_id = addtimer(CALLBACK(src, PROC_REF(stage_three)), rand(STAGE_PROCESS_TIME_LOWER, STAGE_PROCESS_TIME_UPPER), TIMER_STOPPABLE|TIMER_UNIQUE) /obj/machinery/interrogator/proc/stage_three() if(!check_requirements()) @@ -175,7 +175,7 @@ processing = FALSE locked = FALSE update_appearance() - addtimer(CALLBACK(src, .proc/announce_creation), ALERT_CREW_TIME) + addtimer(CALLBACK(src, PROC_REF(announce_creation)), ALERT_CREW_TIME) /obj/machinery/interrogator/proc/announce_creation() priority_announce("CRITICAL SECURITY BREACH DETECTED! A GoldenEye authentication keycard has been illegally extracted and is being sent in somewhere on the station!", "GoldenEye Defence Network") diff --git a/modular_skyrat/modules/automapper/code/area_spawn_subsystem.dm b/modular_skyrat/modules/automapper/code/area_spawn_subsystem.dm index 9553b174ad2..6ce284e31c7 100644 --- a/modular_skyrat/modules/automapper/code/area_spawn_subsystem.dm +++ b/modular_skyrat/modules/automapper/code/area_spawn_subsystem.dm @@ -89,7 +89,7 @@ SUBSYSTEM_DEF(area_spawn) LAZYADDASSOC(turf_list, "[priority]", list(iterating_turf)) // Sort the priorities descending - return sortTim(turf_list, /proc/cmp_num_string_asc) + return sortTim(turf_list, GLOBAL_PROC_REF(cmp_num_string_asc)) /** * Process a specific turf and return priority number from 0 to infinity. diff --git a/modular_skyrat/modules/barricades/code/barricade.dm b/modular_skyrat/modules/barricades/code/barricade.dm index d8d6fb877c5..49fac5fe3f3 100644 --- a/modular_skyrat/modules/barricades/code/barricade.dm +++ b/modular_skyrat/modules/barricades/code/barricade.dm @@ -34,7 +34,7 @@ ) AddElement(/datum/element/connect_loc, connections) AddElement(/datum/element/climbable) - RegisterSignal(src, COMSIG_ATOM_INTEGRITY_CHANGED, .proc/run_integrity) + RegisterSignal(src, COMSIG_ATOM_INTEGRITY_CHANGED, PROC_REF(run_integrity)) /obj/structure/deployable_barricade/proc/run_integrity() SIGNAL_HANDLER diff --git a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm index 6434e38d1ba..77d41d3d265 100644 --- a/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm +++ b/modular_skyrat/modules/biohazard_blob/code/biohazard_blob_structures.dm @@ -262,7 +262,7 @@ make_full() for(var/t in get_adjacent_open_turfs(src)) registered_turfs += t - RegisterSignal(t, COMSIG_ATOM_ENTERED, .proc/proximity_trigger) + RegisterSignal(t, COMSIG_ATOM_ENTERED, PROC_REF(proximity_trigger)) /obj/structure/biohazard_blob/structure/bulb/proc/proximity_trigger(datum/source, atom/movable/AM) SIGNAL_HANDLER @@ -270,7 +270,7 @@ return var/mob/living/L = AM if(!(MOLD_FACTION in L.faction)) - INVOKE_ASYNC(src, .proc/discharge) + INVOKE_ASYNC(src, PROC_REF(discharge)) /obj/structure/biohazard_blob/structure/bulb/proc/make_full() //Called by a timer, check if we exist @@ -335,7 +335,7 @@ set_light(0) update_overlays() density = FALSE - addtimer(CALLBACK(src, .proc/make_full), 1 MINUTES, TIMER_UNIQUE|TIMER_NO_HASH_WAIT) + addtimer(CALLBACK(src, PROC_REF(make_full)), 1 MINUTES, TIMER_UNIQUE|TIMER_NO_HASH_WAIT) #undef MAX_MOLD_FOAM_RANGE diff --git a/modular_skyrat/modules/black_mesa/code/follow_component.dm b/modular_skyrat/modules/black_mesa/code/follow_component.dm index d3c6fdbef2c..b0f2a0f1c0d 100644 --- a/modular_skyrat/modules/black_mesa/code/follow_component.dm +++ b/modular_skyrat/modules/black_mesa/code/follow_component.dm @@ -31,9 +31,9 @@ follow_distance = _follow_distance if(_follow_speed) follow_speed = _follow_speed - RegisterSignal(parent, COMSIG_HOSTILE_MOB_LOST_TARGET, .proc/lost_target) - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/toggle_follow) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent, COMSIG_HOSTILE_MOB_LOST_TARGET, PROC_REF(lost_target)) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(toggle_follow)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) parent_mob = parent /datum/component/follow/Destroy(force, silent) @@ -54,12 +54,12 @@ if(following) if(follow_sounds) playsound(parent_mob, pick(follow_sounds), 100) - INVOKE_ASYNC(parent_mob, /atom/movable.proc/say, "Following you!") + INVOKE_ASYNC(parent_mob, TYPE_PROC_REF(/atom/movable, say), "Following you!") parent_mob.Goto(living_user, follow_speed, follow_distance) else if(unfollow_sounds) playsound(parent_mob, pick(unfollow_sounds), 100) - INVOKE_ASYNC(parent_mob, /atom/movable.proc/say, "No longer following!") + INVOKE_ASYNC(parent_mob, TYPE_PROC_REF(/atom/movable, say), "No longer following!") parent_mob.LoseTarget() /datum/component/follow/proc/on_examine(datum/source, mob/examiner, list/examine_text) diff --git a/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm b/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm index adafa3665bb..2c5c36eeff8 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/gordon_freeman.dm @@ -37,8 +37,8 @@ mob_to_register.update_appearance() var/datum/beam/created_beam = Beam(mob_to_register, icon_state = "red_lightning", time = 10 MINUTES, maxdistance = shield_range) shielded_mobs[mob_to_register] = created_beam - RegisterSignal(created_beam, COMSIG_PARENT_QDELETING, .proc/beam_died) - RegisterSignal(mob_to_register, COMSIG_PARENT_QDELETING, .proc/mob_died) + RegisterSignal(created_beam, COMSIG_PARENT_QDELETING, PROC_REF(beam_died)) + RegisterSignal(mob_to_register, COMSIG_PARENT_QDELETING, PROC_REF(mob_died)) /obj/machinery/door/puzzle/keycard/xen/freeman_boss_entry name = "entry door" diff --git a/modular_skyrat/modules/black_mesa/code/mobs/mob_spawners.dm b/modular_skyrat/modules/black_mesa/code/mobs/mob_spawners.dm index d4e03aa89f3..c35b8c1032a 100644 --- a/modular_skyrat/modules/black_mesa/code/mobs/mob_spawners.dm +++ b/modular_skyrat/modules/black_mesa/code/mobs/mob_spawners.dm @@ -27,7 +27,7 @@ /obj/effect/random_mob_placer/Initialize(mapload) . = ..() for(var/turf/iterating_turf in range(MOB_PLACER_RANGE, src)) - RegisterSignal(iterating_turf, COMSIG_ATOM_ENTERED, .proc/trigger) + RegisterSignal(iterating_turf, COMSIG_ATOM_ENTERED, PROC_REF(trigger)) /obj/effect/random_mob_placer/proc/trigger(datum/source, atom/movable/entered_atom) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/black_mesa/code/shield_pylon.dm b/modular_skyrat/modules/black_mesa/code/shield_pylon.dm index c7ffeb2fc1a..0d7c51e3ece 100644 --- a/modular_skyrat/modules/black_mesa/code/shield_pylon.dm +++ b/modular_skyrat/modules/black_mesa/code/shield_pylon.dm @@ -43,7 +43,7 @@ continue register_mob(iterating_mob) for(var/turf/iterating_turf in RANGE_TURFS(shield_range, src)) - RegisterSignal(iterating_turf, COMSIG_ATOM_ENTERED, .proc/mob_entered_range) + RegisterSignal(iterating_turf, COMSIG_ATOM_ENTERED, PROC_REF(mob_entered_range)) /obj/structure/xen_pylon/proc/mob_entered_range(datum/source, atom/movable/entered_atom) SIGNAL_HANDLER @@ -65,8 +65,8 @@ mob_to_register.update_appearance() var/datum/beam/created_beam = Beam(mob_to_register, icon_state = "red_lightning", time = 10 MINUTES, maxdistance = (shield_range - 1)) shielded_mobs[mob_to_register] = created_beam - RegisterSignal(created_beam, COMSIG_PARENT_QDELETING, .proc/beam_died, override = TRUE) - RegisterSignal(mob_to_register, COMSIG_PARENT_QDELETING, .proc/mob_died, override = TRUE) + RegisterSignal(created_beam, COMSIG_PARENT_QDELETING, PROC_REF(beam_died), override = TRUE) + RegisterSignal(mob_to_register, COMSIG_PARENT_QDELETING, PROC_REF(mob_died), override = TRUE) /obj/structure/xen_pylon/proc/mob_died(atom/movable/source, force) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/black_mesa/code/shockplant.dm b/modular_skyrat/modules/black_mesa/code/shockplant.dm index b930d0bc9f0..3d77cbe6635 100644 --- a/modular_skyrat/modules/black_mesa/code/shockplant.dm +++ b/modular_skyrat/modules/black_mesa/code/shockplant.dm @@ -24,7 +24,7 @@ /obj/structure/shockplant/Initialize(mapload) . = ..() for(var/turf/open/iterating_turf as anything in circle_view_turfs(src, shock_range)) - RegisterSignal(iterating_turf, COMSIG_ATOM_ENTERED, .proc/trigger) + RegisterSignal(iterating_turf, COMSIG_ATOM_ENTERED, PROC_REF(trigger)) /obj/structure/shockplant/proc/trigger(datum/source, atom/movable/entered_atom) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm b/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm index ed28a2f9905..b4c4b8c057b 100644 --- a/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm +++ b/modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm @@ -202,7 +202,7 @@ system_state = SYSTEM_PREFIRE message_admins("[user] has started the fire cycle of [src]! Firing at: [ADMIN_VERBOSEJMP(bullseye)]") set_light(5, 5, COLOR_BLUE_LIGHT) - addtimer(CALLBACK(src, .proc/fire, user, bullseye), 20 SECONDS, TIMER_CLIENT_TIME) + addtimer(CALLBACK(src, PROC_REF(fire), user, bullseye), 20 SECONDS, TIMER_CLIENT_TIME) START_PROCESSING(SSobj, src) return system_state @@ -279,7 +279,7 @@ system_state = SYSTEM_RELOADING set_light(0) STOP_PROCESSING(SSobj, src) - addtimer(CALLBACK(src, .proc/ready_cannon), SUPERWEAPON_RELOAD_TIME) + addtimer(CALLBACK(src, PROC_REF(ready_cannon)), SUPERWEAPON_RELOAD_TIME) /obj/machinery/bsa/full/proc/ready_cannon() system_state = SYSTEM_READY diff --git a/modular_skyrat/modules/cargoborg/code/robot_items.dm b/modular_skyrat/modules/cargoborg/code/robot_items.dm index f24da77db75..6708aafbf3b 100644 --- a/modular_skyrat/modules/cargoborg/code/robot_items.dm +++ b/modular_skyrat/modules/cargoborg/code/robot_items.dm @@ -52,7 +52,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.")) @@ -115,7 +115,7 @@ var/obj/item/robot_model/holder_model = loc cyborg_holding_me = WEAKREF(holder_model.robot) - RegisterSignal(holder_model.robot, COMSIG_LIVING_DEATH, .proc/empty_contents) + RegisterSignal(holder_model.robot, COMSIG_LIVING_DEATH, PROC_REF(empty_contents)) /obj/item/borg/hydraulic_clamp/Destroy() @@ -405,7 +405,7 @@ /// A simple proc to check if we're at the max amount of planes, if not, we keep on charging. Called by [/obj/item/borg/paperplane_crossbow/proc/charge_paper_planes()]. /obj/item/borg/paperplane_crossbow/proc/check_amount() if(!charging && planes < max_planes) - addtimer(CALLBACK(src, .proc/charge_paper_planes), charge_delay) + addtimer(CALLBACK(src, PROC_REF(charge_paper_planes)), charge_delay) charging = TRUE diff --git a/modular_skyrat/modules/cell_component/code/cell_component.dm b/modular_skyrat/modules/cell_component/code/cell_component.dm index 09e3c9c4851..ca131e55f33 100644 --- a/modular_skyrat/modules/cell_component/code/cell_component.dm +++ b/modular_skyrat/modules/cell_component/code/cell_component.dm @@ -75,10 +75,10 @@ component_cell_out_of_charge/component_cell_removed proc using loc where necessa /datum/component/cell/RegisterWithParent() //Component to Parent signal registries - RegisterSignal(parent, COMSIG_ITEM_POWER_USE, .proc/simple_power_use) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/insert_cell) - RegisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT , .proc/remove_cell) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine_cell) + RegisterSignal(parent, COMSIG_ITEM_POWER_USE, PROC_REF(simple_power_use)) + RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(insert_cell)) + RegisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT , PROC_REF(remove_cell)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine_cell)) /datum/component/cell/UnregisterFromParent() UnregisterSignal(parent, COMSIG_ITEM_POWER_USE) @@ -163,7 +163,7 @@ component_cell_out_of_charge/component_cell_removed proc using loc where necessa to_chat(user, span_notice("You remove [inserted_cell] from [equipment]!")) playsound(equipment, 'sound/weapons/magout.ogg', 40, TRUE) inserted_cell.forceMove(get_turf(equipment)) - INVOKE_ASYNC(user, /mob/living.proc/put_in_hands, inserted_cell) + INVOKE_ASYNC(user, TYPE_PROC_REF(/mob/living, put_in_hands), inserted_cell) inserted_cell = null if(on_cell_removed) on_cell_removed.Invoke() diff --git a/modular_skyrat/modules/cell_component/code/flashlight.dm b/modular_skyrat/modules/cell_component/code/flashlight.dm index f56cb3a237d..ae56327622a 100644 --- a/modular_skyrat/modules/cell_component/code/flashlight.dm +++ b/modular_skyrat/modules/cell_component/code/flashlight.dm @@ -24,7 +24,7 @@ register_context() if(uses_battery) - AddComponent(/datum/component/cell, cell_override, CALLBACK(src, .proc/turn_off)) + AddComponent(/datum/component/cell, cell_override, CALLBACK(src, PROC_REF(turn_off))) /obj/item/flashlight/proc/update_brightness() set_light_on(on) diff --git a/modular_skyrat/modules/cellguns/code/medigun_cells.dm b/modular_skyrat/modules/cellguns/code/medigun_cells.dm index 3f3eec21dab..bac5fa7c386 100644 --- a/modular_skyrat/modules/cellguns/code/medigun_cells.dm +++ b/modular_skyrat/modules/cellguns/code/medigun_cells.dm @@ -551,7 +551,7 @@ /obj/structure/bed/roller/medigun/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/check_bed), deploytime) + addtimer(CALLBACK(src, PROC_REF(check_bed)), deploytime) /obj/structure/bed/roller/medigun/proc/check_bed() //Checks to see if anyone is buckled to the bed, if not the bed will qdel itself. if(!has_buckled_mobs()) @@ -671,7 +671,7 @@ area_locked = locked destination_area = destination - addtimer(CALLBACK(src, .proc/dispense_treat), (time_allowance * 0.95)) + addtimer(CALLBACK(src, PROC_REF(dispense_treat)), (time_allowance * 0.95)) QDEL_IN(src, time_allowance) /datum/component/medigun_relocation/Destroy() diff --git a/modular_skyrat/modules/chaplain/code/mortis.dm b/modular_skyrat/modules/chaplain/code/mortis.dm index 480e72901c8..78738846050 100644 --- a/modular_skyrat/modules/chaplain/code/mortis.dm +++ b/modular_skyrat/modules/chaplain/code/mortis.dm @@ -11,7 +11,7 @@ /obj/item/implant/mortis/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE) . = ..() if(.) - RegisterSignal(target, COMSIG_MOB_EMOTED("deathgasp"), .proc/on_deathgasp) + RegisterSignal(target, COMSIG_MOB_EMOTED("deathgasp"), PROC_REF(on_deathgasp)) /obj/item/implant/mortis/removed(mob/target, silent = FALSE, special = FALSE) . = ..() diff --git a/modular_skyrat/modules/cme/code/cme.dm b/modular_skyrat/modules/cme/code/cme.dm index 2548d858421..6151dddd87e 100644 --- a/modular_skyrat/modules/cme/code/cme.dm +++ b/modular_skyrat/modules/cme/code/cme.dm @@ -233,7 +233,7 @@ var/turf/open/T = get_turf(src) if(istype(T)) T.atmos_spawn_air("o2=15;plasma=15;TEMP=5778") - addtimer(CALLBACK(src, .proc/burst), timeleft) + addtimer(CALLBACK(src, PROC_REF(burst)), timeleft) /obj/effect/cme/proc/burst() if(neutralized) diff --git a/modular_skyrat/modules/connecting_computer/code/connectable_component.dm b/modular_skyrat/modules/connecting_computer/code/connectable_component.dm index 0d0a9472c2f..58b5de0e019 100644 --- a/modular_skyrat/modules/connecting_computer/code/connectable_component.dm +++ b/modular_skyrat/modules/connecting_computer/code/connectable_component.dm @@ -9,7 +9,7 @@ return COMPONENT_INCOMPATIBLE /datum/component/connectable_computer/RegisterWithParent() - RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/on_update_overlays) + RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) update_neighbors() diff --git a/modular_skyrat/modules/contractor/code/datums/contract.dm b/modular_skyrat/modules/contractor/code/datums/contract.dm index d1a91491435..9aad9ac3cbc 100644 --- a/modular_skyrat/modules/contractor/code/datums/contract.dm +++ b/modular_skyrat/modules/contractor/code/datums/contract.dm @@ -78,7 +78,7 @@ empty_pod.tied_contract = src empty_pod.recieving = TRUE - 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 @@ -140,7 +140,7 @@ sent_mob_human.dna.species.give_important_for_life(sent_mob_human) // After pod is sent we start the victim narrative/heal. - INVOKE_ASYNC(src, .proc/handle_victim_experience, sent_mob) + INVOKE_ASYNC(src, PROC_REF(handle_victim_experience), sent_mob) // This is slightly delayed because of the sleep calls above to handle the narrative. // We don't want to tell the station instantly. @@ -156,7 +156,7 @@ priority_announce("One of your crew was captured by a rival organisation - we've needed to pay their ransom to bring them back. \ As is policy we've taken a portion of the station's funds to offset the overall cost.", null, null, null, "Nanotrasen Asset Protection") - addtimer(CALLBACK(src, .proc/finish_enter), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(finish_enter)), 3 SECONDS) /// Called when person is finished shoving in, awards ransome money /datum/syndicate_contract/proc/finish_enter() @@ -176,7 +176,7 @@ /datum/syndicate_contract/proc/handle_victim_experience(mob/living/target) // Ship 'em back - dead or alive, 4 minutes wait. // Even if they weren't the target, we're still treating them the same. - addtimer(CALLBACK(src, .proc/return_victim, target), 4 MINUTES) + addtimer(CALLBACK(src, PROC_REF(return_victim), target), 4 MINUTES) if (target.stat == DEAD) return @@ -192,13 +192,13 @@ target.adjust_confusion(10 SECONDS) target.blur_eyes(5) to_chat(target, span_warning("You feel strange...")) - addtimer(CALLBACK(src, .proc/victim_stage_two, target), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(victim_stage_two), target), 6 SECONDS) /// Continued victim handling /datum/syndicate_contract/proc/victim_stage_two(mob/living/target) to_chat(target, span_warning("That pod did something to you...")) target.set_dizzy(70 SECONDS) - addtimer(CALLBACK(src, .proc/victim_stage_three, target), 6 SECONDS) + addtimer(CALLBACK(src, PROC_REF(victim_stage_three), target), 6 SECONDS) /// Continued victim handling, flashes them as well /datum/syndicate_contract/proc/victim_stage_three(mob/living/target) @@ -206,12 +206,12 @@ target.flash_act() target.adjust_confusion(20 SECONDS) target.blur_eyes(3) - addtimer(CALLBACK(src, .proc/victim_stage_four, target), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(victim_stage_four), target), 3 SECONDS) /// Continued victim handling /datum/syndicate_contract/proc/victim_stage_four(mob/living/target) to_chat(target, span_warning("Your head pounds...")) - addtimer(CALLBACK(src, .proc/victim_stage_five, target), 10 SECONDS) + addtimer(CALLBACK(src, PROC_REF(victim_stage_five), target), 10 SECONDS) /// Continued victim handling, some unconsciousness /datum/syndicate_contract/proc/victim_stage_five(mob/living/target) diff --git a/modular_skyrat/modules/cortical_borer/code/cortical_borer_items.dm b/modular_skyrat/modules/cortical_borer/code/cortical_borer_items.dm index 44e70be89c0..5f0ecc27ef5 100644 --- a/modular_skyrat/modules/cortical_borer/code/cortical_borer_items.dm +++ b/modular_skyrat/modules/cortical_borer/code/cortical_borer_items.dm @@ -15,7 +15,7 @@ . = ..() update_appearance() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/spring_trap, + COMSIG_ATOM_ENTERED = PROC_REF(spring_trap), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm index a685b1d9f71..5f079c6b9b3 100644 --- a/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm +++ b/modular_skyrat/modules/cortical_borer/code/evolution/evolution_things/empowered_egg.dm @@ -21,7 +21,7 @@ /obj/item/organ/internal/empowered_borer_egg/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = TRUE) ..() - addtimer(CALLBACK(src, .proc/try_burst), burst_time) + addtimer(CALLBACK(src, PROC_REF(try_burst)), burst_time) /obj/item/organ/internal/empowered_borer_egg/Remove(mob/living/carbon/M, special = FALSE) . = ..() diff --git a/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm b/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm index abb709a6bf8..016d29f3169 100644 --- a/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm +++ b/modular_skyrat/modules/customization/modules/clothing/toggle_base.dm @@ -11,8 +11,8 @@ src.toggled_icon_state = toggled_icon_state - RegisterSignal(parent, COMSIG_CLICK_ALT, .proc/clothing_toggle) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/handle_examine) + RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(clothing_toggle)) + RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(handle_examine)) /datum/component/toggle_clothes/proc/handle_examine(datum/source, mob/user, list/examine_text) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/customization/modules/hydroponics/grown/bananaspider.dm b/modular_skyrat/modules/customization/modules/hydroponics/grown/bananaspider.dm index 39655703d56..9fdf3ab1e19 100644 --- a/modular_skyrat/modules/customization/modules/hydroponics/grown/bananaspider.dm +++ b/modular_skyrat/modules/customization/modules/hydroponics/grown/bananaspider.dm @@ -25,7 +25,7 @@ return to_chat(user, span_notice("You decide to wake up the banana spider...")) awakening = TRUE - addtimer(CALLBACK(src, .proc/spawnspider), 8 SECONDS) + addtimer(CALLBACK(src, PROC_REF(spawnspider)), 8 SECONDS) /obj/item/food/grown/banana/banana_spider_spawnable/proc/spawnspider() if(!QDELETED(src)) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm index fcfd043acd5..705f21186f3 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/human.dm @@ -137,7 +137,7 @@ set_jitter_if_lower(duration SECONDS) if(duration) - addtimer(CALLBACK(src, .proc/acting_expiry, impairment), duration SECONDS) + addtimer(CALLBACK(src, PROC_REF(acting_expiry), impairment), duration SECONDS) to_chat(src, "You are now feigning [impairment].") /mob/living/carbon/human/proc/acting_expiry(impairment) diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/ipc.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/ipc.dm index d16ff8daa1d..7e6cce27caf 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/ipc.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/robotic/ipc.dm @@ -34,13 +34,13 @@ /datum/species/robotic/ipc/spec_revival(mob/living/carbon/human/transformer) . = ..() switch_to_screen(transformer, "Console") - addtimer(CALLBACK(src, .proc/switch_to_screen, transformer, saved_screen), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(switch_to_screen), transformer, saved_screen), 5 SECONDS) /datum/species/robotic/ipc/spec_death(gibbed, mob/living/carbon/human/transformer) . = ..() saved_screen = transformer.dna.mutant_bodyparts["ipc_screen"][MUTANT_INDEX_NAME] switch_to_screen(transformer, "BSOD") - addtimer(CALLBACK(src, .proc/switch_to_screen, transformer, "Blank"), 5 SECONDS) + addtimer(CALLBACK(src, PROC_REF(switch_to_screen), transformer, "Blank"), 5 SECONDS) /** * Simple proc to switch the screen of an IPC and ensuring it updates their appearance. diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/silicon_alt_brains.dm b/modular_skyrat/modules/customization/modules/surgery/organs/silicon_alt_brains.dm index 92a2ff8e57e..4994bcca5bd 100644 --- a/modular_skyrat/modules/customization/modules/surgery/organs/silicon_alt_brains.dm +++ b/modular_skyrat/modules/customization/modules/surgery/organs/silicon_alt_brains.dm @@ -47,7 +47,7 @@ /mob/living/silicon/robot/Initialize(mapload) . = ..() // Intentionally set like this, because people have different lore for their cyborgs, and there's no real non-invasive way to print posibrains that match. - RegisterSignal(src, COMSIG_MOB_MIND_TRANSFERRED_INTO, .proc/update_brain_type) + RegisterSignal(src, COMSIG_MOB_MIND_TRANSFERRED_INTO, PROC_REF(update_brain_type)) /// Sets the MMI type for a cyborg, if applicable. /mob/living/silicon/robot/proc/update_brain_type() diff --git a/modular_skyrat/modules/decay_subsystem/code/nests.dm b/modular_skyrat/modules/decay_subsystem/code/nests.dm index 4a04a7ef471..17f6deef374 100644 --- a/modular_skyrat/modules/decay_subsystem/code/nests.dm +++ b/modular_skyrat/modules/decay_subsystem/code/nests.dm @@ -45,7 +45,7 @@ /obj/structure/mob_spawner/proc/calculate_trigger_turfs() for(var/turf/open/seen_turf in view(trigger_range, src)) registered_turfs += seen_turf - RegisterSignal(seen_turf, COMSIG_ATOM_ENTERED, .proc/proximity_trigger) + RegisterSignal(seen_turf, COMSIG_ATOM_ENTERED, PROC_REF(proximity_trigger)) /obj/structure/mob_spawner/atom_destruction(damage_flag) if(loot) @@ -107,7 +107,7 @@ spawned_mob.faction = faction spawned_mob.ghost_controllable = ghost_controllable - RegisterSignal(spawned_mob, COMSIG_LIVING_DEATH, .proc/mob_death) + RegisterSignal(spawned_mob, COMSIG_LIVING_DEATH, PROC_REF(mob_death)) visible_message(span_danger("[spawned_mob] emerges from [src].")) @@ -125,7 +125,7 @@ var/mob/living/simple_animal/L = new chosen_mob_type(loc) visible_message(span_danger("[L] emerges from [src].")) retaliated = TRUE - addtimer(CALLBACK(src, .proc/ready_retaliate), retaliate_cooldown) + addtimer(CALLBACK(src, PROC_REF(ready_retaliate)), retaliate_cooldown) /obj/structure/mob_spawner/proc/ready_retaliate() retaliated = FALSE diff --git a/modular_skyrat/modules/decay_subsystem/code/spawn_nest.dm b/modular_skyrat/modules/decay_subsystem/code/spawn_nest.dm index 09c364e593e..5ab0c9a713b 100644 --- a/modular_skyrat/modules/decay_subsystem/code/spawn_nest.dm +++ b/modular_skyrat/modules/decay_subsystem/code/spawn_nest.dm @@ -26,7 +26,7 @@ "passive_spawning" = list("desc" = "Passive spawning", "type" = "boolean", "value" = "No"), "faction" = list("desc" = "Faction", "type" = "string", "value" = NEST_FACTION), "nest_icon" = list("desc" = "Nest icon state", "type" = "string", "value" = "nest"), - "spawn" = list("desc" = "Spawn nest", "type" = "button", "callback" = CALLBACK(src, .proc/spawn_it), "value" = "Spawn"), + "spawn" = list("desc" = "Spawn nest", "type" = "button", "callback" = CALLBACK(src, PROC_REF(spawn_it)), "value" = "Spawn"), ) ) diff --git a/modular_skyrat/modules/drone_adjustments/slide_component.dm b/modular_skyrat/modules/drone_adjustments/slide_component.dm index e7190093d74..fa634d42ae9 100644 --- a/modular_skyrat/modules/drone_adjustments/slide_component.dm +++ b/modular_skyrat/modules/drone_adjustments/slide_component.dm @@ -16,9 +16,9 @@ if(allowed_mobs_override) allowed_mobs = allowed_mobs_override //either bumping or ctrl click - RegisterSignal(atom_parent, COMSIG_CLICK_CTRL, .proc/check_conditions) + RegisterSignal(atom_parent, COMSIG_CLICK_CTRL, PROC_REF(check_conditions)) //so that we can know how to do that (sliding under) - RegisterSignal(atom_parent, COMSIG_PARENT_EXAMINE, .proc/ExamineMessage) + RegisterSignal(atom_parent, COMSIG_PARENT_EXAMINE, PROC_REF(ExamineMessage)) /datum/component/sliding_under/Destroy(force, silent) UnregisterSignal(atom_parent, list(COMSIG_CLICK_CTRL, COMSIG_PARENT_EXAMINE)) diff --git a/modular_skyrat/modules/electric_welder/code/electric_welder.dm b/modular_skyrat/modules/electric_welder/code/electric_welder.dm index 3d9e432a56e..99bdcb735a0 100644 --- a/modular_skyrat/modules/electric_welder/code/electric_welder.dm +++ b/modular_skyrat/modules/electric_welder/code/electric_welder.dm @@ -16,7 +16,7 @@ /obj/item/weldingtool/electric/Initialize(mapload) . = ..() - AddComponent(/datum/component/cell, cell_override, CALLBACK(src, .proc/switched_off)) + AddComponent(/datum/component/cell, cell_override, CALLBACK(src, PROC_REF(switched_off))) /obj/item/weldingtool/electric/attack_self(mob/user, modifiers) . = ..() diff --git a/modular_skyrat/modules/emergency_spacesuit/code/emergency_spacesuit.dm b/modular_skyrat/modules/emergency_spacesuit/code/emergency_spacesuit.dm index 54de3fd7896..95b88d02d53 100644 --- a/modular_skyrat/modules/emergency_spacesuit/code/emergency_spacesuit.dm +++ b/modular_skyrat/modules/emergency_spacesuit/code/emergency_spacesuit.dm @@ -23,7 +23,7 @@ /obj/item/clothing/suit/space/emergency/equipped(mob/user, slot) . = ..() - RegisterSignal(user, COMSIG_MOB_APPLY_DAMAGE, .proc/user_damaged) + RegisterSignal(user, COMSIG_MOB_APPLY_DAMAGE, PROC_REF(user_damaged)) /obj/item/clothing/suit/space/emergency/dropped(mob/user) . = ..() diff --git a/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm b/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm index 4dc9e959124..100f48b0c12 100644 --- a/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm +++ b/modular_skyrat/modules/emotes/code/additionalemotes/turf_emote.dm @@ -88,7 +88,7 @@ display_turf[initial(choice)] = option sort_list(display_turf) - var/chosen_turf = show_radial_menu(user, user, display_turf, custom_check = CALLBACK(src, .proc/check_menu, user)) + var/chosen_turf = show_radial_menu(user, user, display_turf, custom_check = CALLBACK(src, PROC_REF(check_menu), user)) if(QDELETED(src) || QDELETED(user) || !chosen_turf) return FALSE @@ -158,7 +158,7 @@ owned_turf.transform = owned_turf.transform.Translate(0, translate) owned_turf.appearance_flags = PIXEL_SCALE - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/turf_owner, override = TRUE) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(turf_owner), override = TRUE) return ..() diff --git a/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm b/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm index ebb2fc4e6d6..6ba444419b8 100644 --- a/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm +++ b/modular_skyrat/modules/energy_axe/code/energy_fireaxe.dm @@ -21,8 +21,8 @@ /obj/item/fireaxe/energy/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_TWOHANDED_WIELD, .proc/energy_wield, override = TRUE) - RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, .proc/energy_unwield, override = TRUE) + RegisterSignal(src, COMSIG_TWOHANDED_WIELD, PROC_REF(energy_wield), override = TRUE) + RegisterSignal(src, COMSIG_TWOHANDED_UNWIELD, PROC_REF(energy_unwield), override = TRUE) AddComponent(/datum/component/two_handed, force_unwielded = 10, force_wielded = 33, icon_wielded = "[base_icon_state]1", wieldsound = 'sound/weapons/saberon.ogg', unwieldsound = 'sound/weapons/saberoff.ogg') /obj/item/fireaxe/energy/proc/energy_wield(obj/item/source, mob/living/carbon/user) diff --git a/modular_skyrat/modules/event_vote/code/event_vote.dm b/modular_skyrat/modules/event_vote/code/event_vote.dm index e79db4f677c..b9af494e664 100644 --- a/modular_skyrat/modules/event_vote/code/event_vote.dm +++ b/modular_skyrat/modules/event_vote/code/event_vote.dm @@ -83,7 +83,7 @@ if(admin_client?.prefs?.toggles & SOUND_ADMINHELP) SEND_SOUND(admin_client.mob, sound('sound/misc/bloop.ogg')) // Admins need a little boop. - timer_id = addtimer(CALLBACK(src, .proc/end_vote), EVENT_VOTE_TIME, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(end_vote)), EVENT_VOTE_TIME, TIMER_STOPPABLE) vote_in_progress = TRUE vote_end_time = world.time + EVENT_VOTE_TIME @@ -112,7 +112,7 @@ continue possible_events += iterating_preset - timer_id = addtimer(CALLBACK(src, .proc/end_vote), EVENT_VOTE_TIME, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(end_vote)), EVENT_VOTE_TIME, TIMER_STOPPABLE) vote_in_progress = TRUE vote_end_time = world.time + EVENT_VOTE_TIME @@ -138,7 +138,7 @@ event_action.Grant(iterating_user) generated_actions += event_action - timer_id = addtimer(CALLBACK(src, .proc/end_vote), EVENT_VOTE_TIME, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(end_vote)), EVENT_VOTE_TIME, TIMER_STOPPABLE) vote_in_progress = TRUE vote_end_time = world.time + EVENT_VOTE_TIME @@ -170,7 +170,7 @@ event_action.Grant(iterating_user) generated_actions += event_action - timer_id = addtimer(CALLBACK(src, .proc/end_vote), EVENT_VOTE_TIME, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(end_vote)), EVENT_VOTE_TIME, TIMER_STOPPABLE) vote_in_progress = TRUE vote_end_time = world.time + EVENT_VOTE_TIME diff --git a/modular_skyrat/modules/ghostcafe/code/dusts_on_leaving_area.dm b/modular_skyrat/modules/ghostcafe/code/dusts_on_leaving_area.dm index aeb4bb2a7c8..72bfb43a893 100644 --- a/modular_skyrat/modules/ghostcafe/code/dusts_on_leaving_area.dm +++ b/modular_skyrat/modules/ghostcafe/code/dusts_on_leaving_area.dm @@ -10,7 +10,7 @@ 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/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm index bb1edb50eae..05de6b4ca3e 100644 --- a/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm +++ b/modular_skyrat/modules/gladiator/code/game/objects/items/gladiator_items.dm @@ -169,7 +169,7 @@ duration = 0.8 SECONDS // worth tweaking? /datum/status_effect/dodgeroll_iframes/on_apply() - RegisterSignal(owner, COMSIG_HUMAN_CHECK_SHIELDS, .proc/whiff) + RegisterSignal(owner, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(whiff)) return TRUE /datum/status_effect/dodgeroll_iframes/on_remove() diff --git a/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm b/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm index 195e6eda021..0f023b7a58c 100644 --- a/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm +++ b/modular_skyrat/modules/gladiator/code/modules/mob/living/simple_animal/hostile/megafauna/markedone.dm @@ -126,7 +126,7 @@ if(charging && (get_dist(src, target) <= 1)) Bump(target) if(. && prob(5 * phase)) - INVOKE_ASYNC(src, .proc/teleport, target) + INVOKE_ASYNC(src, PROC_REF(teleport), target) /// As the marked one is only theoretically capable of ignoring gravity, this makes him not walk on chasms, and prevents him from moving if spinning or stunned. It also figures out if he hits a wall while charging! /mob/living/simple_animal/hostile/megafauna/gladiator/Move(atom/newloc, dir, step_x, step_y) @@ -169,13 +169,13 @@ if(. && charging) chargetiles++ if(chargetiles >= chargerange) - INVOKE_ASYNC(src, .proc/discharge) + INVOKE_ASYNC(src, PROC_REF(discharge)) return FALSE . = ..() if(. && charging) chargetiles++ if(chargetiles >= chargerange) - INVOKE_ASYNC(src, .proc/discharge) + INVOKE_ASYNC(src, PROC_REF(discharge)) /// Fucks up the day of whoever he walks into, so long as he's charging and the mob is alive. If he walks into a wall, he gets stunned instead! /mob/living/simple_animal/hostile/megafauna/gladiator/Bump(atom/A) @@ -198,7 +198,7 @@ return if(anger_timer_id) deltimer(anger_timer_id) - anger_timer_id = addtimer(CALLBACK(src, .proc/get_calm), MARKED_ONE_ANGER_DURATION, TIMER_STOPPABLE) + anger_timer_id = addtimer(CALLBACK(src, PROC_REF(get_calm)), MARKED_ONE_ANGER_DURATION, TIMER_STOPPABLE) /// Makes the Marked One a sleepy boy that don't wanna hurt nobody. He starts like this and progresses to his hostile state after seeing an ash walker or being punched in the noggin. /mob/living/simple_animal/hostile/megafauna/gladiator/proc/get_calm() @@ -267,7 +267,7 @@ if(FIFTY_PERCENT to SEVENTY_FIVE_PERCENT) if(phase == MARKED_ONE_FIRST_PHASE) phase = MARKED_ONE_SECOND_PHASE - INVOKE_ASYNC(src, .proc/charge, target, 21) + INVOKE_ASYNC(src, PROC_REF(charge), target, 21) playsound(src, 'sound/effects/clockcult_gateway_disrupted.ogg', 200, 1, 2) icon_state = "marked2" rapid_melee = 2 @@ -277,7 +277,7 @@ if(SHOWDOWN_PERCENT to FIFTY_PERCENT) if(phase == MARKED_ONE_SECOND_PHASE) phase = MARKED_ONE_THIRD_PHASE - INVOKE_ASYNC(src, .proc/charge, target, 21) + INVOKE_ASYNC(src, PROC_REF(charge), target, 21) playsound(src, 'sound/effects/clockcult_gateway_charging.ogg', 200, 1, 2) rapid_melee = 4 melee_damage_upper = 25 @@ -286,7 +286,7 @@ if(0 to SHOWDOWN_PERCENT) if (phase == MARKED_ONE_THIRD_PHASE) phase = MARKED_ONE_FINAL_PHASE - INVOKE_ASYNC(src, .proc/charge, target, 21) + INVOKE_ASYNC(src, PROC_REF(charge), target, 21) playsound(src, 'sound/effects/clockcult_gateway_active.ogg', 200, 1, 2) icon_state = "marked3" rapid_melee = 1 @@ -331,7 +331,7 @@ hit_things |= slapped if(!spinning) break - sleep(0.75) //addtimer(CALLBACK(src, .proc/convince_zonespace_to_let_me_use_sleeps), 2 WEEKS) + sleep(0.75) //addtimer(CALLBACK(src, PROC_REF(convince_zonespace_to_let_me_use_sleeps)), 2 WEEKS) animate(src, color = initial(color), 3) sleep(3) spinning = FALSE @@ -431,68 +431,68 @@ switch(phase) if(MARKED_ONE_FIRST_PHASE) if(prob(10) && (get_dist(src, target) <= spinning_range)) - INVOKE_ASYNC(src, .proc/spinattack) - INVOKE_ASYNC(src, .proc/stomp) + INVOKE_ASYNC(src, PROC_REF(spinattack)) + INVOKE_ASYNC(src, PROC_REF(stomp)) ranged_cooldown += 5.5 SECONDS else if(prob(50)) - INVOKE_ASYNC(src, .proc/swordslam) + INVOKE_ASYNC(src, PROC_REF(swordslam)) ranged_cooldown += 3 SECONDS else - INVOKE_ASYNC(src, .proc/bone_knife_throw, target) + INVOKE_ASYNC(src, PROC_REF(bone_knife_throw), target) ranged_cooldown += 1 SECONDS if(MARKED_ONE_SECOND_PHASE) if(prob(75)) if(prob(80)) if(prob(50) && (get_dist(src, target) <= spinning_range)) - INVOKE_ASYNC(src, .proc/spinattack) - INVOKE_ASYNC(src, .proc/stomp) + INVOKE_ASYNC(src, PROC_REF(spinattack)) + INVOKE_ASYNC(src, PROC_REF(stomp)) ranged_cooldown += 5 SECONDS else - INVOKE_ASYNC(src, .proc/swordslam) + INVOKE_ASYNC(src, PROC_REF(swordslam)) ranged_cooldown += 2 SECONDS else - INVOKE_ASYNC(src, .proc/bone_knife_throw, target) - INVOKE_ASYNC(src, .proc/teleport, target) + INVOKE_ASYNC(src, PROC_REF(bone_knife_throw), target) + INVOKE_ASYNC(src, PROC_REF(teleport), target) ranged_cooldown += 2 SECONDS else - INVOKE_ASYNC(src, .proc/teleport, target) + INVOKE_ASYNC(src, PROC_REF(teleport), target) ranged_cooldown += 0.5 SECONDS if(MARKED_ONE_THIRD_PHASE) if(prob(70)) if(prob(50)) if(prob(30) && (get_dist(src, target) <= spinning_range)) - INVOKE_ASYNC(src, .proc/spinattack) - INVOKE_ASYNC(src, .proc/stomp) + INVOKE_ASYNC(src, PROC_REF(spinattack)) + INVOKE_ASYNC(src, PROC_REF(stomp)) ranged_cooldown += 4.5 SECONDS else - INVOKE_ASYNC(src, .proc/swordslam) + INVOKE_ASYNC(src, PROC_REF(swordslam)) ranged_cooldown += 2 SECONDS else - INVOKE_ASYNC(src, .proc/bone_knife_throw, target) - INVOKE_ASYNC(src, .proc/teleport, target) + INVOKE_ASYNC(src, PROC_REF(bone_knife_throw), target) + INVOKE_ASYNC(src, PROC_REF(teleport), target) ranged_cooldown += 2 SECONDS else - INVOKE_ASYNC(src, .proc/bone_knife_throw, target) + INVOKE_ASYNC(src, PROC_REF(bone_knife_throw), target) ranged_cooldown += 0.5 SECONDS if(MARKED_ONE_FINAL_PHASE) if(prob(50)) if(prob(50)) if(prob(25)) - INVOKE_ASYNC(src, .proc/bone_knife_throw, target) - INVOKE_ASYNC(src, .proc/teleport, target) - INVOKE_ASYNC(src, .proc/stomp) + INVOKE_ASYNC(src, PROC_REF(bone_knife_throw), target) + INVOKE_ASYNC(src, PROC_REF(teleport), target) + INVOKE_ASYNC(src, PROC_REF(stomp)) ranged_cooldown += 2 SECONDS else - INVOKE_ASYNC(src, .proc/swordslam) + INVOKE_ASYNC(src, PROC_REF(swordslam)) ranged_cooldown += 2 SECONDS else - INVOKE_ASYNC(src, .proc/bone_knife_throw, target) - INVOKE_ASYNC(src, .proc/stomp) + INVOKE_ASYNC(src, PROC_REF(bone_knife_throw), target) + INVOKE_ASYNC(src, PROC_REF(stomp)) ranged_cooldown += 0.5 SECONDS else - INVOKE_ASYNC(src, .proc/teleport, target) - INVOKE_ASYNC(src, .proc/stomp) + INVOKE_ASYNC(src, PROC_REF(teleport), target) + INVOKE_ASYNC(src, PROC_REF(stomp)) ranged_cooldown += 0.5 SECONDS #undef MARKED_ONE_STUN_DURATION diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index 5f7571bbb86..a0550669a65 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -142,7 +142,7 @@ resolve_parent.add_fingerprint(user) attempt_remove(gun_to_draw, get_turf(user)) playsound(resolve_parent, 'modular_skyrat/modules/sec_haul/sound/holsterout.ogg', 50, TRUE, -5) - INVOKE_ASYNC(user, /mob/.proc/put_in_hands, gun_to_draw) + INVOKE_ASYNC(user, TYPE_PROC_REF(/mob, put_in_hands), gun_to_draw) user.visible_message(span_warning("[user] draws [gun_to_draw] from [resolve_parent]!"), span_notice("You draw [gun_to_draw] from [resolve_parent].")) /* diff --git a/modular_skyrat/modules/gunhud/code/gun_hud_component.dm b/modular_skyrat/modules/gunhud/code/gun_hud_component.dm index 9257f930750..68a9c31d5cb 100644 --- a/modular_skyrat/modules/gunhud/code/gun_hud_component.dm +++ b/modular_skyrat/modules/gunhud/code/gun_hud_component.dm @@ -5,7 +5,7 @@ . = ..() if(!istype(parent, /obj/item/gun) && !istype(parent, /obj/item/weldingtool)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/wake_up) + RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(wake_up)) /datum/component/ammo_hud/Destroy() turn_off() @@ -14,7 +14,7 @@ /datum/component/ammo_hud/proc/wake_up(datum/source, mob/user, slot) SIGNAL_HANDLER - RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_ITEM_DROPPED), .proc/turn_off) + RegisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_ITEM_DROPPED), PROC_REF(turn_off)) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -28,7 +28,7 @@ /datum/component/ammo_hud/proc/turn_on() SIGNAL_HANDLER - RegisterSignal(parent, COMSIG_UPDATE_AMMO_HUD, .proc/update_hud) + RegisterSignal(parent, COMSIG_UPDATE_AMMO_HUD, PROC_REF(update_hud)) hud.turn_on() update_hud() diff --git a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm index 7dd0eeb2c77..c484b870229 100644 --- a/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm +++ b/modular_skyrat/modules/gunpoint/code/gunpoint_datum.dm @@ -37,21 +37,21 @@ target.gp_effect = new target.vis_contents += target.gp_effect - RegisterSignal(source, COMSIG_MOVABLE_MOVED, .proc/source_moved) + RegisterSignal(source, COMSIG_MOVABLE_MOVED, PROC_REF(source_moved)) - RegisterSignal(source, COMSIG_LIVING_STATUS_STUN, .proc/source_cc) - RegisterSignal(source, COMSIG_LIVING_STATUS_KNOCKDOWN, .proc/source_cc) - RegisterSignal(source, COMSIG_LIVING_STATUS_PARALYZE, .proc/source_cc) - RegisterSignal(source, COMSIG_LIVING_UPDATED_RESTING, .proc/source_updated_resting) + RegisterSignal(source, COMSIG_LIVING_STATUS_STUN, PROC_REF(source_cc)) + RegisterSignal(source, COMSIG_LIVING_STATUS_KNOCKDOWN, PROC_REF(source_cc)) + RegisterSignal(source, COMSIG_LIVING_STATUS_PARALYZE, PROC_REF(source_cc)) + RegisterSignal(source, COMSIG_LIVING_UPDATED_RESTING, PROC_REF(source_updated_resting)) - RegisterSignal(aimed_gun, COMSIG_ITEM_EQUIPPED,.proc/click_destroy) - RegisterSignal(aimed_gun, COMSIG_ITEM_DROPPED,.proc/click_destroy) + RegisterSignal(aimed_gun, COMSIG_ITEM_EQUIPPED,PROC_REF(click_destroy)) + RegisterSignal(aimed_gun, COMSIG_ITEM_DROPPED,PROC_REF(click_destroy)) - RegisterSignal(target, COMSIG_PARENT_QDELETING, .proc/Destroy) - RegisterSignal(source, COMSIG_PARENT_QDELETING, .proc/Destroy) + RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(Destroy)) + RegisterSignal(source, COMSIG_PARENT_QDELETING, PROC_REF(Destroy)) - addtimer(CALLBACK(src, .proc/lock_on), 7) + addtimer(CALLBACK(src, PROC_REF(lock_on)), 7) /datum/gunpoint/proc/lock_on() if(src) //if we're not present then locking on failed and this datum is deleted diff --git a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm index b367c691c6c..76ba34a91a0 100644 --- a/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm +++ b/modular_skyrat/modules/gunsgalore/code/guns/mg34.dm @@ -125,7 +125,7 @@ /obj/item/gun/ballistic/automatic/mg34/mg42/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_GUN_FIRED, .proc/process_heat) + RegisterSignal(src, COMSIG_GUN_FIRED, PROC_REF(process_heat)) START_PROCESSING(SSobj, src) /obj/item/gun/ballistic/automatic/mg34/mg42/process(delta_time) @@ -155,7 +155,7 @@ /obj/item/gun/ballistic/automatic/mg34/mg42/pickup(mob/user) . = ..() - RegisterSignal(user, COMSIG_LIVING_UPDATED_RESTING, .proc/deploy_bipod) + RegisterSignal(user, COMSIG_LIVING_UPDATED_RESTING, PROC_REF(deploy_bipod)) /obj/item/gun/ballistic/automatic/mg34/mg42/dropped(mob/user) . = ..() @@ -184,7 +184,7 @@ if(barrel_heat >= 100) overheated = TRUE playsound(src, 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg_overheat.ogg', 100) - addtimer(CALLBACK(src, .proc/reset_overheat), TIME_TO_COOLDOWN) + addtimer(CALLBACK(src, PROC_REF(reset_overheat)), TIME_TO_COOLDOWN) update_appearance() /obj/item/gun/ballistic/automatic/mg34/mg42/proc/reset_overheat() diff --git a/modular_skyrat/modules/hev_suit/code/hev_suit.dm b/modular_skyrat/modules/hev_suit/code/hev_suit.dm index a5563968901..d672deb5fbc 100644 --- a/modular_skyrat/modules/hev_suit/code/hev_suit.dm +++ b/modular_skyrat/modules/hev_suit/code/hev_suit.dm @@ -273,7 +273,7 @@ playing_voice_line = TRUE playsound(src, voice, volume) queued_voice_lines -= voice_line - addtimer(CALLBACK(src, .proc/reset_sound), 4 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_sound)), 4 SECONDS) return playing_voice_line = TRUE @@ -282,7 +282,7 @@ voice.status = SOUND_STREAM playsound(src, voice, volume) - addtimer(CALLBACK(src, .proc/reset_sound), 4 SECONDS) + addtimer(CALLBACK(src, PROC_REF(reset_sound)), 4 SECONDS) /obj/item/clothing/suit/space/hev_suit/proc/reset_sound() playing_voice_line = FALSE @@ -336,7 +336,7 @@ send_message("...CALIBRATED", HEV_COLOR_GREEN) send_message("CALIBRATING REACTIVE ARMOR SYSTEMS...") - timer_id = addtimer(CALLBACK(src, .proc/powerarmor), 10 SECONDS, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(powerarmor)), 10 SECONDS, TIMER_STOPPABLE) /obj/item/clothing/suit/space/hev_suit/proc/use_hev_power(amount) var/power_test = item_use_power(amount) @@ -424,11 +424,11 @@ user_old_toxloss = current_user.getToxLoss() user_old_cloneloss = current_user.getCloneLoss() user_old_oxyloss = current_user.getOxyLoss() - RegisterSignal(current_user, COMSIG_MOB_RUN_ARMOR, .proc/process_hit) + RegisterSignal(current_user, COMSIG_MOB_RUN_ARMOR, PROC_REF(process_hit)) playsound(src, armor_sound, 50) send_message("...CALIBRATED", HEV_COLOR_GREEN) send_message("CALIBRATING ATMOSPHERIC CONTAMINANT SENSORS...") - timer_id = addtimer(CALLBACK(src, .proc/atmospherics), 4 SECONDS, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(atmospherics)), 4 SECONDS, TIMER_STOPPABLE) /obj/item/clothing/suit/space/hev_suit/proc/process_hit() SIGNAL_HANDLER @@ -484,7 +484,7 @@ if(!tank || !istype(tank)) send_message("...FAILURE, NO TANK DETECTED", HEV_COLOR_RED) send_message("CALIBRATING VITALSIGN MONITORING SYSTEMS...") - timer_id = addtimer(CALLBACK(src, .proc/vitalsigns), 4 SECONDS, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(vitalsigns)), 4 SECONDS, TIMER_STOPPABLE) return current_internals_tank = tank ADD_TRAIT(current_internals_tank, TRAIT_NODROP, "hev_trait") @@ -492,7 +492,7 @@ playsound(src, atmospherics_sound, 50) send_message("...CALIBRATED", HEV_COLOR_GREEN) send_message("CALIBRATING VITALSIGN MONITORING SYSTEMS...") - timer_id = addtimer(CALLBACK(src, .proc/vitalsigns), 4 SECONDS, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(vitalsigns)), 4 SECONDS, TIMER_STOPPABLE) /obj/item/clothing/suit/space/hev_suit/proc/handle_tank() @@ -502,11 +502,11 @@ current_internals_tank.populate_gas() /obj/item/clothing/suit/space/hev_suit/proc/vitalsigns() - RegisterSignal(current_user, COMSIG_MOB_STATCHANGE, .proc/stat_changed) + RegisterSignal(current_user, COMSIG_MOB_STATCHANGE, PROC_REF(stat_changed)) playsound(src, vitalsigns_sound, 50) send_message("...CALIBRATED", HEV_COLOR_GREEN) send_message("CALIBRATING AUTOMATIC MEDICAL SYSTEMS...") - timer_id = addtimer(CALLBACK(src, .proc/medical_systems), 3 SECONDS, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(medical_systems)), 3 SECONDS, TIMER_STOPPABLE) /obj/item/clothing/suit/space/hev_suit/proc/stat_changed(datum/source, new_stat) SIGNAL_HANDLER @@ -516,13 +516,13 @@ deactivate() /obj/item/clothing/suit/space/hev_suit/proc/medical_systems() - RegisterSignal(current_user, COMSIG_CARBON_GAIN_WOUND, .proc/process_wound) - RegisterSignal(current_user, COMSIG_ATOM_ACID_ACT, .proc/process_acid) + RegisterSignal(current_user, COMSIG_CARBON_GAIN_WOUND, PROC_REF(process_wound)) + RegisterSignal(current_user, COMSIG_ATOM_ACID_ACT, PROC_REF(process_acid)) START_PROCESSING(SSobj, src) playsound(src, automedic_sound, 50) send_message("...CALIBRATED", HEV_COLOR_GREEN) send_message("CALIBRATING DEFENSIVE WEAPON SELECTION SYSTEMS...") - timer_id = addtimer(CALLBACK(src, .proc/weaponselect), 3 SECONDS, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(weaponselect)), 3 SECONDS, TIMER_STOPPABLE) /obj/item/clothing/suit/space/hev_suit/process(delta_time) if(!activated) @@ -676,20 +676,20 @@ playsound(src, weaponselect_sound, 50) send_message("...CALIBRATED", HEV_COLOR_GREEN) send_message("CALIBRATING MUNITION LEVEL MONITORING SYSTEMS...") - timer_id = addtimer(CALLBACK(src, .proc/munitions_monitoring), 4 SECONDS, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(munitions_monitoring)), 4 SECONDS, TIMER_STOPPABLE) /obj/item/clothing/suit/space/hev_suit/proc/munitions_monitoring() //Crickets, not sure what to make this do! playsound(src, munitions_sound, 50) send_message("...CALIBRATED", HEV_COLOR_GREEN) send_message("CALIBRATING COMMUNICATIONS SYSTEMS...") - timer_id = addtimer(CALLBACK(src, .proc/comms_system), 4 SECONDS, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(comms_system)), 4 SECONDS, TIMER_STOPPABLE) /obj/item/clothing/suit/space/hev_suit/proc/comms_system() playsound(src, communications_sound, 50) send_message("...CALIBRATED", HEV_COLOR_GREEN) - timer_id = addtimer(CALLBACK(src, .proc/finished), 4 SECONDS, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(finished)), 4 SECONDS, TIMER_STOPPABLE) /obj/item/clothing/suit/space/hev_suit/proc/finished() to_chat(current_user, span_notice("You feel [src] seal around your body, locking it in place!")) diff --git a/modular_skyrat/modules/horrorform/code/true_changeling.dm b/modular_skyrat/modules/horrorform/code/true_changeling.dm index 408becac9c0..35433b3b604 100644 --- a/modular_skyrat/modules/horrorform/code/true_changeling.dm +++ b/modular_skyrat/modules/horrorform/code/true_changeling.dm @@ -106,10 +106,10 @@ anchored = TRUE turn_to_human.Remove() AddComponent(/datum/component/pellet_cloud, projectile_type=/obj/projectile/bullet/pellet/bone_fragment, magnitude=8) - addtimer(CALLBACK(src, .proc/real_death), rand(3 SECONDS, 6 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(real_death)), rand(3 SECONDS, 6 SECONDS)) else visible_message(span_warning("[src] lets out a waning scream as it falls, twitching, to the floor.")) - addtimer(CALLBACK(src, .proc/revive_from_death), 45 SECONDS) + addtimer(CALLBACK(src, PROC_REF(revive_from_death)), 45 SECONDS) /mob/living/simple_animal/hostile/true_changeling/proc/revive_from_death() if(!src) diff --git a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm index 4788bec9c9f..12ef4ca0702 100644 --- a/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm +++ b/modular_skyrat/modules/hyposprays/code/hypospray_kits.dm @@ -63,7 +63,7 @@ var/casetype = cmo_case_designs if(!src.cmo_case) casetype = case_designs - var/choice = show_radial_menu(user, src , casetype, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 42, require_near = TRUE) + var/choice = show_radial_menu(user, src , casetype, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 42, require_near = TRUE) if(!choice) return FALSE current_case = choice diff --git a/modular_skyrat/modules/implants/code/augments_internal.dm b/modular_skyrat/modules/implants/code/augments_internal.dm index 0d5247d1de6..350c515ca55 100644 --- a/modular_skyrat/modules/implants/code/augments_internal.dm +++ b/modular_skyrat/modules/implants/code/augments_internal.dm @@ -12,7 +12,7 @@ H.AdjustSleeping(-100, FALSE) to_chat(owner, span_notice("You feel a rush of energy course through your body!")) cooldown = TRUE - addtimer(CALLBACK(src, .proc/sleepytimerend), 50) + addtimer(CALLBACK(src, PROC_REF(sleepytimerend)), 50) else return @@ -28,7 +28,7 @@ organ_flags |= ORGAN_FAILING H.AdjustUnconscious(200) cooldown = TRUE - addtimer(CALLBACK(src, .proc/reboot), 90 / severity) + addtimer(CALLBACK(src, PROC_REF(reboot)), 90 / severity) /obj/item/organ/internal/cyberimp/brain/anti_sleep/proc/reboot() organ_flags &= ~ORGAN_FAILING diff --git a/modular_skyrat/modules/indicators/code/combat_indicator.dm b/modular_skyrat/modules/indicators/code/combat_indicator.dm index 121a10fe62d..7e9492844ae 100644 --- a/modular_skyrat/modules/indicators/code/combat_indicator.dm +++ b/modular_skyrat/modules/indicators/code/combat_indicator.dm @@ -101,7 +101,7 @@ GLOBAL_VAR_INIT(combat_indicator_overlay, GenerateCombatOverlay()) combat_indicator = TRUE apply_status_effect(/datum/status_effect/grouped/surrender, src) log_message("has turned ON the combat indicator!", LOG_ATTACK) - RegisterSignal(src, COMSIG_LIVING_STATUS_UNCONSCIOUS, .proc/combat_indicator_unconscious_signal) //From now on, whenever this mob falls unconcious, the referenced proc will fire. + RegisterSignal(src, COMSIG_LIVING_STATUS_UNCONSCIOUS, PROC_REF(combat_indicator_unconscious_signal)) //From now on, whenever this mob falls unconcious, the referenced proc will fire. else combat_indicator = FALSE remove_status_effect(/datum/status_effect/grouped/surrender, src) diff --git a/modular_skyrat/modules/indicators/code/sealed.dm b/modular_skyrat/modules/indicators/code/sealed.dm index d0160540540..15b1c7f2e15 100644 --- a/modular_skyrat/modules/indicators/code/sealed.dm +++ b/modular_skyrat/modules/indicators/code/sealed.dm @@ -6,7 +6,7 @@ //Register the signal to the mob and mechs will listen for when CI is toggled, then call the parent proc, then turn on CI if the mob had CI on. /obj/vehicle/sealed/add_occupant(mob/occupant_entering, control_flags) - RegisterSignal(occupant_entering, COMSIG_MOB_CI_TOGGLED, .proc/mob_toggled_ci) + RegisterSignal(occupant_entering, COMSIG_MOB_CI_TOGGLED, PROC_REF(mob_toggled_ci)) . = ..() handle_ci_migration(occupant_entering) diff --git a/modular_skyrat/modules/inflatables/code/inflatable.dm b/modular_skyrat/modules/inflatables/code/inflatable.dm index 991b987afe1..d241f91c6b5 100644 --- a/modular_skyrat/modules/inflatables/code/inflatable.dm +++ b/modular_skyrat/modules/inflatables/code/inflatable.dm @@ -65,7 +65,7 @@ playsound(src, 'sound/machines/hiss.ogg', 75, 1) if(!violent) balloon_alert_to_viewers("slowly deflates!") - addtimer(CALLBACK(src, .proc/slow_deflate_finish), manual_deflation_time) + addtimer(CALLBACK(src, PROC_REF(slow_deflate_finish)), manual_deflation_time) return balloon_alert_to_viewers("rapidly deflates!") if(torn_type) diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm index b39449501b8..89f50e625fe 100644 --- a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm +++ b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm @@ -31,7 +31,7 @@ interactions.Add(interaction) /datum/component/interactable/RegisterWithParent() - RegisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT, .proc/open_interaction_menu) + RegisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT, PROC_REF(open_interaction_menu)) /datum/component/interactable/UnregisterFromParent() UnregisterSignal(parent, COMSIG_CLICK_CTRL_SHIFT) diff --git a/modular_skyrat/modules/jukebox/code/dance_machine.dm b/modular_skyrat/modules/jukebox/code/dance_machine.dm index 8ee46c1b6d0..31cb866729e 100644 --- a/modular_skyrat/modules/jukebox/code/dance_machine.dm +++ b/modular_skyrat/modules/jukebox/code/dance_machine.dm @@ -290,7 +290,7 @@ glow.set_light_color(COLOR_SOFT_RED) glow.even_cycle = !glow.even_cycle if(prob(2)) // Unique effects for the dance floor that show up randomly to mix things up - INVOKE_ASYNC(src, .proc/hierofunk) + INVOKE_ASYNC(src, PROC_REF(hierofunk)) sleep(selection.song_beat) if(QDELETED(src)) return @@ -311,7 +311,7 @@ /obj/machinery/jukebox/disco/proc/dance2(mob/living/M) for(var/i in 0 to 9) - dance_rotate(M, CALLBACK(M, /mob.proc/dance_flip)) + dance_rotate(M, CALLBACK(M, TYPE_PROC_REF(/mob, dance_flip))) sleep(2 SECONDS) /mob/proc/dance_flip() diff --git a/modular_skyrat/modules/liquids/code/drains.dm b/modular_skyrat/modules/liquids/code/drains.dm index e357c74f576..c9b15660056 100644 --- a/modular_skyrat/modules/liquids/code/drains.dm +++ b/modular_skyrat/modules/liquids/code/drains.dm @@ -54,7 +54,7 @@ if(!isturf(loc)) stack_trace("Drain structure initialized not on a turf") my_turf = loc - RegisterSignal(my_turf, COMSIG_TURF_LIQUIDS_CREATION, .proc/liquids_signal) + RegisterSignal(my_turf, COMSIG_TURF_LIQUIDS_CREATION, PROC_REF(liquids_signal)) if(my_turf.liquids) START_PROCESSING(SSobj, src) processing = TRUE diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm index ab139049576..ed7bdb8104e 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_effect.dm @@ -451,7 +451,7 @@ qdel(tempr) falling_carbon.adjustOxyLoss(5) //C.emote("cough") - INVOKE_ASYNC(falling_carbon, /mob.proc/emote, "cough") + INVOKE_ASYNC(falling_carbon, TYPE_PROC_REF(/mob, emote), "cough") to_chat(falling_carbon, span_userdanger("You fall in and swallow some water!")) else to_chat(M, span_userdanger("You fall in the water!")) @@ -462,9 +462,9 @@ CRASH("Liquid Turf created with the liquids sybsystem not yet initialized!") if(!immutable) my_turf = loc - RegisterSignal(my_turf, COMSIG_ATOM_ENTERED, .proc/movable_entered) - RegisterSignal(my_turf, COMSIG_TURF_MOB_FALL, .proc/mob_fall) - RegisterSignal(my_turf, COMSIG_PARENT_EXAMINE, .proc/examine_turf) + RegisterSignal(my_turf, COMSIG_ATOM_ENTERED, PROC_REF(movable_entered)) + RegisterSignal(my_turf, COMSIG_TURF_MOB_FALL, PROC_REF(mob_fall)) + RegisterSignal(my_turf, COMSIG_PARENT_EXAMINE, PROC_REF(examine_turf)) SSliquids.add_active_turf(my_turf) SEND_SIGNAL(my_turf, COMSIG_TURF_LIQUIDS_CREATION, src) @@ -526,8 +526,8 @@ my_turf = NewT NewT.liquids = src loc = NewT - RegisterSignal(my_turf, COMSIG_ATOM_ENTERED, .proc/movable_entered) - RegisterSignal(my_turf, COMSIG_TURF_MOB_FALL, .proc/mob_fall) + RegisterSignal(my_turf, COMSIG_ATOM_ENTERED, PROC_REF(movable_entered)) + RegisterSignal(my_turf, COMSIG_TURF_MOB_FALL, PROC_REF(mob_fall)) /** * Handles COMSIG_PARENT_EXAMINE for the turf. @@ -591,8 +591,8 @@ T.liquids = src T.vis_contents += src SSliquids.active_immutables[T] = TRUE - RegisterSignal(T, COMSIG_ATOM_ENTERED, .proc/movable_entered) - RegisterSignal(T, COMSIG_TURF_MOB_FALL, .proc/mob_fall) + RegisterSignal(T, COMSIG_ATOM_ENTERED, PROC_REF(movable_entered)) + RegisterSignal(T, COMSIG_TURF_MOB_FALL, PROC_REF(mob_fall)) /obj/effect/abstract/liquid_turf/proc/remove_turf(turf/T) SSliquids.active_immutables -= T diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_height.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_height.dm index 1753bf4f325..22e1dae7161 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_height.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_height.dm @@ -18,7 +18,7 @@ src.height_applied = height_applied - RegisterSignal(target, COMSIG_MOVABLE_MOVED, .proc/on_target_move) + RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(on_target_move)) var/atom/movable/movable_target = target if(isturf(movable_target.loc)) var/turf/turf_loc = movable_target.loc diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm index 09912501002..67566adc06c 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_interaction.dm @@ -12,7 +12,7 @@ interaction_callback = CALLBACK(parent, on_interaction_callback) /datum/component/liquids_interaction/RegisterWithParent() - RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/AfterAttack) //The only signal allowing item -> turf interaction + RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, PROC_REF(AfterAttack)) //The only signal allowing item -> turf interaction /datum/component/liquids_interaction/UnregisterFromParent() UnregisterSignal(parent, COMSIG_ITEM_AFTERATTACK) diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm index dd02a96faa9..f14f6f4d894 100644 --- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm +++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_plumbers.dm @@ -29,7 +29,7 @@ /obj/machinery/plumbing/floor_pump/Initialize(mapload, bolt, layer) . = ..() - RegisterSignal(src, list(COMSIG_OBJ_HIDE), .proc/on_hide) + RegisterSignal(src, list(COMSIG_OBJ_HIDE), PROC_REF(on_hide)) /obj/machinery/plumbing/floor_pump/examine(mob/user) . = ..() diff --git a/modular_skyrat/modules/loadouts/loadout_ui/loadout_manager.dm b/modular_skyrat/modules/loadouts/loadout_ui/loadout_manager.dm index 09259fa841a..f17d76b42f5 100644 --- a/modular_skyrat/modules/loadouts/loadout_ui/loadout_manager.dm +++ b/modular_skyrat/modules/loadouts/loadout_ui/loadout_manager.dm @@ -175,12 +175,12 @@ src, usr, allowed_configs, - CALLBACK(src, .proc/set_slot_greyscale, colored_item), + CALLBACK(src, PROC_REF(set_slot_greyscale), colored_item), starting_icon_state = initial(colored_item.icon_state), starting_config = initial(colored_item.greyscale_config), starting_colors = slot_starting_colors, ) - RegisterSignal(menu, COMSIG_PARENT_PREQDELETED, /datum/loadout_manager.proc/cleanup_greyscale_menu) + RegisterSignal(menu, COMSIG_PARENT_PREQDELETED, TYPE_PROC_REF(/datum/loadout_manager, cleanup_greyscale_menu)) menu.ui_interact(usr) /// A proc to make sure our menu gets null'd properly when it's deleted. diff --git a/modular_skyrat/modules/marines/code/modsuit_modules.dm b/modular_skyrat/modules/marines/code/modsuit_modules.dm index 7200056f9c4..132caf132e5 100644 --- a/modular_skyrat/modules/marines/code/modsuit_modules.dm +++ b/modular_skyrat/modules/marines/code/modsuit_modules.dm @@ -21,7 +21,7 @@ /obj/item/mod/module/smartgun/on_activation() . = ..() - RegisterSignal(device, COMSIG_GUN_FIRED, .proc/consume_energy) + RegisterSignal(device, COMSIG_GUN_FIRED, PROC_REF(consume_energy)) /obj/item/mod/module/smartgun/proc/consume_energy(mob/user, atom/target, params, zone_override) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/marines/code/smartgun.dm b/modular_skyrat/modules/marines/code/smartgun.dm index 605936d50f2..673e274b5cf 100644 --- a/modular_skyrat/modules/marines/code/smartgun.dm +++ b/modular_skyrat/modules/marines/code/smartgun.dm @@ -102,7 +102,7 @@ /obj/item/ammo_casing/smart/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_CHAMBERED_BULLET_FIRE, .proc/iff_transfer) + RegisterSignal(src, COMSIG_CHAMBERED_BULLET_FIRE, PROC_REF(iff_transfer)) /obj/item/ammo_casing/smart/proc/iff_transfer(datum/source, list/iff_factions) SIGNAL_HANDLER diff --git a/modular_skyrat/modules/medical/code/wounds/bones.dm b/modular_skyrat/modules/medical/code/wounds/bones.dm index c7ba255d2d8..8c8cdba738e 100644 --- a/modular_skyrat/modules/medical/code/wounds/bones.dm +++ b/modular_skyrat/modules/medical/code/wounds/bones.dm @@ -34,14 +34,14 @@ */ /datum/wound/blunt/wound_injury(datum/wound/old_wound = null, attack_direction) // hook into gaining/losing gauze so crit bone wounds can re-enable/disable depending if they're slung or not - RegisterSignal(limb, list(COMSIG_BODYPART_SPLINTED, COMSIG_BODYPART_SPLINT_DESTROYED), .proc/update_inefficiencies) + RegisterSignal(limb, list(COMSIG_BODYPART_SPLINTED, COMSIG_BODYPART_SPLINT_DESTROYED), PROC_REF(update_inefficiencies)) if(limb.body_zone == BODY_ZONE_HEAD && brain_trauma_group) processes = TRUE active_trauma = victim.gain_trauma_type(brain_trauma_group, TRAUMA_RESILIENCE_WOUND) next_trauma_cycle = world.time + (rand(100-WOUND_BONE_HEAD_TIME_VARIANCE, 100+WOUND_BONE_HEAD_TIME_VARIANCE) * 0.01 * trauma_cycle_cooldown) - RegisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, .proc/attack_with_hurt_hand) + RegisterSignal(victim, COMSIG_HUMAN_EARLY_UNARMED_ATTACK, PROC_REF(attack_with_hurt_hand)) if(limb.held_index && victim.get_item_for_held_index(limb.held_index) && (disabling || prob(30 * severity))) var/obj/item/held_item = victim.get_item_for_held_index(limb.held_index) if(istype(held_item, /obj/item/offhand)) @@ -108,7 +108,7 @@ else victim.visible_message(span_danger("[victim] weakly strikes [target] with [victim.p_their()] broken [parse_zone(limb.body_zone)], recoiling from pain!"), \ span_userdanger("You fail to strike [target] as the fracture in your [parse_zone(limb.body_zone)] lights up in unbearable pain!"), vision_distance=COMBAT_MESSAGE_RANGE) - INVOKE_ASYNC(victim, /mob.proc/emote, "scream") + INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") victim.Stun(0.5 SECONDS) limb.receive_damage(brute=rand(3,7)) return COMPONENT_CANCEL_ATTACK_CHAIN @@ -219,7 +219,7 @@ /datum/wound/blunt/moderate/wound_injury(datum/wound/old_wound, attack_direction) . = ..() - RegisterSignal(victim, COMSIG_LIVING_DOORCRUSHED, .proc/door_crush) + RegisterSignal(victim, COMSIG_LIVING_DOORCRUSHED, PROC_REF(door_crush)) /// Getting smushed in an airlock/firelock is a last-ditch attempt to try relocating your limb /datum/wound/blunt/moderate/proc/door_crush() @@ -249,7 +249,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)) @@ -268,7 +268,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)) @@ -289,7 +289,7 @@ else user.visible_message(span_danger("[user] begins resetting [victim]'s [parse_zone(limb.body_zone)] with [I]."), span_notice("You begin resetting [victim]'s [parse_zone(limb.body_zone)] 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) @@ -367,7 +367,7 @@ user.visible_message(span_danger("[user] begins hastily applying [gel] to [victim]'s' [parse_zone(limb.body_zone)]..."), span_warning("You begin hastily applying [gel] to [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)], 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 gel.use(1) @@ -409,7 +409,7 @@ user.visible_message(span_danger("[user] begins applying [tape] to [victim]'s' [parse_zone(limb.body_zone)]..."), span_warning("You begin applying [tape] to [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)]...")) - if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * (user == victim ? 1.5 : 1), target = victim, extra_checks=CALLBACK(src, PROC_REF(still_exists)))) return if(victim == user) diff --git a/modular_skyrat/modules/medical/code/wounds/burns.dm b/modular_skyrat/modules/medical/code/wounds/burns.dm index 7dfae52ff71..408ac8095e6 100644 --- a/modular_skyrat/modules/medical/code/wounds/burns.dm +++ b/modular_skyrat/modules/medical/code/wounds/burns.dm @@ -188,7 +188,7 @@ /// if someone is using ointment or mesh on our burns /datum/wound/burn/proc/ointmentmesh(obj/item/stack/medical/treatment_item, mob/user) user.visible_message(span_notice("[user] begins applying [treatment_item] to [victim]'s [parse_zone(limb.body_zone)]..."), span_notice("You begin applying [treatment_item] to [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)]...")) - if(!do_after(user, (user == victim ? treatment_item.self_delay : treatment_item.other_delay), extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, (user == victim ? treatment_item.self_delay : treatment_item.other_delay), extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return limb.heal_damage(treatment_item.heal_brute, treatment_item.heal_burn) diff --git a/modular_skyrat/modules/medical/code/wounds/muscle.dm b/modular_skyrat/modules/medical/code/wounds/muscle.dm index 25461147c62..e0eee5f92ce 100644 --- a/modular_skyrat/modules/medical/code/wounds/muscle.dm +++ b/modular_skyrat/modules/medical/code/wounds/muscle.dm @@ -20,9 +20,9 @@ */ /datum/wound/muscle/wound_injury(datum/wound/old_wound = null, attack_direction) // hook into gaining/losing gauze so crit muscle wounds can re-enable/disable depending if they're slung or not - RegisterSignal(limb, list(COMSIG_BODYPART_SPLINTED, COMSIG_BODYPART_SPLINT_DESTROYED), .proc/update_inefficiencies) + RegisterSignal(limb, list(COMSIG_BODYPART_SPLINTED, COMSIG_BODYPART_SPLINT_DESTROYED), PROC_REF(update_inefficiencies)) - 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)) @@ -77,7 +77,7 @@ else victim.visible_message(span_danger("[victim] weakly strikes [target] with [victim.p_their()] swollen [parse_zone(limb.body_zone)], recoiling from pain!"), \ span_userdanger("You fail to strike [target] as the fracture in your [parse_zone(limb.body_zone)] lights up in unbearable pain!"), vision_distance=COMBAT_MESSAGE_RANGE) - INVOKE_ASYNC(victim, /mob.proc/emote, "scream") + INVOKE_ASYNC(victim, TYPE_PROC_REF(/mob, emote), "scream") victim.Stun(0.5 SECONDS) limb.receive_damage(brute=rand(3,7)) return COMPONENT_CANCEL_ATTACK_CHAIN @@ -171,7 +171,7 @@ /datum/status_effect/wound/muscle/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/muscle/on_remove() diff --git a/modular_skyrat/modules/medical/code/wounds/pierce.dm b/modular_skyrat/modules/medical/code/wounds/pierce.dm index 3a0c847c8c9..eaec75d7bf7 100644 --- a/modular_skyrat/modules/medical/code/wounds/pierce.dm +++ b/modular_skyrat/modules/medical/code/wounds/pierce.dm @@ -110,7 +110,7 @@ /datum/wound/pierce/proc/suture(obj/item/stack/medical/suture/used_suture, mob/user) var/self_penalty_mult = (user == victim ? 1.4 : 1) user.visible_message(span_notice("[user] begins stitching [victim]'s [parse_zone(limb.body_zone)] with [used_suture]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)] with [used_suture]...")) - if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")) var/blood_sutured = used_suture.stop_bleeding / self_penalty_mult @@ -129,7 +129,7 @@ var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself user.visible_message(span_danger("[user] begins cauterizing [victim]'s [parse_zone(limb.body_zone)] with [used_cautery]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)] with [used_cautery]...")) - if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim].")) diff --git a/modular_skyrat/modules/medical/code/wounds/slash.dm b/modular_skyrat/modules/medical/code/wounds/slash.dm index 669b8730d14..6dbef632d9e 100644 --- a/modular_skyrat/modules/medical/code/wounds/slash.dm +++ b/modular_skyrat/modules/medical/code/wounds/slash.dm @@ -193,7 +193,7 @@ user.visible_message(span_notice("[user] begins licking the wounds on [victim]'s [parse_zone(limb.body_zone)]."), span_notice("You begin licking the wounds on [victim]'s [parse_zone(limb.body_zone)]..."), ignored_mobs=victim) to_chat(victim, span_notice("[user] begins to lick the wounds on your [parse_zone(limb.body_zone)].")) - if(!do_after(user, base_treat_time, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_notice("[user] licks the wounds on [victim]'s [parse_zone(limb.body_zone)]."), span_notice("You lick some of the wounds on [victim]'s [parse_zone(limb.body_zone)]"), ignored_mobs=victim) @@ -217,7 +217,7 @@ /datum/wound/slash/proc/las_cauterize(obj/item/gun/energy/laser/lasgun, mob/user) var/self_penalty_mult = (user == victim ? 1.25 : 1) user.visible_message(span_warning("[user] begins aiming [lasgun] directly at [victim]'s [parse_zone(limb.body_zone)]..."), span_userdanger("You begin aiming [lasgun] directly at [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)]...")) - if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return var/damage = lasgun.chambered.loaded_projectile.damage lasgun.chambered.loaded_projectile.wound_bonus -= 30 @@ -234,7 +234,7 @@ var/self_penalty_mult = (user == victim ? 1.5 : 1) // 50% longer and less effective if you do it to yourself user.visible_message(span_danger("[user] begins cauterizing [victim]'s [parse_zone(limb.body_zone)] with [used_cautery]..."), span_warning("You begin cauterizing [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)] with [used_cautery]...")) - if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult * improv_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] cauterizes some of the bleeding on [victim]."), span_green("You cauterize some of the bleeding on [victim].")) @@ -254,7 +254,7 @@ var/self_penalty_mult = (user == victim ? 1.4 : 1) user.visible_message(span_notice("[user] begins stitching [victim]'s [parse_zone(limb.body_zone)] with [used_suture]..."), span_notice("You begin stitching [user == victim ? "your" : "[victim]'s"] [parse_zone(limb.body_zone)] with [used_suture]...")) - if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, .proc/still_exists))) + if(!do_after(user, base_treat_time * self_penalty_mult, target=victim, extra_checks = CALLBACK(src, PROC_REF(still_exists)))) return user.visible_message(span_green("[user] stitches up some of the bleeding on [victim]."), span_green("You stitch up some of the bleeding on [user == victim ? "yourself" : "[victim]"].")) var/blood_sutured = used_suture.stop_bleeding / self_penalty_mult diff --git a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm index ad1f8b7b580..32a01a25001 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_cell.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_cell.dm @@ -85,7 +85,7 @@ Essentially, power cells that malfunction if not used in an MCR, and should only say("Malfunction in [seconds_to_explode / 10] seconds!") playsound(src, 'sound/machines/warning-buzzer.ogg', 30, FALSE, FALSE) add_filter("rad_glow", 2, list("type" = "outline", "color" = "#ff5e0049", "size" = 2)) - addtimer(CALLBACK(src, .proc/process_failure), seconds_to_explode) + addtimer(CALLBACK(src, PROC_REF(process_failure)), seconds_to_explode) /obj/item/stock_parts/cell/microfusion/proc/process_failure() var/fuckup_type = rand(1, 4) diff --git a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm index 0da9f07cc02..be227a3b7b7 100644 --- a/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm +++ b/modular_skyrat/modules/microfusion/code/microfusion_energy_master.dm @@ -110,11 +110,11 @@ AddElement(/datum/element/update_icon_updates_onmob) update_appearance() AddComponent(/datum/component/ammo_hud) - RegisterSignal(src, COMSIG_ITEM_RECHARGED, .proc/instant_recharge) + RegisterSignal(src, COMSIG_ITEM_RECHARGED, PROC_REF(instant_recharge)) base_fire_delay = fire_delay /obj/item/gun/microfusion/add_weapon_description() - AddElement(/datum/element/weapon_description, attached_proc = .proc/add_notes_energy) + AddElement(/datum/element/weapon_description, attached_proc = PROC_REF(add_notes_energy)) /obj/item/gun/microfusion/add_seclight_point() return @@ -370,7 +370,7 @@ else if(gun.can_trigger_gun(user)) bonus_spread += dual_wield_spread loop_counter++ - addtimer(CALLBACK(gun, /obj/item/gun.proc/process_fire, target, user, TRUE, params, null, bonus_spread), loop_counter) + addtimer(CALLBACK(gun, TYPE_PROC_REF(/obj/item/gun, process_fire), target, user, TRUE, params, null, bonus_spread), loop_counter) return process_fire(target, user, TRUE, params, null, bonus_spread) @@ -405,7 +405,7 @@ if(phase_emitter) fire_delay_to_add = phase_emitter.fire_delay for(var/i = 1 to burst_size) - addtimer(CALLBACK(src, .proc/process_burst, user, target, message, params, zone_override, calculated_spread, randomized_gun_spread, randomized_bonus_spread, random_spread, i), (fire_delay + fire_delay_to_add) * (i - 1)) + addtimer(CALLBACK(src, PROC_REF(process_burst), user, target, message, params, zone_override, calculated_spread, randomized_gun_spread, randomized_bonus_spread, random_spread, i), (fire_delay + fire_delay_to_add) * (i - 1)) else if(chambered) if(HAS_TRAIT(user, TRAIT_PACIFISM)) // If the user has the pacifist trait, then they won't be able to fire [src] if the round chambered inside of [src] is lethal. @@ -432,7 +432,7 @@ var/fire_delay_to_add = 0 if(phase_emitter) fire_delay_to_add = phase_emitter.fire_delay - addtimer(CALLBACK(src, .proc/reset_semicd), fire_delay + fire_delay_to_add) + addtimer(CALLBACK(src, PROC_REF(reset_semicd)), fire_delay + fire_delay_to_add) if(user) user.update_held_items() diff --git a/modular_skyrat/modules/modsuit_pai/code/mod_pai.dm b/modular_skyrat/modules/modsuit_pai/code/mod_pai.dm index 68609c7b35f..5dc6663fad9 100644 --- a/modular_skyrat/modules/modsuit_pai/code/mod_pai.dm +++ b/modular_skyrat/modules/modsuit_pai/code/mod_pai.dm @@ -97,7 +97,7 @@ core.subtract_charge(CELL_PER_STEP) if(wearer) ADD_TRAIT(wearer, TRAIT_FORCED_STANDING, MOD_TRAIT) - addtimer(CALLBACK(src, .proc/pai_fall), PAI_FALL_TIME, TIMER_UNIQUE | TIMER_OVERRIDE) + addtimer(CALLBACK(src, PROC_REF(pai_fall)), PAI_FALL_TIME, TIMER_UNIQUE | TIMER_OVERRIDE) if(ismovable(wearer?.loc)) return wearer.loc.relaymove(wearer, direction) if(wearer && !wearer.Process_Spacemove(direction)) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm index a60d871ba24..aa0273174bd 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/bdsm_mask.dm @@ -70,7 +70,7 @@ if(color_changed == FALSE) if(.) return - var/choice = show_radial_menu(user, src, mask_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, mask_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_mask_color = choice @@ -294,7 +294,7 @@ // Reagent consumption process handler /obj/item/reagent_containers/cup/lewd_filter/proc/reagent_consumption(mob/living/user, amount_per_transfer_from_this) SEND_SIGNAL(src, COMSIG_GLASS_DRANK, user, user) - addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, user, amount_per_transfer_from_this, TRUE, TRUE, FALSE, user, FALSE, INGEST), 5) + addtimer(CALLBACK(reagents, TYPE_PROC_REF(/datum/reagents, trans_to), user, amount_per_transfer_from_this, TRUE, TRUE, FALSE, user, FALSE, INGEST), 5) // I just wanted to add 2th color variation. Because. /obj/item/reagent_containers/cup/lewd_filter/AltClick(mob/user) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm index 4eaf1af1e55..05aa4ac3712 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/deprivation_helmet.dm @@ -134,7 +134,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, helmet_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, helmet_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_helmet_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm index d48c3e9d4db..0f7c5accc1b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/hypnogoggles.dm @@ -63,7 +63,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, hypnogoggles_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, hypnogoggles_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_hypnogoggles_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm index 7df9b090272..05b99f51f0d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_blindfold.dm @@ -27,7 +27,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, kinkfold_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, kinkfold_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_kinkfold_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm index f9195828a60..a3d025b89cc 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_headphones.dm @@ -33,7 +33,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, kinkphones_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, kinkphones_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_kinkphones_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm index 9a369ce328f..3cc03b946e0 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/kinky_sleepbag.dm @@ -61,7 +61,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, bag_colors, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, bag_colors, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE bag_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm index 99f420af576..f4de442a44b 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/lewd_maid.dm @@ -53,7 +53,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, apron_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, apron_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm index ac134f1ac66..749c84464d6 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shackles.dm @@ -36,7 +36,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, shackles_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, shackles_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm index d0d6b2a9233..8184113d9e5 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_legs.dm @@ -46,12 +46,12 @@ /obj/item/clothing/shoes/shibari_legs/equipped(mob/user, slot) . = ..() - RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, .proc/handle_take_off, user) + RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, PROC_REF(handle_take_off), user) /obj/item/clothing/shoes/shibari_legs/proc/handle_take_off(datum/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/handle_take_off_async, user) + INVOKE_ASYNC(src, PROC_REF(handle_take_off_async), user) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/item/clothing/shoes/shibari_legs/proc/handle_take_off_async(mob/user) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm index a4115f079d0..bd4a8dc70cd 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm @@ -43,12 +43,12 @@ /obj/item/clothing/under/shibari/equipped(mob/user, slot) . = ..() - RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, .proc/handle_take_off, user) + RegisterSignal(src, COMSIG_ATOM_ATTACK_HAND, PROC_REF(handle_take_off), user) /obj/item/clothing/under/shibari/proc/handle_take_off(datum/source, mob/user) SIGNAL_HANDLER - INVOKE_ASYNC(src, .proc/handle_take_off_async, user) + INVOKE_ASYNC(src, PROC_REF(handle_take_off_async), user) return COMPONENT_CANCEL_ATTACK_CHAIN /obj/item/clothing/under/shibari/proc/handle_take_off_async(mob/user) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm index d9d947e10cb..e87a6fddef6 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/strapon.dm @@ -27,7 +27,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, strapon_types, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, strapon_types, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE strapon_type = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm index 4c714af0207..60d12aff147 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/attachable_vibrator.dm @@ -43,7 +43,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, vib_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, vib_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm index 1dc74c3f811..bc4fb5b9c04 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/buttplug.dm @@ -44,7 +44,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, buttplug_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, buttplug_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice @@ -58,7 +58,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, buttplug_forms, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, buttplug_forms, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_size = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm index 265e7012bbe..1fc2daa1331 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/dildo.dm @@ -46,7 +46,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, dildo_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, dildo_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice @@ -200,7 +200,7 @@ GLOBAL_LIST_INIT(dildo_colors, list(//mostly neon colors /obj/item/clothing/sextoy/dildo/custom_dildo/AltClick(mob/living/user) if(!size_changed) - var/choice = show_radial_menu(user, src, dildo_sizes, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, dildo_sizes, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE poly_size = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm index f326297c927..65038e76c5f 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/fleshlight.dm @@ -43,7 +43,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, fleshlight_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, fleshlight_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm index ae8e625a253..e41cc5465fc 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/leather_whip.dm @@ -92,7 +92,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, whip_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, whip_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_whip_color = choice @@ -106,7 +106,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, whip_forms, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, whip_forms, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_whip_form = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm index b7844ce6cd5..7dd2818f934 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/shibari.dm @@ -89,7 +89,7 @@ /obj/item/stack/shibari_rope/Initialize(mapload, new_amount, merge, list/mat_override, mat_amt) . = ..() AddElement(/datum/element/update_icon_updates_onmob) - RegisterSignal(src, COMSIG_ITEM_ATTACK, .proc/handle_roping) + RegisterSignal(src, COMSIG_ITEM_ATTACK, PROC_REF(handle_roping)) if(!greyscale_colors) var/new_color = "#" for(var/i in 1 to 3) @@ -108,22 +108,22 @@ return switch(user.zone_selected) if(BODY_ZONE_L_LEG) - INVOKE_ASYNC(src, .proc/handle_leg_tying, attacked, user) + INVOKE_ASYNC(src, PROC_REF(handle_leg_tying), attacked, user) return COMPONENT_CANCEL_ATTACK_CHAIN if(BODY_ZONE_R_LEG) - INVOKE_ASYNC(src, .proc/handle_leg_tying, attacked, user) + INVOKE_ASYNC(src, PROC_REF(handle_leg_tying), attacked, user) return COMPONENT_CANCEL_ATTACK_CHAIN if(BODY_ZONE_PRECISE_GROIN) - INVOKE_ASYNC(src, .proc/handle_groin_tying, attacked, user) + INVOKE_ASYNC(src, PROC_REF(handle_groin_tying), attacked, user) return COMPONENT_CANCEL_ATTACK_CHAIN if(BODY_ZONE_CHEST) - INVOKE_ASYNC(src, .proc/handle_chest_tying, attacked, user) + INVOKE_ASYNC(src, PROC_REF(handle_chest_tying), attacked, user) return COMPONENT_CANCEL_ATTACK_CHAIN if(BODY_ZONE_L_ARM) - INVOKE_ASYNC(src, .proc/handle_arm_tying, attacked, user) + INVOKE_ASYNC(src, PROC_REF(handle_arm_tying), attacked, user) return COMPONENT_CANCEL_ATTACK_CHAIN if(BODY_ZONE_R_ARM) - INVOKE_ASYNC(src, .proc/handle_arm_tying, attacked, user) + INVOKE_ASYNC(src, PROC_REF(handle_arm_tying), attacked, user) return COMPONENT_CANCEL_ATTACK_CHAIN diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm index b090a25c3e7..a0e74f750fe 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/spanking_pad.dm @@ -47,7 +47,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, spankpad_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, spankpad_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm index e188d6fe46a..7d08a15ffb4 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/torture_candle.dm @@ -110,7 +110,7 @@ if(!lit) if(color_changed) return - var/choice = show_radial_menu(user, src, candle_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, candle_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm index 97af94d019a..9249e4b1f2a 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibrator.dm @@ -47,7 +47,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, vibrator_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, vibrator_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm index 4d0ab49232b..a1ad4a7a580 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_items/vibroring.dm @@ -41,7 +41,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, vibroring_designs, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, vibroring_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm index 8e55c959fa5..f820fe4358c 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/lustwish.dm @@ -164,7 +164,7 @@ if(!card_used) return - var/choice = show_radial_menu(user, src, vend_designs, custom_check = CALLBACK(src, .proc/check_menu, user, used_item), radius = 50, require_near = TRUE) + var/choice = show_radial_menu(user, src, vend_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user, used_item), radius = 50, require_near = TRUE) if(choice) current_color = choice update_icon() diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm index f6a7acbefd6..8e5543e867f 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_machinery/milking_machine.dm @@ -182,7 +182,7 @@ . = ..() if(.) return FALSE - var/choice = show_radial_menu(user, src, milkingmachine_designs, custom_check = CALLBACK(src, .proc/check_menu, user, used_item), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, milkingmachine_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user, used_item), radius = 36, require_near = TRUE) if(!choice) return TRUE machine_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm index 150dbebe350..8c80365c03d 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_quirks.dm @@ -154,7 +154,7 @@ owner.add_mood_event("bimbo", /datum/mood_event/bimbo) if(!HAS_TRAIT_FROM(owner, TRAIT_BIMBO, LEWDCHEM_TRAIT)) ADD_TRAIT(owner, TRAIT_BIMBO, LEWDCHEM_TRAIT) - RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) + RegisterSignal(owner, COMSIG_MOB_SAY, PROC_REF(handle_speech)) if(!HAS_TRAIT_FROM(owner, TRAIT_MASOCHISM, APHRO_TRAIT)) ADD_TRAIT(owner, TRAIT_MASOCHISM, APHRO_TRAIT) diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm index 330eb60e9ca..76c1b50b864 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/dancing_pole.dm @@ -43,7 +43,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, pole_designs, custom_check = CALLBACK(src, .proc/check_menu, user, used_item), radius = 50, require_near = TRUE) + var/choice = show_radial_menu(user, src, pole_designs, custom_check = CALLBACK(src, PROC_REF(check_menu), user, used_item), radius = 50, require_near = TRUE) if(!choice) return FALSE current_pole_color = choice diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm index b5c9f9f405d..90003305890 100644 --- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm +++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_structures/pillow.dm @@ -38,7 +38,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, pillow_colors, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, pillow_colors, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_color = choice @@ -50,7 +50,7 @@ . = ..() if(.) return - var/choice = show_radial_menu(user, src, pillow_forms, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 36, require_near = TRUE) + var/choice = show_radial_menu(user, src, pillow_forms, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 36, require_near = TRUE) if(!choice) return FALSE current_form = choice diff --git a/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm b/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm index 258330fff11..de8ae40703e 100644 --- a/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm +++ b/modular_skyrat/modules/modular_reagents/code/reagents/medicine.dm @@ -42,7 +42,7 @@ owner.adjustOrganLoss(ORGAN_SLOT_HEART,3 * REM * delta_time, 85) owner.adjustStaminaLoss(5 * REM * delta_time, 0) if(prob(30)) - INVOKE_ASYNC(owner, /mob.proc/emote, "scream") + INVOKE_ASYNC(owner, TYPE_PROC_REF(/mob, emote), "scream") //Medigun Clotting Medicine /datum/reagent/medicine/coagulant/fabricated diff --git a/modular_skyrat/modules/moretraitoritems/code/weaponry.dm b/modular_skyrat/modules/moretraitoritems/code/weaponry.dm index 6eed89b12ea..ee9010e4cd0 100644 --- a/modular_skyrat/modules/moretraitoritems/code/weaponry.dm +++ b/modular_skyrat/modules/moretraitoritems/code/weaponry.dm @@ -15,7 +15,7 @@ ///obj/item/clothing/head/sus_bowler/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) //var/caught = hit_atom.hitby(src, FALSE, FALSE, throwingdatum=throwingdatum) //if(thrownby && !caught) - //addtimer(CALLBACK(src, /atom/movable.proc/throw_at, thrownby, throw_range+2, throw_speed, null, TRUE), 1) + //addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, throw_at), thrownby, throw_range+2, throw_speed, null, TRUE), 1) //else //return ..() diff --git a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm index 66f3d9918f8..008b5ca8748 100644 --- a/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm +++ b/modular_skyrat/modules/mounted_machine_gun/code/mounted_machine_gun.dm @@ -239,10 +239,10 @@ if(!current_user.client) // I hate byond. return - RegisterSignal(current_user, COMSIG_MOB_LOGIN, .proc/reregister_trigger) // I really really hate byond. - RegisterSignal(current_user.client, COMSIG_CLIENT_MOUSEDOWN, .proc/trigger_pulled) - RegisterSignal(current_user.client, COMSIG_CLIENT_MOUSEUP, .proc/trigger_released) - RegisterSignal(current_user.client, COMSIG_CLIENT_MOUSEDRAG, .proc/update_target_drag) + RegisterSignal(current_user, COMSIG_MOB_LOGIN, PROC_REF(reregister_trigger)) // I really really hate byond. + RegisterSignal(current_user.client, COMSIG_CLIENT_MOUSEDOWN, PROC_REF(trigger_pulled)) + RegisterSignal(current_user.client, COMSIG_CLIENT_MOUSEUP, PROC_REF(trigger_released)) + RegisterSignal(current_user.client, COMSIG_CLIENT_MOUSEDRAG, PROC_REF(update_target_drag)) user_to_buckle.client?.view_size.setTo(view_range) user_to_buckle.pixel_y = 14 @@ -286,7 +286,7 @@ last_target_atom = WEAKREF(_target) - INVOKE_ASYNC(src, .proc/process_fire, shooting_client, params) + INVOKE_ASYNC(src, PROC_REF(process_fire), shooting_client, params) /obj/machinery/mounted_machine_gun/proc/process_fire(client/shooting_client, params) if(!shooting_client) @@ -295,7 +295,7 @@ if(!fire_at(shooting_client, params)) return - nextshot_timer_id = addtimer(CALLBACK(src, .proc/process_fire, shooting_client), fire_delay, TIMER_STOPPABLE) + nextshot_timer_id = addtimer(CALLBACK(src, PROC_REF(process_fire), shooting_client), fire_delay, TIMER_STOPPABLE) /obj/machinery/mounted_machine_gun/proc/fire_at(client/shooting_client, params) if(!current_user) @@ -326,7 +326,7 @@ overheated = TRUE playsound(src, 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mg_overheat.ogg', 100) particles = new /particles/smoke() - addtimer(CALLBACK(src, .proc/reset_overheat), cooldown_time) + addtimer(CALLBACK(src, PROC_REF(reset_overheat)), cooldown_time) update_appearance() @@ -351,9 +351,9 @@ // Re-registers the required signals to the client after they reconnect. /obj/machinery/mounted_machine_gun/proc/reregister_trigger(mob/source_mob) SIGNAL_HANDLER - RegisterSignal(source_mob, COMSIG_CLIENT_MOUSEDOWN, .proc/trigger_pulled, TRUE) - RegisterSignal(source_mob.client, COMSIG_CLIENT_MOUSEUP, .proc/trigger_released, TRUE) - RegisterSignal(current_user.client, COMSIG_CLIENT_MOUSEDRAG, .proc/update_target_drag, TRUE) + RegisterSignal(source_mob, COMSIG_CLIENT_MOUSEDOWN, PROC_REF(trigger_pulled), TRUE) + RegisterSignal(source_mob.client, COMSIG_CLIENT_MOUSEUP, PROC_REF(trigger_released), TRUE) + RegisterSignal(current_user.client, COMSIG_CLIENT_MOUSEDRAG, PROC_REF(update_target_drag), TRUE) // Performs all checks and plays a sound if we can't fire. /obj/machinery/mounted_machine_gun/proc/can_fire() diff --git a/modular_skyrat/modules/mutants/code/mutant_component.dm b/modular_skyrat/modules/mutants/code/mutant_component.dm index 89319681c9f..70f04cae8fb 100644 --- a/modular_skyrat/modules/mutants/code/mutant_component.dm +++ b/modular_skyrat/modules/mutants/code/mutant_component.dm @@ -43,10 +43,10 @@ if(host.stat == DEAD) var/revive_time = rand(REVIVE_TIME_LOWER, REVIVE_TIME_UPPER) - timer_id = addtimer(CALLBACK(src, .proc/transform_host), revive_time, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(transform_host)), revive_time, TIMER_STOPPABLE) to_chat(host, span_userdanger("You feel your veins throb as your body begins twitching...")) - RegisterSignal(parent, COMSIG_MUTANT_CURED, .proc/cure_host) + RegisterSignal(parent, COMSIG_MUTANT_CURED, PROC_REF(cure_host)) START_PROCESSING(SSobj, src) @@ -78,7 +78,7 @@ return FALSE to_chat(host, span_userdanger("You feel your genes being altered!")) rna_extracted = TRUE - addtimer(CALLBACK(src, .proc/refresh_rna), RNA_REFRESH_TIME, TIMER_STOPPABLE) + addtimer(CALLBACK(src, PROC_REF(refresh_rna)), RNA_REFRESH_TIME, TIMER_STOPPABLE) return TRUE /datum/component/mutant_infection/proc/refresh_rna() @@ -113,14 +113,14 @@ not even death can stop, you will rise again!")) var/revive_time = rand(REVIVE_TIME_LOWER, REVIVE_TIME_UPPER) to_chat(host, span_redtext("You will transform in approximately [revive_time/10] seconds.")) - timer_id = addtimer(CALLBACK(src, .proc/transform_host), revive_time, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(transform_host)), revive_time, TIMER_STOPPABLE) /datum/component/mutant_infection/proc/cure_host() SIGNAL_HANDLER if(!host.stat == DEAD) to_chat(host, span_notice("You start to feel refreshed and invigorated!")) STOP_PROCESSING(SSobj, src) - addtimer(CALLBACK(src, .proc/Destroy), CURE_TIME) + addtimer(CALLBACK(src, PROC_REF(Destroy)), CURE_TIME) /datum/component/mutant_infection/proc/transform_host() timer_id = null @@ -146,13 +146,13 @@ to_chat(host, span_alertalien("You are now a mutant! Do not seek to be cured, do not help any non-mutants in any way, do not harm your mutant brethren. You retain some higher functions and can reason to an extent.")) host.mind?.add_antag_datum(/datum/antagonist/mutant) create_glow() - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/mutant_death) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(mutant_death)) /datum/component/mutant_infection/proc/mutant_death() SIGNAL_HANDLER var/revive_time = rand(REVIVE_TIME_LOWER, REVIVE_TIME_UPPER) to_chat(host, span_cultlarge("You can feel your heart stopping, but something isn't right... you will rise again!")) - timer_id = addtimer(CALLBACK(src, .proc/regenerate), revive_time, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(regenerate)), revive_time, TIMER_STOPPABLE) /datum/component/mutant_infection/proc/regenerate() if(!host.mind) @@ -174,7 +174,7 @@ return parent_movable.add_filter("infection_glow", 2, list("type" = "outline", "color" = COLOR_RED, "size" = 2)) - addtimer(CALLBACK(src, .proc/start_glow_loop, parent_movable), rand(0.1 SECONDS, 1.9 SECONDS)) + addtimer(CALLBACK(src, PROC_REF(start_glow_loop), parent_movable), rand(0.1 SECONDS, 1.9 SECONDS)) /datum/component/mutant_infection/proc/start_glow_loop(atom/movable/parent_movable) var/filter = parent_movable.get_filter("infection_glow") diff --git a/modular_skyrat/modules/mutants/code/mutant_cure.dm b/modular_skyrat/modules/mutants/code/mutant_cure.dm index ad3e2d5f4ef..2f8ae76ffcb 100644 --- a/modular_skyrat/modules/mutants/code/mutant_cure.dm +++ b/modular_skyrat/modules/mutants/code/mutant_cure.dm @@ -262,7 +262,7 @@ playsound(loc, 'sound/items/rped.ogg', 60, 1) flick("h_lathe_wloop", src) use_power(3000) - timer_id = addtimer(CALLBACK(src, .proc/recombinate_step), recombination_step_time, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(recombinate_step)), recombination_step_time, TIMER_STOPPABLE) /obj/machinery/rnd/rna_recombinator/proc/recombinate_step() if(machine_stat & (NOPOWER|BROKEN)) @@ -279,7 +279,7 @@ flick("h_lathe_wloop", src) use_power(3000) playsound(loc, 'sound/items/rped.ogg', 60, 1) - timer_id = addtimer(CALLBACK(src, .proc/recombinate_step), recombination_step_time, TIMER_STOPPABLE) + timer_id = addtimer(CALLBACK(src, PROC_REF(recombinate_step)), recombination_step_time, TIMER_STOPPABLE) /obj/machinery/rnd/rna_recombinator/proc/recombinate_finish() if(machine_stat & (NOPOWER|BROKEN)) diff --git a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm index 759e253dc11..43e06e142ed 100644 --- a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm +++ b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm @@ -127,7 +127,7 @@ . = ..() if(!.) return - RegisterSignal(mod.wearer, COMSIG_CARBON_HEALTH_UPDATE, .proc/on_use) + RegisterSignal(mod.wearer, COMSIG_CARBON_HEALTH_UPDATE, PROC_REF(on_use)) drain_power(use_power_cost) /// Heals damage (in fact, injects chems) based on the damage received and certain other variables (a single one), i.e. having more than X amount of health, not having enough needed chemicals or so on. @@ -186,7 +186,7 @@ drain_power(use_power_cost*10) ///Debuff so it's "balanced", as well as a cooldown. - addtimer(CALLBACK(src, .proc/boost_aftereffects, mod.wearer), 45 SECONDS) + addtimer(CALLBACK(src, PROC_REF(boost_aftereffects), mod.wearer), 45 SECONDS) COOLDOWN_START(src, heal_timer, heal_cooldown) /// Refills MODsuit module with the needed chemicals. That's all it does. @@ -210,7 +210,7 @@ UnregisterSignal(mod.wearer, COMSIG_CARBON_HEALTH_UPDATE) /obj/item/mod/module/auto_doc/on_install() - RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, .proc/on_attackby) + RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) /obj/item/mod/module/auto_doc/on_uninstall(deleting) UnregisterSignal(mod, COMSIG_PARENT_ATTACKBY) diff --git a/modular_skyrat/modules/opposing_force/code/items.dm b/modular_skyrat/modules/opposing_force/code/items.dm index 1c3968d0592..3f1f9146882 100644 --- a/modular_skyrat/modules/opposing_force/code/items.dm +++ b/modular_skyrat/modules/opposing_force/code/items.dm @@ -67,7 +67,7 @@ . = ..() if(!(slot & ITEM_SLOT_OCLOTHING)) return - RegisterSignal(user, COMSIG_HUMAN_CHECK_SHIELDS, .proc/armor_reaction) + RegisterSignal(user, COMSIG_HUMAN_CHECK_SHIELDS, PROC_REF(armor_reaction)) /obj/item/clothing/suit/toggle/lawyer/black/better/heister/proc/armor_reaction(mob/living/carbon/human/owner, atom/movable/hitby, damage = 0, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0) if(SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, owner, hitby, attack_text, 0, damage, attack_type) & COMPONENT_HIT_REACTION_BLOCK) diff --git a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm index bc03034daa4..e8e3e661c1e 100644 --- a/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm +++ b/modular_skyrat/modules/opposing_force/code/opposing_force_datum.dm @@ -503,7 +503,7 @@ SEND_SOUND(staff, sound('sound/effects/adminhelp.ogg')) window_flash(staff, ignorepref = TRUE) - addtimer(CALLBACK(src, .proc/add_to_ping_ss), 2 MINUTES) // this is not responsible for the notification itself, but only for adding the ticket to the list of those to notify. + addtimer(CALLBACK(src, PROC_REF(add_to_ping_ss)), 2 MINUTES) // this is not responsible for the notification itself, but only for adding the ticket to the list of those to notify. status = OPFOR_STATUS_AWAITING_APPROVAL can_edit = FALSE add_log(user.ckey, "Submitted to the OPFOR subsystem") diff --git a/modular_skyrat/modules/oversized/code/door.dm b/modular_skyrat/modules/oversized/code/door.dm index ae1e7cbee3f..7d21ae306d0 100644 --- a/modular_skyrat/modules/oversized/code/door.dm +++ b/modular_skyrat/modules/oversized/code/door.dm @@ -1,7 +1,7 @@ /obj/machinery/door/airlock/Initialize(mapload) . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_entered, + COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm b/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm index 79ff41d59b5..6d62d82fbf7 100644 --- a/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm +++ b/modular_skyrat/modules/pollution/code/temporary_pollution_emission_component.dm @@ -13,7 +13,7 @@ src.pollutant_type = pollutant_type src.pollutant_amount = pollutant_amount src.expiry_time = world.time + expiry_time - RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, .proc/wash_off) + RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(wash_off)) START_PROCESSING(SSobj, src) /datum/component/temporary_pollution_emission/Destroy() diff --git a/modular_skyrat/modules/reagent_forging/code/forge.dm b/modular_skyrat/modules/reagent_forging/code/forge.dm index 029206d7689..7cd3565c807 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge.dm @@ -516,7 +516,7 @@ if(prob(CHARCOAL_CHANCE) && !is_strong_fuel) to_chat(user, span_notice("[src]'s fuel is packed densely enough to have made some charcoal!")) - addtimer(CALLBACK(src, .proc/spawn_coal), 1 MINUTES) + addtimer(CALLBACK(src, PROC_REF(spawn_coal)), 1 MINUTES) /// Takes given ore and smelts it, possibly producing extra sheets if upgraded /obj/structure/reagent_forge/proc/smelt_ore(obj/item/stack/ore/ore_item, mob/living/user) diff --git a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm index 25b611b3065..07b2bb5534f 100644 --- a/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm +++ b/modular_skyrat/modules/reagent_forging/code/forge_weapons.dm @@ -299,8 +299,8 @@ /obj/item/forging/reagent_weapon/bokken/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)) AddComponent(/datum/component/two_handed, force_unwielded=15, force_wielded=7) /obj/item/forging/reagent_weapon/bokken/proc/on_wield() diff --git a/modular_skyrat/modules/reagent_forging/code/reagent_component.dm b/modular_skyrat/modules/reagent_forging/code/reagent_component.dm index 37d3fc2e000..814f9a4e5e5 100644 --- a/modular_skyrat/modules/reagent_forging/code/reagent_component.dm +++ b/modular_skyrat/modules/reagent_forging/code/reagent_component.dm @@ -29,9 +29,9 @@ parent_clothing = parent parent_clothing.create_reagents(MAX_IMBUE_STORAGE, INJECTABLE | REFILLABLE) applying_container = new /obj/item/reagent_containers(src) - RegisterSignal(parent_clothing, COMSIG_ITEM_EQUIPPED, .proc/set_wearer) - RegisterSignal(parent_clothing, COMSIG_ITEM_PRE_UNEQUIP, .proc/remove_wearer) - RegisterSignal(parent_clothing, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent_clothing, COMSIG_ITEM_EQUIPPED, PROC_REF(set_wearer)) + RegisterSignal(parent_clothing, COMSIG_ITEM_PRE_UNEQUIP, PROC_REF(remove_wearer)) + RegisterSignal(parent_clothing, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) START_PROCESSING(SSdcs, src) /datum/component/reagent_clothing/Destroy(force, silent) @@ -85,8 +85,8 @@ return COMPONENT_INCOMPATIBLE //they need to be weapons, I already said this parent_weapon = parent parent_weapon.create_reagents(MAX_IMBUE_STORAGE, INJECTABLE | REFILLABLE) - RegisterSignal(parent_weapon, COMSIG_ITEM_ATTACK, .proc/inject_attacked) - RegisterSignal(parent_weapon, COMSIG_PARENT_EXAMINE, .proc/on_examine) + RegisterSignal(parent_weapon, COMSIG_ITEM_ATTACK, PROC_REF(inject_attacked)) + RegisterSignal(parent_weapon, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) /datum/component/reagent_weapon/Destroy(force, silent) parent_weapon = null diff --git a/modular_skyrat/modules/rod-stopper/code/rodstopper.dm b/modular_skyrat/modules/rod-stopper/code/rodstopper.dm index 4bbc91a2c3e..29c637fc74c 100644 --- a/modular_skyrat/modules/rod-stopper/code/rodstopper.dm +++ b/modular_skyrat/modules/rod-stopper/code/rodstopper.dm @@ -27,4 +27,4 @@ /obj/machinery/rodstopper/proc/warn_area() playsound(src, 'sound/misc/bloblarm.ogg', 100) say("Warning! Please clear the area! Failure to do so will result in your immediate annihilation!") - addtimer(CALLBACK(src, .proc/warn_area), 15 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) // the sound is 7 seconds, however. + addtimer(CALLBACK(src, PROC_REF(warn_area)), 15 SECONDS, TIMER_OVERRIDE|TIMER_UNIQUE) // the sound is 7 seconds, however. diff --git a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm index e17798694f8..53ad3833fd3 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/bullets.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/bullets.dm @@ -310,7 +310,7 @@ H.emote("scream") H.add_mood_event("tased", /datum/mood_event/tased) if((H.status_flags & CANKNOCKDOWN) && !HAS_TRAIT(H, TRAIT_STUNIMMUNE)) - addtimer(CALLBACK(H, /mob/living/carbon.proc/do_jitter_animation, jitter), 5) + addtimer(CALLBACK(H, TYPE_PROC_REF(/mob/living/carbon, do_jitter_animation), jitter), 5) /obj/item/shrapnel/bullet/smartgun name = "smartgun shredder" diff --git a/modular_skyrat/modules/sec_haul/code/guns/guns.dm b/modular_skyrat/modules/sec_haul/code/guns/guns.dm index 0a483823110..0a8558c8651 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/guns.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/guns.dm @@ -681,7 +681,7 @@ /obj/item/gun/ballistic/automatic/smartgun/process_chamber() . = ..() recharging = TRUE - addtimer(CALLBACK(src, .proc/recharge), recharge_time) + addtimer(CALLBACK(src, PROC_REF(recharge)), recharge_time) /obj/item/gun/ballistic/automatic/smartgun/proc/recharge() recharging = FALSE diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm index 62a8a39c03f..a4319105220 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_hammer.dm @@ -33,8 +33,8 @@ if(istype(target, /obj/machinery/door)) user.changeNext_move(5 SECONDS) if(!registered) - RegisterSignal(user, COMSIG_MOVABLE_MOVED, .proc/remove_track, FALSE) - RegisterSignal(target, COMSIG_BREACHING, .proc/try_breaching, TRUE) + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(remove_track), FALSE) + RegisterSignal(target, COMSIG_BREACHING, PROC_REF(try_breaching), TRUE) to_chat(user, text = "You prepare to forcefully strike the door") registered = TRUE breacher = user @@ -71,8 +71,8 @@ remove_track(user) return FALSE breaching = TRUE - INVOKE_ASYNC(src, /obj/item/melee/hammer.proc/breaching_loop , user, target) - INVOKE_ASYNC(second_hammer, /obj/item/melee/hammer.proc/breaching_loop , breacher, target) + INVOKE_ASYNC(src, TYPE_PROC_REF(/obj/item/melee/hammer, breaching_loop ), user, target) + INVOKE_ASYNC(second_hammer, TYPE_PROC_REF(/obj/item/melee/hammer, breaching_loop ), breacher, target) to_chat(breacher , text = "You begin forcefully smashing the [target]") to_chat(user, text = "You begin forcefully smashing the [target]") diff --git a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm index 66eaace0921..8d4a3067d18 100644 --- a/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm +++ b/modular_skyrat/modules/self_actualization_device/code/self_actualization_device.dm @@ -81,7 +81,7 @@ return FALSE to_chat(user, "You power on [src].") - addtimer(CALLBACK(src, .proc/eject_new_you), processing_time, TIMER_OVERRIDE|TIMER_UNIQUE) + addtimer(CALLBACK(src, PROC_REF(eject_new_you)), processing_time, TIMER_OVERRIDE|TIMER_UNIQUE) processing = TRUE update_appearance() diff --git a/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm b/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm index 2dbd79fa054..ac5f5446dbd 100644 --- a/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm +++ b/modular_skyrat/modules/shapeshifting_module/code/borg_shapeshifter.dm @@ -99,7 +99,7 @@ "Syndicate" = image(icon = 'icons/mob/silicon/robots.dmi', icon_state = "synd_sec"), "Spider Clan" = image(icon = CYBORG_ICON_NINJA, icon_state = "ninja_engi") )) - var/model_selection = show_radial_menu(user, user, model_icons, custom_check = CALLBACK(src, .proc/check_menu, user), radius = 42, require_near = TRUE) + var/model_selection = show_radial_menu(user, user, model_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), user), radius = 42, require_near = TRUE) if(!model_selection) return FALSE @@ -175,7 +175,7 @@ if (R_TRAIT_WIDE in details[SKIN_FEATURES]) reskin.pixel_x -= 16 reskin_icons[skin] = reskin - var/borg_skin = show_radial_menu(cyborg, cyborg, reskin_icons, custom_check = CALLBACK(src, .proc/check_menu, cyborg), radius = 38, require_near = TRUE) + var/borg_skin = show_radial_menu(cyborg, cyborg, reskin_icons, custom_check = CALLBACK(src, PROC_REF(check_menu), cyborg), radius = 38, require_near = TRUE) if(!borg_skin) return FALSE disguise_model_name = disguise_model.name @@ -218,7 +218,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_skyrat/modules/singularity_engine/code/particle_accelerator/particle.dm b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle.dm index 655a375cf13..b098cfb46e0 100644 --- a/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle.dm +++ b/modular_skyrat/modules/singularity_engine/code/particle_accelerator/particle.dm @@ -24,9 +24,9 @@ /obj/effect/accelerated_particle/Initialize(mapload) . = ..() - addtimer(CALLBACK(src, .proc/move), 1) + addtimer(CALLBACK(src, PROC_REF(move)), 1) 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/modular_skyrat/modules/soulstone_changes/code/components/return_on_death.dm b/modular_skyrat/modules/soulstone_changes/code/components/return_on_death.dm index 2b107efc224..a5423e62342 100644 --- a/modular_skyrat/modules/soulstone_changes/code/components/return_on_death.dm +++ b/modular_skyrat/modules/soulstone_changes/code/components/return_on_death.dm @@ -6,8 +6,8 @@ /datum/component/return_on_death/Initialize(mob/source) if(!ismob(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_LIVING_DEATH, .proc/return_to_old_body) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, .proc/return_to_old_body) + RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(return_to_old_body)) + RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(return_to_old_body)) sourcemob = source /datum/component/return_on_death/proc/return_to_old_body() diff --git a/modular_skyrat/modules/stone/code/ore_veins.dm b/modular_skyrat/modules/stone/code/ore_veins.dm index aba55fe3cda..3acaf511262 100644 --- a/modular_skyrat/modules/stone/code/ore_veins.dm +++ b/modular_skyrat/modules/stone/code/ore_veins.dm @@ -64,7 +64,7 @@ SSblackbox.record_feedback("tally", "pick_used_mining", 1, W.type) depleted = TRUE update_icon_state() - addtimer(CALLBACK(src, .proc/regenerate_ore), regeneration_time) + addtimer(CALLBACK(src, PROC_REF(regenerate_ore)), regeneration_time) // After the ore vein finishes its wait, we make the ore 'respawn' and return the ore to its original post-Initialize() icon_state. /obj/structure/ore_vein/proc/regenerate_ore() diff --git a/modular_skyrat/modules/tableflip/code/flipped_table.dm b/modular_skyrat/modules/tableflip/code/flipped_table.dm index 94157366ae2..10a0ed453d2 100644 --- a/modular_skyrat/modules/tableflip/code/flipped_table.dm +++ b/modular_skyrat/modules/tableflip/code/flipped_table.dm @@ -15,7 +15,7 @@ . = ..() var/static/list/loc_connections = list( - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) diff --git a/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm b/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm index 2d952497859..3c73ee456a2 100644 --- a/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm +++ b/modular_skyrat/modules/title_screen/code/title_screen_subsystem.dm @@ -145,7 +145,7 @@ SUBSYSTEM_DEF(title) */ /datum/controller/subsystem/title/proc/show_title_screen() for(var/mob/dead/new_player/new_player in GLOB.new_player_list) - INVOKE_ASYNC(new_player, /mob/dead/new_player.proc/show_title_screen) + INVOKE_ASYNC(new_player, TYPE_PROC_REF(/mob/dead/new_player, show_title_screen)) /** * Adds a notice to the main title screen in the form of big red text! diff --git a/modular_skyrat/modules/window_airbags/code/window_airbag.dm b/modular_skyrat/modules/window_airbags/code/window_airbag.dm index 8dd843535aa..04da6c4d9c6 100644 --- a/modular_skyrat/modules/window_airbags/code/window_airbag.dm +++ b/modular_skyrat/modules/window_airbags/code/window_airbag.dm @@ -21,9 +21,9 @@ if(!ismovable(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_ATOM_DESTRUCTION, .proc/deploy_airbag) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine) - RegisterSignal(target, COMSIG_CLICK_ALT, .proc/on_altclick) + RegisterSignal(target, COMSIG_ATOM_DESTRUCTION, PROC_REF(deploy_airbag)) + RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_CLICK_ALT, PROC_REF(on_altclick)) /datum/element/airbag/Detach(datum/target) . = ..() @@ -44,7 +44,7 @@ if(!clicker.can_interact_with(clicked_atom)) return - INVOKE_ASYNC(src, .proc/disarm_airbag, clicked_atom, clicker) + INVOKE_ASYNC(src, PROC_REF(disarm_airbag), clicked_atom, clicker) /datum/element/airbag/proc/disarm_airbag(atom/movable/clicked_atom, mob/living/clicker) clicked_atom.balloon_alert(clicker, "disarming airbag...") @@ -93,8 +93,8 @@ return balloon_alert_to_viewers("armed!") if(!anchored) - addtimer(CALLBACK(src, .proc/deploy_anchor), 1 SECONDS) - addtimer(CALLBACK(src, .proc/bang), detonate_time) + addtimer(CALLBACK(src, PROC_REF(deploy_anchor)), 1 SECONDS) + addtimer(CALLBACK(src, PROC_REF(bang)), detonate_time) armed = TRUE playsound(src, armed_sound, 50) update_appearance() diff --git a/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm b/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm index 5ea7c3a7d0c..fbf1ae0a3a3 100644 --- a/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm +++ b/modular_skyrat/modules/wrestlingring/code/wrestlingring.dm @@ -74,8 +74,8 @@ AddComponent(/datum/component/simple_rotation, ROTATION_NEEDS_ROOM) var/static/list/loc_connections = list( - COMSIG_ATOM_ENTERED = .proc/on_enter, - COMSIG_ATOM_EXIT = .proc/on_exit, + COMSIG_ATOM_ENTERED = PROC_REF(on_enter), + COMSIG_ATOM_EXIT = PROC_REF(on_exit), ) AddElement(/datum/element/connect_loc, loc_connections) @@ -117,7 +117,7 @@ if(flags_1 & NODECONSTRUCT_1) return to_chat(user, span_notice("You begin to [anchored ? "unfasten the turnbuckle from":"fasten the turnbuckle to"] the floor...")) - if(tool.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, .proc/check_anchored, anchored))) + if(tool.use_tool(src, user, volume = 75, extra_checks = CALLBACK(src, PROC_REF(check_anchored), anchored))) set_anchored(!anchored) to_chat(user, span_notice("You [anchored ? "fasten the turnbuckle to":"unfasten the turnbuckle from"] the floor.")) return TRUE diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_machine.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_machine.dm index 7951fcd1d24..8e861b9bf18 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_machine.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_machine.dm @@ -37,7 +37,7 @@ playsound(src, 'sound/machines/click.ogg', 50, TRUE) to_chat(user, span_notice("The [insert_item] has been inserted into [src].")) world_compare = world.time + process_speed - addtimer(CALLBACK(src, .proc/do_machine_process), process_speed) + addtimer(CALLBACK(src, PROC_REF(do_machine_process)), process_speed) /obj/machinery/xenoarch/attack_hand(mob/living/user, list/modifiers) . = ..() @@ -79,12 +79,12 @@ var/obj/item/xenoarch/strange_rock/strange_rock = check_item if(!do_after(user, xenoarch_bag.insert_speed, target = src)) world_compare = world.time + process_speed - addtimer(CALLBACK(src, .proc/do_machine_process), process_speed) + addtimer(CALLBACK(src, PROC_REF(do_machine_process)), process_speed) return strange_rock.forceMove(holding_storage) to_chat(user, span_notice("The strange rock has been inserted into [src].")) world_compare = world.time + process_speed - addtimer(CALLBACK(src, .proc/do_machine_process), process_speed) + addtimer(CALLBACK(src, PROC_REF(do_machine_process)), process_speed) return if(istype(weapon, /obj/item/xenoarch/strange_rock)) insert_xeno_item(weapon, user) @@ -122,7 +122,7 @@ qdel(remove_item) playsound(src, 'sound/machines/click.ogg', 50, TRUE) world_compare = world.time + process_speed - addtimer(CALLBACK(src, .proc/do_machine_process), process_speed) + addtimer(CALLBACK(src, PROC_REF(do_machine_process)), process_speed) /obj/machinery/xenoarch/scanner name = "xenoarch scanner" @@ -162,7 +162,7 @@ playsound(src, 'sound/machines/click.ogg', 50, TRUE) qdel(delete_obj) world_compare = world.time + process_speed - addtimer(CALLBACK(src, .proc/do_machine_process), process_speed) + addtimer(CALLBACK(src, PROC_REF(do_machine_process)), process_speed) /obj/machinery/xenoarch/recoverer/do_machine_process() if(!holding_storage.contents.len) @@ -223,12 +223,12 @@ var/obj/item/xenoarch/strange_rock/strange_rock = check_item if(!do_after(user, 1 SECONDS, target = src)) world_compare = world.time + (process_speed * 4) - addtimer(CALLBACK(src, .proc/do_machine_process), (process_speed * 4)) + addtimer(CALLBACK(src, PROC_REF(do_machine_process)), (process_speed * 4)) return strange_rock.forceMove(holding_storage) to_chat(user, span_notice("The strange rock has been inserted into [src].")) world_compare = world.time + (process_speed * 4) - addtimer(CALLBACK(src, .proc/do_machine_process), (process_speed * 4)) + addtimer(CALLBACK(src, PROC_REF(do_machine_process)), (process_speed * 4)) return else if(istype(weapon, /obj/item/xenoarch/strange_rock)) insert_xeno_item(weapon, user) @@ -252,4 +252,4 @@ playsound(src, 'sound/machines/click.ogg', 50, TRUE) qdel(strange_rock) world_compare = world.time + (process_speed * 4) - addtimer(CALLBACK(src, .proc/do_machine_process), (process_speed * 4)) + addtimer(CALLBACK(src, PROC_REF(do_machine_process)), (process_speed * 4)) diff --git a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm index c4dfd02706c..08709ee5ef9 100644 --- a/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm +++ b/modular_skyrat/modules/xenoarch/code/modules/research/xenoarch/xenoarch_tool.dm @@ -223,7 +223,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/xenoarch/dropped(mob/user) diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/base_skyrat_xeno.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/base_skyrat_xeno.dm index 9a7378ef7f1..35a600296bd 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/base_skyrat_xeno.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/base_skyrat_xeno.dm @@ -62,7 +62,7 @@ if(has_evolved_recently) return has_evolved_recently = TRUE - addtimer(CALLBACK(src, .proc/can_evolve_once_again), evolution_cooldown_time) + addtimer(CALLBACK(src, PROC_REF(can_evolve_once_again)), evolution_cooldown_time) /// Allows xenos to evolve again if they are currently unable to /mob/living/carbon/alien/adult/skyrat/proc/can_evolve_once_again() diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/drone.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/drone.dm index 30f60ef145f..a969f446a5c 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/drone.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/drone.dm @@ -53,7 +53,7 @@ return FALSE owner.balloon_alert(owner, "healing aura started") to_chat(owner, span_danger("We emit pheromones that encourage sisters near us to heal themselves for the next [aura_duration / 10] seconds.")) - addtimer(CALLBACK(src, .proc/aura_deactivate), aura_duration) + addtimer(CALLBACK(src, PROC_REF(aura_deactivate)), aura_duration) aura_active = TRUE aura_healing_component = owner.AddComponent(/datum/component/aura_healing, range = aura_range, requires_visibility = TRUE, brute_heal = aura_healing_amount, burn_heal = aura_healing_amount, limit_to_trait = TRAIT_XENO_HEAL_AURA, healing_color = aura_healing_color) return TRUE diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/queen.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/queen.dm index b1817a45ff7..d4e6b670796 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/queen.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/queen.dm @@ -91,7 +91,7 @@ remove_overlay(HALO_LAYER) overlays_standing[HALO_LAYER] = image("icon" = 'modular_skyrat/modules/xenos_skyrat_redo/icons/big_xenos.dmi', "icon_state" = "shriek_waves") //Ehh, suit layer's not being used. apply_overlay(HALO_LAYER) - addtimer(CALLBACK(src, .proc/remove_shriekwave), 3 SECONDS) + addtimer(CALLBACK(src, PROC_REF(remove_shriekwave)), 3 SECONDS) /mob/living/carbon/alien/adult/skyrat/proc/remove_shriekwave() remove_overlay(HALO_LAYER) diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/ravager.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/ravager.dm index 382bed1eea3..2ba5453c65a 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/ravager.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/ravager.dm @@ -100,7 +100,7 @@ owner.balloon_alert(owner, "endure began") playsound(owner, 'modular_skyrat/modules/xenos_skyrat_redo/sound/alien_roar1.ogg', 100, TRUE, 8, 0.9) to_chat(owner, span_danger("We numb our ability to feel pain, allowing us to fight until the very last for the next [endure_duration/10] seconds.")) - addtimer(CALLBACK(src, .proc/endure_deactivate), endure_duration) + addtimer(CALLBACK(src, PROC_REF(endure_deactivate)), endure_duration) owner.add_filter(RAVAGER_OUTLINE_EFFECT, 4, outline_filter(1, COLOR_RED_LIGHT)) ADD_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_XENO_ABILITY_GIVEN) ADD_TRAIT(owner, TRAIT_NOSOFTCRIT, TRAIT_XENO_ABILITY_GIVEN) diff --git a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm index d3b69521d39..b5d1378eb2a 100644 --- a/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm +++ b/modular_skyrat/modules/xenos_skyrat_redo/code/xeno_types/rouny.dm @@ -53,11 +53,11 @@ owner.balloon_alert(owner, "evasive movements began") playsound(owner, 'modular_skyrat/modules/xenos_skyrat_redo/sound/alien_hiss.ogg', 100, TRUE, 8, 0.9) to_chat(owner, span_danger("We take evasive action, making us impossible to hit with projectiles for the next [evasion_duration / 10] seconds.")) - addtimer(CALLBACK(src, .proc/evasion_deactivate), evasion_duration) + addtimer(CALLBACK(src, PROC_REF(evasion_deactivate)), evasion_duration) evade_active = TRUE - RegisterSignal(owner, COMSIG_PROJECTILE_ON_HIT, .proc/on_projectile_hit) + RegisterSignal(owner, COMSIG_PROJECTILE_ON_HIT, PROC_REF(on_projectile_hit)) REMOVE_TRAIT(owner, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT) - addtimer(CALLBACK(src, .proc/give_back_ventcrawl), (cooldown_time * EVASION_VENTCRAWL_INABILTY_CD_PERCENTAGE)) //They cannot ventcrawl until the defined percent of the cooldown has passed + addtimer(CALLBACK(src, PROC_REF(give_back_ventcrawl)), (cooldown_time * EVASION_VENTCRAWL_INABILTY_CD_PERCENTAGE)) //They cannot ventcrawl until the defined percent of the cooldown has passed to_chat(owner, span_warning("We will be unable to crawl through vents for the next [(cooldown_time * EVASION_VENTCRAWL_INABILTY_CD_PERCENTAGE) / 10] seconds.")) return TRUE @@ -79,7 +79,7 @@ owner.visible_message(span_danger("[owner] effortlessly dodges the projectile!"), span_userdanger("You dodge the projectile!")) playsound(get_turf(owner), pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 75, TRUE) owner.add_filter(RUNNER_BLUR_EFFECT, 2, gauss_blur_filter(5)) - addtimer(CALLBACK(owner, /atom.proc/remove_filter, RUNNER_BLUR_EFFECT), 0.5 SECONDS) + addtimer(CALLBACK(owner, TYPE_PROC_REF(/atom, remove_filter), RUNNER_BLUR_EFFECT), 0.5 SECONDS) return BULLET_ACT_FORCE_PIERCE /mob/living/carbon/alien/adult/skyrat/runner/bullet_act(obj/projectile/P, def_zone, piercing_hit = FALSE) diff --git a/tgstation.dme b/tgstation.dme index 14285d6ebeb..5bb347e0672 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -14,6 +14,7 @@ // BEGIN_INCLUDE #include "_maps\_basemap.dm" +#include "code\__byond_version_compat.dm" #include "code\_compile_options.dm" #include "code\_debugger.dm" #include "code\world.dm" diff --git a/tgui/docs/tgui-for-custom-html-popups.md b/tgui/docs/tgui-for-custom-html-popups.md index ad563a693b0..97eaf20446e 100644 --- a/tgui/docs/tgui-for-custom-html-popups.md +++ b/tgui/docs/tgui-for-custom-html-popups.md @@ -195,7 +195,7 @@ To receive it in DM, you must register a delegate proc (callback) that will rece ```dm /datum/my_object/proc/initialize() // ... - window.subscribe(src, .proc/on_message) + window.subscribe(src, PROC_REF(on_message)) /datum/my_object/proc/on_message(type, payload) if (type == "click") diff --git a/tgui/packages/tgui-dev-server/dreamseeker.js b/tgui/packages/tgui-dev-server/dreamseeker.js index eb90b1dc3cf..2b25b155ae0 100644 --- a/tgui/packages/tgui-dev-server/dreamseeker.js +++ b/tgui/packages/tgui-dev-server/dreamseeker.js @@ -29,6 +29,9 @@ export class DreamSeeker { .map(key => encodeURIComponent(key) + '=' + encodeURIComponent(params[key])) .join('&'); + logger.log( + `topic call at ${this.client.defaults.baseURL + '/dummy?' + query}` + ); return this.client.get('/dummy?' + query); } } diff --git a/tgui/packages/tgui-dev-server/reloader.js b/tgui/packages/tgui-dev-server/reloader.js index 444d9e40cd5..988088f731b 100644 --- a/tgui/packages/tgui-dev-server/reloader.js +++ b/tgui/packages/tgui-dev-server/reloader.js @@ -66,8 +66,6 @@ export const findCacheRoot = async () => { const onCacheRootFound = (cacheRoot) => { logger.log(`found cache at '${cacheRoot}'`); - // Plant a dummy - fs.closeSync(fs.openSync(cacheRoot + '/dummy', 'w')); }; export const reloadByondCache = async (bundleDir) => { @@ -98,6 +96,9 @@ export const reloadByondCache = async (bundleDir) => { './*.+(bundle|chunk|hot-update).*' ); try { + // Plant a dummy browser window file, we'll be using this to avoid world topic + fs.closeSync(fs.openSync(cacheDir + '/dummy', 'w')); + for (let file of garbage) { fs.unlinkSync(file); } diff --git a/tgui/public/tgui.html b/tgui/public/tgui.html index 9d478268fe5..225349152c1 100644 --- a/tgui/public/tgui.html +++ b/tgui/public/tgui.html @@ -55,8 +55,9 @@ // Basic checks to detect whether this page runs in BYOND var isByond = (Byond.TRIDENT !== null || window.cef_to_byond) && location.hostname === '127.0.0.1' - && location.pathname.indexOf('/tmp') === 0 && location.search !== '?external'; + //As of BYOND 515 the path doesn't seem to include tmp dir anymore if you're trying to open tgui in external browser and looking why it doesn't work + //&& location.pathname.indexOf('/tmp') === 0 // Version constants Byond.IS_BYOND = isByond; @@ -253,6 +254,8 @@ var len = styleSheets.length; for (var i = 0; i < len; i++) { var styleSheet = styleSheets[i]; + if(styleSheet.href === undefined) + continue; if (styleSheet.href.indexOf(url) !== -1) { return styleSheet.rules.length > 0; } diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index 4932374c86c..7312d57783c 100644 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -303,6 +303,13 @@ do done < <(jq -r '[.map_file] | flatten | .[]' $json) done +# Check for non-515 compatable .proc/ syntax +if grep -P --exclude='__byond_version_compat.dm' '\.proc/' code/**/*.dm; then + echo + echo -e "${RED}ERROR: Outdated proc reference use detected in code, please use proc reference helpers.${NC}" + st=1 +fi; + if [ $st = 0 ]; then echo echo -e "${GREEN}No errors found using grep!${NC}"