From ae5a4f955d0be3b307ddc1246eaeb7f7d51ed983 Mon Sep 17 00:00:00 2001 From: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> Date: Thu, 8 Jun 2023 23:14:31 -0700 Subject: [PATCH] Pulls apart the vestiges of components still hanging onto signals (#75914) ## About The Pull Request Signals were initially only usable with component listeners, which while no longer the case has lead to outdated documentation, names, and a similar location in code. This pr pulls the two apart. Partially because mso thinks we should, but also because they really aren't directly linked anymore, and having them in this midstate just confuses people. [Renames comp_lookup to listen_lookup, since that's what it does](https://github.com/tgstation/tgstation/commit/102b79694fa8eb57ecf7b36032616a9e368ccced) [Moves signal procs over to their own file](https://github.com/tgstation/tgstation/commit/33d07d01fd336726b4f6f6f1b61bb0b3f11a00dc) [Renames the PREQDELETING and QDELETING comsigs to drop the parent bit since they can hook to more then just comps now](https://github.com/tgstation/tgstation/commit/335ea4ad081ec63c42cfa05856e582cca833af6e) [Does something similar to the attackby comsigs (PARENT -> ATOM)](https://github.com/tgstation/tgstation/commit/210e57051df63f88dac3dd83321236da825aae5e) [And finally passes over the examine signals](https://github.com/tgstation/tgstation/commit/65917658fb8a1e7d28ae23c9437a583d646f0302) ## Why It's Good For The Game Code makes more sense, things are better teased apart, s just good imo ## Changelog :cl: refactor: Pulled apart the last vestiges of names/docs directly linking signals to components /:cl: --- code/__DEFINES/dcs/helpers.dm | 2 +- .../signals_atom/signals_atom_attack.dm | 4 +- .../signals/signals_atom/signals_atom_main.dm | 6 +- code/__DEFINES/dcs/signals/signals_datum.dm | 6 +- code/__HELPERS/duplicating.dm | 2 +- code/_onclick/hud/alert.dm | 2 +- code/_onclick/hud/radial.dm | 4 +- code/_onclick/hud/screen_object_holder.dm | 2 +- code/_onclick/item_attack.dm | 4 +- code/controllers/admin.dm | 2 +- code/controllers/subsystem/augury.dm | 4 +- code/controllers/subsystem/dcs.dm | 2 +- code/controllers/subsystem/eigenstate.dm | 4 +- code/controllers/subsystem/garbage.dm | 4 +- .../subsystem/movement/movement_types.dm | 6 +- code/controllers/subsystem/overlays.dm | 2 +- code/controllers/subsystem/shuttle.dm | 2 +- code/controllers/subsystem/spatial_gridmap.dm | 8 +- code/controllers/subsystem/statpanel.dm | 2 +- code/controllers/subsystem/throwing.dm | 2 +- code/controllers/subsystem/traitor.dm | 2 +- code/datums/actions/action.dm | 8 +- code/datums/actions/mobs/charge.dm | 2 +- code/datums/ai/_ai_controller.dm | 4 +- code/datums/ai/oldhostile/hostile_tameable.dm | 6 +- .../robot_customer_controller.dm | 4 +- code/datums/alarm.dm | 2 +- code/datums/browser.dm | 2 +- code/datums/chatmessage.dm | 2 +- code/datums/cinematics/_cinematic.dm | 4 +- code/datums/components/_component.dm | 127 +----------------- code/datums/components/acid.dm | 4 +- code/datums/components/admin_popup.dm | 4 +- code/datums/components/aquarium.dm | 2 +- code/datums/components/armor_plate.dm | 6 +- code/datums/components/attached_sticker.dm | 6 +- code/datums/components/bakeable.dm | 4 +- code/datums/components/burning.dm | 4 +- code/datums/components/clothing_fov_visor.dm | 8 +- code/datums/components/combo_attacks.dm | 6 +- code/datums/components/combustible_flooder.dm | 4 +- code/datums/components/connect_containers.dm | 4 +- code/datums/components/connect_loc_behalf.dm | 4 +- code/datums/components/connect_mob_behalf.dm | 4 +- code/datums/components/connect_range.dm | 4 +- code/datums/components/construction.dm | 4 +- code/datums/components/conveyor_movement.dm | 2 +- code/datums/components/crate_carrier.dm | 6 +- code/datums/components/cult_ritual_item.dm | 6 +- code/datums/components/curse_of_hunger.dm | 4 +- .../components/customizable_reagent_holder.dm | 8 +- code/datums/components/deadchat_control.dm | 2 +- code/datums/components/deployable.dm | 2 +- code/datums/components/drift.dm | 2 +- code/datums/components/egg_layer.dm | 4 +- code/datums/components/electrified_buckle.dm | 4 +- code/datums/components/embedded.dm | 12 +- code/datums/components/engraved.dm | 4 +- code/datums/components/explodable.dm | 2 +- code/datums/components/faction_granter.dm | 4 +- code/datums/components/fishing_spot.dm | 2 +- code/datums/components/food/decomposition.dm | 4 +- code/datums/components/food/edible.dm | 4 +- code/datums/components/food/golem_food.dm | 8 +- .../components/food/ice_cream_holder.dm | 2 +- code/datums/components/food_storage.dm | 2 +- code/datums/components/force_move.dm | 2 +- code/datums/components/fullauto.dm | 4 +- code/datums/components/gags_recolorable.dm | 4 +- code/datums/components/gps.dm | 4 +- code/datums/components/grillable.dm | 4 +- code/datums/components/heirloom.dm | 4 +- code/datums/components/holderloving.dm | 4 +- .../components/interaction_booby_trap.dm | 4 +- code/datums/components/keep_me_secure.dm | 6 +- code/datums/components/label.dm | 6 +- code/datums/components/light_eater.dm | 10 +- code/datums/components/material_container.dm | 12 +- code/datums/components/mind_linker.dm | 4 +- code/datums/components/mob_harvest.dm | 6 +- code/datums/components/multiple_lives.dm | 4 +- .../components/nuclear_bomb_operator.dm | 8 +- code/datums/components/omen.dm | 6 +- code/datums/components/onwear_mood.dm | 8 +- code/datums/components/overlay_lighting.dm | 18 +-- code/datums/components/palette.dm | 4 +- code/datums/components/pellet_cloud.dm | 24 ++-- .../components/pet_commands/obeys_commands.dm | 4 +- code/datums/components/phylactery.dm | 10 +- code/datums/components/plumbing/_plumbing.dm | 8 +- code/datums/components/radioactive_emitter.dm | 4 +- code/datums/components/religious_tool.dm | 6 +- code/datums/components/remote_materials.dm | 2 +- code/datums/components/rot.dm | 2 +- code/datums/components/rotation.dm | 4 +- code/datums/components/scope.dm | 4 +- code/datums/components/seclight_attachable.dm | 18 +-- code/datums/components/shell.dm | 12 +- code/datums/components/shielded.dm | 8 +- code/datums/components/simple_access.dm | 2 +- code/datums/components/singularity.dm | 4 +- code/datums/components/slippery.dm | 4 +- code/datums/components/soul_stealer.dm | 4 +- code/datums/components/spawner.dm | 6 +- code/datums/components/spin2win.dm | 4 +- code/datums/components/spirit_holding.dm | 6 +- code/datums/components/squeak.dm | 6 +- code/datums/components/stationloving.dm | 4 +- code/datums/components/style/style_meter.dm | 4 +- code/datums/components/supermatter_crystal.dm | 4 +- code/datums/components/swabbing.dm | 2 +- code/datums/components/tameable.dm | 2 +- code/datums/components/tattoo.dm | 8 +- code/datums/components/temporary_body.dm | 4 +- code/datums/components/thermite.dm | 16 +-- code/datums/components/toggle_suit.dm | 6 +- code/datums/components/trapdoor.dm | 4 +- code/datums/components/twohanded.dm | 4 +- code/datums/components/udder.dm | 6 +- code/datums/components/uplink.dm | 4 +- code/datums/components/usb_port.dm | 12 +- code/datums/components/vacuum.dm | 4 +- code/datums/datum.dm | 6 +- code/datums/elements/_element.dm | 4 +- code/datums/elements/ai_held_item.dm | 4 +- code/datums/elements/art.dm | 4 +- code/datums/elements/can_barricade.dm | 6 +- code/datums/elements/chemical_transfer.dm | 4 +- code/datums/elements/climbable.dm | 4 +- code/datums/elements/cuffsnapping.dm | 4 +- code/datums/elements/decals/_decal.dm | 4 +- code/datums/elements/deliver_first.dm | 4 +- code/datums/elements/digitalcamo.dm | 4 +- code/datums/elements/embed.dm | 4 +- code/datums/elements/envenomable_casing.dm | 4 +- code/datums/elements/food/microwavable.dm | 6 +- code/datums/elements/food/processable.dm | 4 +- code/datums/elements/light_eaten.dm | 4 +- code/datums/elements/loomable.dm | 4 +- code/datums/elements/noticable_organ.dm | 6 +- code/datums/elements/organ_set_bonus.dm | 2 +- .../elements/radiation_protected_clothing.dm | 4 +- code/datums/elements/rust.dm | 4 +- code/datums/elements/series.dm | 4 +- code/datums/elements/wall_engraver.dm | 4 +- code/datums/elements/weapon_description.dm | 4 +- code/datums/hud.dm | 8 +- code/datums/looping_sounds/_looping_sound.dm | 4 +- code/datums/martial/cqc.dm | 4 +- code/datums/martial/sleeping_carp.dm | 4 +- code/datums/mergers/_merger.dm | 4 +- code/datums/mind/_mind.dm | 4 +- code/datums/mood.dm | 6 +- code/datums/progressbar.dm | 2 +- .../fields/projectile_dampener.dm | 2 +- .../proximity_monitor/proximity_monitor.dm | 8 +- code/datums/quirks/_quirk.dm | 4 +- code/datums/signals.dm | 124 +++++++++++++++++ code/datums/status_effects/debuffs/choke.dm | 2 +- code/datums/status_effects/neutral.dm | 10 +- code/datums/storage/storage.dm | 4 +- code/datums/visual_data.dm | 4 +- code/datums/weakrefs.dm | 2 +- code/datums/wires/_wires.dm | 2 +- code/datums/wounds/_wounds.dm | 8 +- code/datums/wounds/scars/_scars.dm | 4 +- code/datums/wounds/slash.dm | 4 +- code/game/atoms.dm | 10 +- code/game/gamemodes/objective.dm | 2 +- code/game/machinery/computer/dna_console.dm | 4 +- code/game/machinery/computer/mechlaunchpad.dm | 6 +- code/game/machinery/dna_scanner.dm | 4 +- code/game/machinery/doors/door.dm | 2 +- code/game/machinery/doors/firedoor.dm | 4 +- .../machinery/porta_turret/portable_turret.dm | 2 +- code/game/machinery/roulette_machine.dm | 2 +- .../effects/decals/cleanable/humans.dm | 2 +- .../objects/effects/decals/cleanable/misc.dm | 2 +- .../effects/effect_system/effect_system.dm | 2 +- .../effect_system/effects_explosion.dm | 2 +- .../effects/effect_system/effects_water.dm | 4 +- code/game/objects/effects/particle_holder.dm | 2 +- .../objects/effects/poster_motivational.dm | 2 +- code/game/objects/effects/step_triggers.dm | 2 +- code/game/objects/items.dm | 4 +- code/game/objects/items/dehy_carp.dm | 4 +- code/game/objects/items/food/salad.dm | 2 +- code/game/objects/items/hand_items.dm | 6 +- .../items/implants/implant_deathrattle.dm | 2 +- code/game/objects/items/melee/baton.dm | 4 +- .../objects/items/robot/robot_upgrades.dm | 2 +- .../stacks/golem_food/golem_status_effects.dm | 8 +- code/game/objects/items/tanks/watertank.dm | 2 +- code/game/objects/items/teleportation.dm | 4 +- code/game/objects/objs.dm | 4 +- code/game/objects/structures/aliens.dm | 6 +- code/game/objects/structures/bedsheet_bin.dm | 6 +- .../objects/structures/training_machine.dm | 6 +- .../transit_tubes/transit_tube_pod.dm | 2 +- code/game/turfs/change_turf.dm | 6 +- code/game/turfs/open/asteroid.dm | 2 +- code/modules/admin/greyscale_modify_menu.dm | 2 +- code/modules/admin/tag.dm | 2 +- code/modules/admin/verbs/lua/_wrappers.dm | 4 +- .../admin/view_variables/mark_datum.dm | 6 +- code/modules/antagonists/cult/cult.dm | 16 +-- .../antagonists/heretic/heretic_antag.dm | 6 +- .../antagonists/heretic/heretic_focus.dm | 6 +- .../modules/antagonists/heretic/influences.dm | 8 +- .../heretic/knowledge/blade_lore.dm | 4 +- .../heretic/magic/furious_steel.dm | 4 +- .../antagonists/heretic/magic/shadow_cloak.dm | 6 +- .../antagonists/heretic/magic/star_touch.dm | 2 +- .../heretic/status_effects/buffs.dm | 2 +- .../nukeop/equipment/borgchameleon.dm | 2 +- .../antagonists/revenant/haunted_item.dm | 6 +- .../antagonists/space_dragon/space_dragon.dm | 2 +- .../traitor/components/demoraliser.dm | 4 +- .../traitor_objective_mind_tracker.dm | 2 +- .../traitor/objectives/assassination.dm | 8 +- .../traitor/objectives/demoralise_graffiti.dm | 8 +- .../traitor/objectives/demoralise_poster.dm | 4 +- .../traitor/objectives/destroy_heirloom.dm | 4 +- .../traitor/objectives/destroy_item.dm | 4 +- .../traitor/objectives/eyesnatching.dm | 2 +- .../antagonists/traitor/objectives/infect.dm | 2 +- .../traitor/objectives/kidnapping.dm | 2 +- .../traitor/objectives/kill_pet.dm | 4 +- .../traitor/objectives/sabotage_machinery.dm | 8 +- .../traitor/objectives/sleeper_protocol.dm | 2 +- .../antagonists/traitor/objectives/steal.dm | 8 +- .../machinery/air_alarm/_air_alarm.dm | 6 +- .../machinery/air_alarm/air_alarm_circuit.dm | 6 +- .../machinery/bluespace_vendor.dm | 4 +- .../machinery/components/fusion/hfr_procs.dm | 20 +-- .../portable/portable_atmospherics.dm | 6 +- code/modules/cargo/supplypod.dm | 4 +- code/modules/client/client_procs.dm | 2 +- code/modules/clothing/under/accessories.dm | 4 +- code/modules/escape_menu/escape_menu.dm | 2 +- code/modules/events/vent_clog.dm | 4 +- .../modules/explorer_drone/control_console.dm | 4 +- code/modules/explorer_drone/scanner_array.dm | 2 +- code/modules/fishing/aquarium/aquarium.dm | 2 +- code/modules/fishing/fish/_fish.dm | 4 +- code/modules/fishing/fishing_rod.dm | 2 +- .../food_and_drinks/machinery/food_cart.dm | 16 +-- .../food_and_drinks/machinery/griddle.dm | 4 +- .../food_and_drinks/machinery/stove.dm | 2 +- .../machinery/stove_component.dm | 8 +- code/modules/food_and_drinks/pizzabox.dm | 4 +- code/modules/food_and_drinks/plate.dm | 4 +- code/modules/hallucination/_hallucination.dm | 16 +-- code/modules/hallucination/bolted_airlocks.dm | 4 +- .../modules/hallucination/inhand_fake_item.dm | 6 +- .../hallucination/screwy_health_doll.dm | 4 +- code/modules/hallucination/stray_bullet.dm | 6 +- code/modules/holodeck/computer.dm | 10 +- code/modules/holodeck/holo_effect.dm | 2 +- code/modules/holodeck/items.dm | 2 +- code/modules/hydroponics/grown/replicapod.dm | 4 +- code/modules/hydroponics/plant_genes.dm | 4 +- .../modules/hydroponics/unique_plant_genes.dm | 6 +- .../elevator/elevator_music_zone.dm | 6 +- .../industrial_lift/industrial_lift.dm | 4 +- code/modules/industrial_lift/lift_master.dm | 4 +- .../space_management/space_reservation.dm | 4 +- code/modules/meteors/meteor_types.dm | 2 +- .../meteor_heart/chasing_spikes.dm | 4 +- .../modules/mob/living/carbon/alien/organs.dm | 4 +- code/modules/mob/living/carbon/carbon.dm | 4 +- .../mob/living/carbon/carbon_defense.dm | 8 +- code/modules/mob/living/carbon/examine.dm | 2 +- .../mob/living/carbon/human/examine.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 6 +- .../mob/living/silicon/robot/robot_model.dm | 2 +- .../living/simple_animal/guardian/guardian.dm | 4 +- .../simple_animal/guardian/types/explosive.dm | 6 +- .../hostile/bosses/paperwizard.dm | 4 +- .../living/simple_animal/hostile/hostile.dm | 6 +- .../hostile/mining_mobs/curse_blob.dm | 2 +- .../hostile/mining_mobs/elites/elite.dm | 6 +- .../mob/living/simple_animal/hostile/ooze.dm | 6 +- .../simple_animal/hostile/venus_human_trap.dm | 2 +- .../mob/living/simple_animal/slime/slime.dm | 18 +-- code/modules/mod/mod_control.dm | 2 +- code/modules/mod/mod_core.dm | 10 +- code/modules/mod/modules/_module.dm | 4 +- code/modules/mod/modules/modules_general.dm | 8 +- code/modules/mod/modules/modules_ninja.dm | 10 +- code/modules/mod/modules/modules_timeline.dm | 4 +- .../programs/maintenance/modsuit.dm | 4 +- .../file_system/programs/sm_monitor.dm | 4 +- .../plumbing/plumbers/plumbing_buffer.dm | 4 +- .../plumbing/plumbers/reaction_chamber.dm | 4 +- code/modules/power/cell.dm | 4 +- .../supermatter_delamination/cascade_delam.dm | 2 +- .../projectiles/guns/energy/special.dm | 2 +- .../projectiles/guns/special/medbeam.dm | 2 +- .../chemistry/machinery/chem_heater.dm | 4 +- .../chemistry/reagents/food_reagents.dm | 4 +- code/modules/reagents/reagent_containers.dm | 4 +- .../reagents/reagent_containers/spray.dm | 2 +- code/modules/recycling/conveyor.dm | 4 +- code/modules/recycling/disposal/holder.dm | 2 +- .../religion/honorbound/honorbound_trauma.dm | 8 +- .../religion/sparring/sparring_datum.dm | 10 +- .../research/ordnance/tank_compressor.dm | 4 +- .../xenobiology/vatgrowing/vatgrower.dm | 4 +- .../spells/spell_types/jaunt/bloodcrawl.dm | 6 +- .../spells/spell_types/self/summonitem.dm | 6 +- .../spell_types/shapeshift/_shape_status.dm | 6 +- .../spells/spell_types/touch/_touch.dm | 6 +- .../surgery/bodyparts/worn_feature_offset.dm | 2 +- code/modules/surgery/organs/_organ.dm | 4 +- code/modules/surgery/organs/heart.dm | 8 +- code/modules/surgery/organs/tongue.dm | 4 +- code/modules/tooltip/tooltip.dm | 4 +- code/modules/tutorials/_tutorial.dm | 4 +- code/modules/vehicles/_vehicle.dm | 4 +- .../mecha/equipment/tools/medical_tools.dm | 4 +- code/modules/vehicles/pimpin_ride.dm | 4 +- code/modules/visuals/render_steps.dm | 2 +- .../wiremod/components/abstract/variable.dm | 4 +- code/modules/wiremod/components/action/mmi.dm | 8 +- .../admin/signal_handler/signal_list.dm | 8 +- .../wiremod/core/integrated_circuit.dm | 4 +- code/modules/wiremod/core/marker.dm | 4 +- code/modules/wiremod/core/port.dm | 6 +- code/modules/wiremod/core/usb_cable.dm | 4 +- code/modules/wiremod/core/variable.dm | 4 +- .../wiremod/shell/brain_computer_interface.dm | 4 +- code/modules/wiremod/shell/dispenser.dm | 8 +- code/modules/wiremod/shell/moneybot.dm | 4 +- tgstation.dme | 1 + 335 files changed, 913 insertions(+), 913 deletions(-) create mode 100644 code/datums/signals.dm diff --git a/code/__DEFINES/dcs/helpers.dm b/code/__DEFINES/dcs/helpers.dm index d1ca969241c..df6acffd761 100644 --- a/code/__DEFINES/dcs/helpers.dm +++ b/code/__DEFINES/dcs/helpers.dm @@ -2,7 +2,7 @@ /// The datum hosting the signal is automaticaly added as the first argument /// Returns a bitfield gathered from all registered procs /// Arguments given here are packaged in a list and given to _SendSignal -#define SEND_SIGNAL(target, sigtype, arguments...) ( !target._comp_lookup?[sigtype] ? NONE : target._SendSignal(sigtype, list(target, ##arguments)) ) +#define SEND_SIGNAL(target, sigtype, arguments...) ( !target._listen_lookup?[sigtype] ? NONE : target._SendSignal(sigtype, list(target, ##arguments)) ) #define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( SEND_SIGNAL(SSdcs, sigtype, ##arguments) ) diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm index 6299fae7a08..2c6d71d2529 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_attack.dm @@ -3,9 +3,9 @@ // All signals send the source datum of the signal as the first argument ///from base of atom/attackby(): (/obj/item, /mob/living, params) -#define COMSIG_PARENT_ATTACKBY "atom_attackby" +#define COMSIG_ATOM_ATTACKBY "atom_attackby" /// From base of [atom/proc/attacby_secondary()]: (/obj/item/weapon, /mob/user, params) -#define COMSIG_PARENT_ATTACKBY_SECONDARY "atom_attackby_secondary" +#define COMSIG_ATOM_ATTACKBY_SECONDARY "atom_attackby_secondary" ///from [/item/afterattack()], sent by an atom which was just attacked by an item: (/obj/item/weapon, /mob/user, proximity_flag, click_parameters) #define COMSIG_ATOM_AFTER_ATTACKEDBY "atom_after_attackby" /// From base of [/atom/proc/attack_hand_secondary]: (mob/user, list/modifiers) - Called when the atom receives a secondary unarmed attack. diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm index 9e02b01e236..0542d22b686 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm @@ -8,15 +8,15 @@ //from SSatoms InitAtom - Only if the atom was not deleted or failed initialization #define COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE "atom_init_success" ///from base of atom/examine(): (/mob, list/examine_text) -#define COMSIG_PARENT_EXAMINE "atom_examine" +#define COMSIG_ATOM_EXAMINE "atom_examine" ///from base of atom/get_examine_name(): (/mob, list/overrides) #define COMSIG_ATOM_GET_EXAMINE_NAME "atom_examine_name" ///from base of atom/examine(): (/mob, list/examine_text, can_see_inside) -#define COMSIG_PARENT_REAGENT_EXAMINE "atom_reagent_examine" +#define COMSIG_ATOM_REAGENT_EXAMINE "atom_reagent_examine" /// Stop the generic reagent examine text #define STOP_GENERIC_REAGENT_EXAMINE (1<<0) ///from base of atom/examine_more(): (/mob) -#define COMSIG_PARENT_EXAMINE_MORE "atom_examine_more" +#define COMSIG_ATOM_EXAMINE_MORE "atom_examine_more" //Positions for overrides list #define EXAMINE_POSITION_ARTICLE (1<<0) #define EXAMINE_POSITION_BEFORE (1<<1) diff --git a/code/__DEFINES/dcs/signals/signals_datum.dm b/code/__DEFINES/dcs/signals/signals_datum.dm index 9e625a5f3b7..879ff60eaa2 100644 --- a/code/__DEFINES/dcs/signals/signals_datum.dm +++ b/code/__DEFINES/dcs/signals/signals_datum.dm @@ -10,10 +10,10 @@ /// before a datum's Destroy() is called: (force), returning a nonzero value will cancel the qdel operation /// you should only be using this if you want to block deletion -/// that's the only functional difference between it and COMSIG_PARENT_QDELETING, outside setting QDELETING to detect -#define COMSIG_PARENT_PREQDELETED "parent_preqdeleted" +/// that's the only functional difference between it and COMSIG_QDELETING, outside setting QDELETING to detect +#define COMSIG_PREQDELETED "parent_preqdeleted" /// just before a datum's Destroy() is called: (force), at this point none of the other components chose to interrupt qdel and Destroy will be called -#define COMSIG_PARENT_QDELETING "parent_qdeleting" +#define COMSIG_QDELETING "parent_qdeleting" /// generic topic handler (usr, href_list) #define COMSIG_TOPIC "handle_topic" /// handler for vv_do_topic (usr, href_list) diff --git a/code/__HELPERS/duplicating.dm b/code/__HELPERS/duplicating.dm index e26543ca24e..225dca91fb5 100644 --- a/code/__HELPERS/duplicating.dm +++ b/code/__HELPERS/duplicating.dm @@ -10,7 +10,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars, list( "bodyparts", "ckey", "client_mobs_in_contents", - "_comp_lookup", + "_listen_lookup", "computer_id", "contents", "cooldowns", diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 2537133a5d8..4693b2c0344 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -381,7 +381,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." /atom/movable/screen/alert/give/highfive/setup(mob/living/carbon/taker, mob/living/carbon/offerer, obj/item/receiving) . = ..() - RegisterSignal(offerer, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(check_fake_out)) + RegisterSignal(offerer, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(check_fake_out)) /atom/movable/screen/alert/give/highfive/handle_transfer() diff --git a/code/_onclick/hud/radial.dm b/code/_onclick/hud/radial.dm index 75e83a00b59..36bc7dbd720 100644 --- a/code/_onclick/hud/radial.dm +++ b/code/_onclick/hud/radial.dm @@ -11,10 +11,10 @@ GLOBAL_LIST_EMPTY(radial_menus) /atom/movable/screen/radial/proc/set_parent(new_value) if(parent) - UnregisterSignal(parent, COMSIG_PARENT_QDELETING) + UnregisterSignal(parent, COMSIG_QDELETING) parent = new_value if(parent) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(handle_parent_del)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(handle_parent_del)) /atom/movable/screen/radial/proc/handle_parent_del() SIGNAL_HANDLER diff --git a/code/_onclick/hud/screen_object_holder.dm b/code/_onclick/hud/screen_object_holder.dm index ba6a9b96172..78ed9606d49 100644 --- a/code/_onclick/hud/screen_object_holder.dm +++ b/code/_onclick/hud/screen_object_holder.dm @@ -11,7 +11,7 @@ src.client = client - RegisterSignal(client, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_qdel)) + RegisterSignal(client, COMSIG_QDELETING, PROC_REF(on_parent_qdel)) /datum/screen_object_holder/Destroy() clear() diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 80fd3e2277b..d70d7233b79 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -127,7 +127,7 @@ * See: [/obj/item/proc/melee_attack_chain] */ /atom/proc/attackby(obj/item/attacking_item, mob/user, params) - if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, attacking_item, user, params) & COMPONENT_NO_AFTERATTACK) + if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACKBY, attacking_item, user, params) & COMPONENT_NO_AFTERATTACK) return TRUE return FALSE @@ -142,7 +142,7 @@ * See: [/obj/item/proc/melee_attack_chain] */ /atom/proc/attackby_secondary(obj/item/weapon, mob/user, params) - var/signal_result = SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY_SECONDARY, weapon, user, params) + var/signal_result = SEND_SIGNAL(src, COMSIG_ATOM_ATTACKBY_SECONDARY, weapon, user, params) if(signal_result & COMPONENT_SECONDARY_CANCEL_ATTACK_CHAIN) return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN diff --git a/code/controllers/admin.dm b/code/controllers/admin.dm index d3a508be13a..1105a5c693f 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_REF(cleanup)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(cleanup)) /obj/effect/statclick/Destroy() target = null diff --git a/code/controllers/subsystem/augury.dm b/code/controllers/subsystem/augury.dm index 22d5003a7ec..e686e5cdb62 100644 --- a/code/controllers/subsystem/augury.dm +++ b/code/controllers/subsystem/augury.dm @@ -14,11 +14,11 @@ SUBSYSTEM_DEF(augury) /datum/controller/subsystem/augury/proc/register_doom(atom/A, severity) doombringers[A] = severity - RegisterSignal(A, COMSIG_PARENT_QDELETING, PROC_REF(unregister_doom)) + RegisterSignal(A, COMSIG_QDELETING, PROC_REF(unregister_doom)) /datum/controller/subsystem/augury/proc/unregister_doom(atom/A) SIGNAL_HANDLER - UnregisterSignal(A, COMSIG_PARENT_QDELETING) + UnregisterSignal(A, COMSIG_QDELETING) doombringers -= A /datum/controller/subsystem/augury/fire() diff --git a/code/controllers/subsystem/dcs.dm b/code/controllers/subsystem/dcs.dm index 035860e90cf..8e305d95699 100644 --- a/code/controllers/subsystem/dcs.dm +++ b/code/controllers/subsystem/dcs.dm @@ -6,7 +6,7 @@ PROCESSING_SUBSYSTEM_DEF(dcs) var/list/elements_by_type = list() /datum/controller/subsystem/processing/dcs/Recover() - _comp_lookup = SSdcs._comp_lookup + _listen_lookup = SSdcs._listen_lookup /datum/controller/subsystem/processing/dcs/proc/GetElement(list/arguments) var/datum/element/eletype = arguments[1] diff --git a/code/controllers/subsystem/eigenstate.dm b/code/controllers/subsystem/eigenstate.dm index c80faf860b9..54636a4fd79 100644 --- a/code/controllers/subsystem/eigenstate.dm +++ b/code/controllers/subsystem/eigenstate.dm @@ -38,7 +38,7 @@ SUBSYSTEM_DEF(eigenstates) eigen_targets["[id_counter]"] += target eigen_id[target] = "[id_counter]" RegisterSignal(target, COMSIG_CLOSET_INSERT, PROC_REF(use_eigenlinked_atom)) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(remove_eigen_entry)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(remove_eigen_entry)) RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), PROC_REF(tool_interact)) target.RegisterSignal(target, COMSIG_EIGENSTATE_ACTIVATE, TYPE_PROC_REF(/obj/structure/closet,bust_open)) ADD_TRAIT(target, TRAIT_BANNED_FROM_CARGO_SHUTTLE, REF(src)) @@ -71,7 +71,7 @@ SUBSYSTEM_DEF(eigenstates) entry.color = COLOR_WHITE entry.alpha = 255 UnregisterSignal(entry, list( - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, COMSIG_CLOSET_INSERT, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER), )) diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index 871be1276c2..e79a836b8b3 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -365,12 +365,12 @@ SUBSYSTEM_DEF(garbage) I.qdels++ if(isnull(D.gc_destroyed)) - if (SEND_SIGNAL(D, COMSIG_PARENT_PREQDELETED, force)) // Give the components a chance to prevent their parent from being deleted + if (SEND_SIGNAL(D, COMSIG_PREQDELETED, force)) // Give the components a chance to prevent their parent from being deleted return D.gc_destroyed = GC_CURRENTLY_BEING_QDELETED var/start_time = world.time var/start_tick = world.tick_usage - SEND_SIGNAL(D, COMSIG_PARENT_QDELETING, force) // Let the (remaining) components know about the result of Destroy + SEND_SIGNAL(D, COMSIG_QDELETING, force) // Let the (remaining) components know about the result of Destroy var/hint = D.Destroy(arglist(args.Copy(2))) // Let our friend know they're about to get fucked up. if(world.time != start_time) I.slept_destroy++ diff --git a/code/controllers/subsystem/movement/movement_types.dm b/code/controllers/subsystem/movement/movement_types.dm index 210bedd5b24..81a6b38c228 100644 --- a/code/controllers/subsystem/movement/movement_types.dm +++ b/code/controllers/subsystem/movement/movement_types.dm @@ -33,7 +33,7 @@ src.controller = controller src.extra_info = extra_info if(extra_info) - RegisterSignal(extra_info, COMSIG_PARENT_QDELETING, PROC_REF(info_deleted)) + RegisterSignal(extra_info, COMSIG_QDELETING, PROC_REF(info_deleted)) src.moving = moving src.priority = priority src.flags = flags @@ -241,7 +241,7 @@ target = chasing if(!isturf(target)) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(handle_no_target)) //Don't do this for turfs, because we don't care + RegisterSignal(target, COMSIG_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) @@ -381,7 +381,7 @@ src.skip_first = skip_first movement_path = initial_path.Copy() if(isidcard(id)) - 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 + RegisterSignal(id, COMSIG_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, initial_path) 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) diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index 5d52733e2f1..db94c291a18 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -211,7 +211,7 @@ SUBSYSTEM_DEF(overlays) continue if(name == "vars") // Go away continue - if(name == "_comp_lookup") // This is just gonna happen with marked datums, don't care + if(name == "_listen_lookup") // This is just gonna happen with marked datums, don't care continue if(name == "overlays") first.realize_overlays() diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index a4e1e17e15d..5b53c67d93b 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -650,7 +650,7 @@ SUBSYSTEM_DEF(shuttle) // Proposals use 2 extra hidden tiles of space, from the cordons that surround them transit_utilized += (proposal.width + 2) * (proposal.height + 2) M.assigned_transit = new_transit_dock - RegisterSignal(proposal, COMSIG_PARENT_QDELETING, PROC_REF(transit_space_clearing)) + RegisterSignal(proposal, COMSIG_QDELETING, PROC_REF(transit_space_clearing)) return new_transit_dock diff --git a/code/controllers/subsystem/spatial_gridmap.dm b/code/controllers/subsystem/spatial_gridmap.dm index d7ac7453326..64f7994a1fe 100644 --- a/code/controllers/subsystem/spatial_gridmap.dm +++ b/code/controllers/subsystem/spatial_gridmap.dm @@ -120,7 +120,7 @@ SUBSYSTEM_DEF(spatial_grid) if(movable_turf) enter_cell(movable, movable_turf) - UnregisterSignal(movable, COMSIG_PARENT_QDELETING) + UnregisterSignal(movable, COMSIG_QDELETING) waiting_to_add_by_type[channel_type] -= movable pregenerate_more_oranges_ears(NUMBER_OF_PREGENERATED_ORANGES_EARS) @@ -131,7 +131,7 @@ SUBSYSTEM_DEF(spatial_grid) ///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_REF(queued_item_deleted), override = TRUE) + RegisterSignal(waiting_movable, COMSIG_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 @@ -146,11 +146,11 @@ SUBSYSTEM_DEF(spatial_grid) waiting_movable_is_in_other_queues = TRUE if(!waiting_movable_is_in_other_queues) - UnregisterSignal(movable_to_remove, COMSIG_PARENT_QDELETING) + UnregisterSignal(movable_to_remove, COMSIG_QDELETING) return - UnregisterSignal(movable_to_remove, COMSIG_PARENT_QDELETING) + UnregisterSignal(movable_to_remove, COMSIG_QDELETING) for(var/type in waiting_to_add_by_type) waiting_to_add_by_type[type] -= movable_to_remove diff --git a/code/controllers/subsystem/statpanel.dm b/code/controllers/subsystem/statpanel.dm index 1d93f4787ec..a1f20eafe8a 100644 --- a/code/controllers/subsystem/statpanel.dm +++ b/code/controllers/subsystem/statpanel.dm @@ -227,7 +227,7 @@ SUBSYSTEM_DEF(statpanels) // Now, we're gonna queue image generation out of those refs to_make += turf_item already_seen[turf_item] = OBJ_IMAGE_LOADING - obj_window.RegisterSignal(turf_item, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum/object_window_info,viewing_atom_deleted)) // we reset cache if anything in it gets deleted + obj_window.RegisterSignal(turf_item, COMSIG_QDELETING, TYPE_PROC_REF(/datum/object_window_info,viewing_atom_deleted)) // we reset cache if anything in it gets deleted return turf_items #undef OBJ_IMAGE_LOADING diff --git a/code/controllers/subsystem/throwing.dm b/code/controllers/subsystem/throwing.dm index 1c5c50dd0fb..739a0c69565 100644 --- a/code/controllers/subsystem/throwing.dm +++ b/code/controllers/subsystem/throwing.dm @@ -93,7 +93,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_REF(on_thrownthing_qdel)) + RegisterSignal(thrownthing, COMSIG_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/traitor.dm b/code/controllers/subsystem/traitor.dm index bae2bebecd1..cd035fedc7d 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_REF(uplink_handler_deleted), override = TRUE) + RegisterSignal(uplink_handler, COMSIG_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/datums/actions/action.dm b/code/datums/actions/action.dm index 0dc44b46640..a78ef2644f1 100644 --- a/code/datums/actions/action.dm +++ b/code/datums/actions/action.dm @@ -53,7 +53,7 @@ /// 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_REF(clear_ref), override = TRUE) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_ref), override = TRUE) if(isatom(target)) RegisterSignal(target, COMSIG_ATOM_UPDATED_ICON, PROC_REF(on_target_icon_update)) @@ -89,7 +89,7 @@ SEND_SIGNAL(src, COMSIG_ACTION_GRANTED, grant_to) SEND_SIGNAL(grant_to, COMSIG_MOB_GRANTED_ACTION, src) owner = grant_to - RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(clear_ref), override = TRUE) + RegisterSignal(owner, COMSIG_QDELETING, PROC_REF(clear_ref), override = TRUE) // Register some signals based on our check_flags // so that our button icon updates when relevant @@ -121,7 +121,7 @@ if(owner) SEND_SIGNAL(src, COMSIG_ACTION_REMOVED, owner) SEND_SIGNAL(owner, COMSIG_MOB_REMOVED_ACTION, src) - UnregisterSignal(owner, COMSIG_PARENT_QDELETING) + UnregisterSignal(owner, COMSIG_QDELETING) // Clean up our check_flag signals UnregisterSignal(owner, list( @@ -133,7 +133,7 @@ )) if(target == owner) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(clear_ref)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(clear_ref)) owner = null /// Actually triggers the effects of the action. diff --git a/code/datums/actions/mobs/charge.dm b/code/datums/actions/mobs/charge.dm index 9a49b465f07..07a541838ed 100644 --- a/code/datums/actions/mobs/charge.dm +++ b/code/datums/actions/mobs/charge.dm @@ -64,7 +64,7 @@ return 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)) + RegisterSignal(new_loop, COMSIG_QDELETING, PROC_REF(charge_end)) if(ismob(charger)) RegisterSignal(charger, COMSIG_MOB_STATCHANGE, PROC_REF(stat_changed)) diff --git a/code/datums/ai/_ai_controller.dm b/code/datums/ai/_ai_controller.dm index 85cd2c66fd6..0345fccba0c 100644 --- a/code/datums/ai/_ai_controller.dm +++ b/code/datums/ai/_ai_controller.dm @@ -363,7 +363,7 @@ multiple modular subtrees with behaviors else if(isdatum(tracked_datum)) { \ var/datum/_tracked_datum = tracked_datum; \ if(!HAS_TRAIT_FROM(_tracked_datum, TRAIT_AI_TRACKING, "[REF(src)]_[key]")) { \ - RegisterSignal(_tracked_datum, COMSIG_PARENT_QDELETING, PROC_REF(sig_remove_from_blackboard), override = TRUE); \ + RegisterSignal(_tracked_datum, COMSIG_QDELETING, PROC_REF(sig_remove_from_blackboard), override = TRUE); \ ADD_TRAIT(_tracked_datum, TRAIT_AI_TRACKING, "[REF(src)]_[key]"); \ }; \ }; \ @@ -380,7 +380,7 @@ multiple modular subtrees with behaviors var/datum/_tracked_datum = tracked_datum; \ REMOVE_TRAIT(_tracked_datum, TRAIT_AI_TRACKING, "[REF(src)]_[key]"); \ if(!HAS_TRAIT(_tracked_datum, TRAIT_AI_TRACKING)) { \ - UnregisterSignal(_tracked_datum, COMSIG_PARENT_QDELETING); \ + UnregisterSignal(_tracked_datum, COMSIG_QDELETING); \ }; \ }; \ } while(FALSE) diff --git a/code/datums/ai/oldhostile/hostile_tameable.dm b/code/datums/ai/oldhostile/hostile_tameable.dm index 6cbba3f68db..748db4c5043 100644 --- a/code/datums/ai/oldhostile/hostile_tameable.dm +++ b/code/datums/ai/oldhostile/hostile_tameable.dm @@ -26,7 +26,7 @@ if(!ishostile(new_pawn)) return AI_CONTROLLER_INCOMPATIBLE - RegisterSignal(new_pawn, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) + RegisterSignal(new_pawn, COMSIG_ATOM_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)) @@ -35,10 +35,10 @@ /datum/ai_controller/hostile_friend/UnpossessPawn(destroy) UnregisterSignal(pawn, list( COMSIG_ATOM_ATTACK_HAND, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, COMSIG_CLICK_ALT, COMSIG_LIVING_DEATH, - COMSIG_PARENT_QDELETING + COMSIG_QDELETING )) unfriend() return ..() //Run parent at end diff --git a/code/datums/ai/robot_customer/robot_customer_controller.dm b/code/datums/ai/robot_customer/robot_customer_controller.dm index ca47798726b..2a633590f68 100644 --- a/code/datums/ai/robot_customer/robot_customer_controller.dm +++ b/code/datums/ai/robot_customer/robot_customer_controller.dm @@ -21,14 +21,14 @@ if(!istype(new_pawn, /mob/living/simple_animal/robot_customer)) return AI_CONTROLLER_INCOMPATIBLE new_pawn.AddElement(/datum/element/relay_attackers) - RegisterSignal(new_pawn, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(new_pawn, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) RegisterSignal(new_pawn, COMSIG_ATOM_WAS_ATTACKED, PROC_REF(on_attacked)) 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) - UnregisterSignal(pawn, list(COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_WAS_ATTACKED, COMSIG_LIVING_GET_PULLED, COMSIG_ATOM_ATTACK_HAND)) + UnregisterSignal(pawn, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_WAS_ATTACKED, COMSIG_LIVING_GET_PULLED, COMSIG_ATOM_ATTACK_HAND)) return ..() //Run parent at end /datum/ai_controller/robot_customer/proc/on_attackby(datum/source, obj/item/I, mob/living/user) diff --git a/code/datums/alarm.dm b/code/datums/alarm.dm index 86e7593a28d..b266362f3ca 100644 --- a/code/datums/alarm.dm +++ b/code/datums/alarm.dm @@ -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_REF(clear_camera_ref), override = TRUE) //It's just fine to override, cause we clear all refs in the proc + RegisterSignal(optional_camera, COMSIG_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/browser.dm b/code/datums/browser.dm index 62cea4929e5..08099b46f1a 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -15,7 +15,7 @@ /datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null) user = nuser - RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(user_deleted)) + RegisterSignal(user, COMSIG_QDELETING, PROC_REF(user_deleted)) window_id = nwindow_id if (ntitle) title = format_text(ntitle) diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 5d0b26a1f6a..3debadbda70 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -114,7 +114,7 @@ // Register client who owns this message owned_by = owner.client - RegisterSignal(owned_by, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_qdel)) + RegisterSignal(owned_by, COMSIG_QDELETING, PROC_REF(on_parent_qdel)) // Remove spans in the message from things like the recorder var/static/regex/span_check = new(@"<\/?span[^>]*>", "gi") diff --git a/code/datums/cinematics/_cinematic.dm b/code/datums/cinematics/_cinematic.dm index 6659fde0c51..9dfa311db56 100644 --- a/code/datums/cinematics/_cinematic.dm +++ b/code/datums/cinematics/_cinematic.dm @@ -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_REF(remove_watcher)) + RegisterSignal(watching_client, COMSIG_QDELETING, PROC_REF(remove_watcher)) /// Simple helper for playing sounds from the cinematic. /datum/cinematic/proc/play_cinematic_sound(sound_to_play) @@ -161,7 +161,7 @@ if(!(no_longer_watching in watching)) CRASH("cinematic remove_watcher was passed a client which wasn't watching.") - UnregisterSignal(no_longer_watching, COMSIG_PARENT_QDELETING) + UnregisterSignal(no_longer_watching, COMSIG_QDELETING) // We'll clear the cinematic if they have a mob which has one, // but we won't remove notransform. Wait for the cinematic end to do that. no_longer_watching.mob?.clear_fullscreen("cinematic") diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index e2c38933bf8..26d562a824a 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -189,109 +189,6 @@ if(!LAZYLEN(sources)) qdel(src) -/** - * Register to listen for a signal from the passed in target - * - * 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: - * * datum/target The target to listen for signals from - * * signal_type A signal name - * * proctype The proc to call back when the signal is emitted - * * override If a previous registration exists you must explicitly set this - */ -/datum/proc/RegisterSignal(datum/target, signal_type, proctype, override = FALSE) - if(QDELETED(src) || QDELETED(target)) - return - - if (islist(signal_type)) - var/static/list/known_failures = list() - var/list/signal_type_list = signal_type - var/message = "([target.type]) is registering [signal_type_list.Join(", ")] as a list, the older method. Change it to RegisterSignals." - - if (!(message in known_failures)) - known_failures[message] = TRUE - stack_trace("[target] [message]") - - RegisterSignals(target, signal_type, proctype, override) - return - - var/list/procs = (_signal_procs ||= list()) - var/list/target_procs = (procs[target] ||= list()) - var/list/lookup = (target._comp_lookup ||= list()) - - if(!override && target_procs[signal_type]) - var/override_message = "[signal_type] overridden. Use override = TRUE to suppress this warning.\nTarget: [target] ([target.type]) Proc: [proctype]" - log_signal(override_message) - stack_trace(override_message) - - target_procs[signal_type] = proctype - var/list/looked_up = lookup[signal_type] - - if(isnull(looked_up)) // Nothing has registered here yet - lookup[signal_type] = src - else if(looked_up == src) // We already registered here - return - else if(!length(looked_up)) // One other thing registered here - lookup[signal_type] = list((looked_up) = TRUE, (src) = TRUE) - else // Many other things have registered here - looked_up[src] = TRUE - -/// Registers multiple signals to the same proc. -/datum/proc/RegisterSignals(datum/target, list/signal_types, proctype, override = FALSE) - for (var/signal_type in signal_types) - RegisterSignal(target, signal_type, proctype, override) - -/** - * Stop listening to a given signal from target - * - * Breaks the relationship between target and source datum, removing the callback when the signal fires - * - * Doesn't care if a registration exists or not - * - * Arguments: - * * datum/target Datum to stop listening to signals from - * * sig_typeor_types Signal string key or list of signal keys to stop listening to specifically - */ -/datum/proc/UnregisterSignal(datum/target, sig_type_or_types) - var/list/lookup = target._comp_lookup - if(!_signal_procs || !_signal_procs[target] || !lookup) - return - if(!islist(sig_type_or_types)) - sig_type_or_types = list(sig_type_or_types) - for(var/sig in sig_type_or_types) - if(!_signal_procs[target][sig]) - if(!istext(sig)) - stack_trace("We're unregistering with something that isn't a valid signal \[[sig]\], you fucked up") - continue - switch(length(lookup[sig])) - if(2) - lookup[sig] = (lookup[sig]-src)[1] - if(1) - stack_trace("[target] ([target.type]) somehow has single length list inside _comp_lookup") - if(src in lookup[sig]) - lookup -= sig - if(!length(lookup)) - target._comp_lookup = null - break - if(0) - if(lookup[sig] != src) - continue - lookup -= sig - if(!length(lookup)) - target._comp_lookup = null - break - else - lookup[sig] -= src - - _signal_procs[target] -= sig_type_or_types - if(!_signal_procs[target].len) - _signal_procs -= target - /** * Called on a component when a component of the same type was added to the same parent * @@ -344,29 +241,7 @@ //and since most components are root level + 1, this won't even have to run while (current_type != /datum/component) current_type = type2parent(current_type) - . += current_type - -/** - * Internal proc to handle most all of the signaling procedure - * - * Will runtime if used on datums with an empty comp_lookup list - * - * Use the [SEND_SIGNAL] define instead - */ -/datum/proc/_SendSignal(sigtype, list/arguments) - var/target = _comp_lookup[sigtype] - if(!length(target)) - var/datum/listening_datum = target - return NONE | call(listening_datum, listening_datum._signal_procs[src][sigtype])(arglist(arguments)) - . = NONE - // This exists so that even if one of the signal receivers unregisters the signal, - // all the objects that are receiving the signal get the signal this final time. - // AKA: No you can't cancel the signal reception of another object by doing an unregister in the same signal. - var/list/queued_calls = list() - for(var/datum/listening_datum as anything in target) - queued_calls[listening_datum] = listening_datum._signal_procs[src][sigtype] - for(var/datum/listening_datum as anything in queued_calls) - . |= call(listening_datum, queued_calls[listening_datum])(arglist(arguments)) + . += current_type // The type arg is casted so initial works, you shouldn't be passing a real instance into this /** diff --git a/code/datums/components/acid.dm b/code/datums/components/acid.dm index f4a85ef6527..89430ff368e 100644 --- a/code/datums/components/acid.dm +++ b/code/datums/components/acid.dm @@ -73,7 +73,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e return ..() /datum/component/acid/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(on_clean)) RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_attack_hand)) @@ -85,7 +85,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e /datum/component/acid/UnregisterFromParent() UnregisterSignal(parent, list( - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_ATOM_ATTACK_HAND, diff --git a/code/datums/components/admin_popup.dm b/code/datums/components/admin_popup.dm index e22c2073ebd..6edd839942d 100644 --- a/code/datums/components/admin_popup.dm +++ b/code/datums/components/admin_popup.dm @@ -21,7 +21,7 @@ list( COMSIG_ADMIN_HELP_MADE_INACTIVE, COMSIG_ADMIN_HELP_REPLIED, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, ), PROC_REF(delete_self), ) @@ -36,7 +36,7 @@ UnregisterSignal(ticket, list( COMSIG_ADMIN_HELP_MADE_INACTIVE, COMSIG_ADMIN_HELP_REPLIED, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, )) ticket = null diff --git a/code/datums/components/aquarium.dm b/code/datums/components/aquarium.dm index b3cc795665f..25a95105174 100644 --- a/code/datums/components/aquarium.dm +++ b/code/datums/components/aquarium.dm @@ -298,6 +298,6 @@ remove_from_aquarium() /datum/component/aquarium_content/proc/remove_from_aquarium() - UnregisterSignal(current_aquarium, list(COMSIG_AQUARIUM_SURFACE_CHANGED, COMSIG_AQUARIUM_FLUID_CHANGED, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_EXITED)) + UnregisterSignal(current_aquarium, list(COMSIG_AQUARIUM_SURFACE_CHANGED, COMSIG_AQUARIUM_FLUID_CHANGED, COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_EXITED)) remove_visual_from_aquarium() current_aquarium = null diff --git a/code/datums/components/armor_plate.dm b/code/datums/components/armor_plate.dm index 15fbf35a35e..779dcca11da 100644 --- a/code/datums/components/armor_plate.dm +++ b/code/datums/components/armor_plate.dm @@ -12,9 +12,9 @@ if(!isobj(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(applyplate)) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(dropplates)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(applyplate)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(dropplates)) if(istype(parent, /obj/vehicle/sealed/mecha/working/ripley)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_mech_overlays)) diff --git a/code/datums/components/attached_sticker.dm b/code/datums/components/attached_sticker.dm index cb37382da96..d43861b5515 100644 --- a/code/datums/components/attached_sticker.dm +++ b/code/datums/components/attached_sticker.dm @@ -52,11 +52,11 @@ RegisterSignal(parent, COMSIG_LIVING_IGNITED, PROC_REF(on_ignite)) if(washable) RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(peel)) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(on_attached_qdel)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(on_attached_qdel)) /datum/component/attached_sticker/UnregisterFromParent() if(sticker.resistance_flags & FLAMMABLE) - UnregisterSignal(parent, list(COMSIG_LIVING_IGNITED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(parent, list(COMSIG_LIVING_IGNITED, COMSIG_QDELETING)) if(signal_turf) UnregisterSignal(signal_turf, COMSIG_TURF_EXPOSE) signal_turf = null @@ -77,7 +77,7 @@ qdel(sticker) peel() -/// Signal handler for COMSIG_PARENT_QDELETING, deletes this sticker if the attached object is deleted +/// Signal handler for COMSIG_QDELETING, deletes this sticker if the attached object is deleted /datum/component/attached_sticker/proc/on_attached_qdel(datum/source) SIGNAL_HANDLER qdel(sticker) diff --git a/code/datums/components/bakeable.dm b/code/datums/components/bakeable.dm index 11bfc7fc8cb..a5367769f68 100644 --- a/code/datums/components/bakeable.dm +++ b/code/datums/components/bakeable.dm @@ -37,10 +37,10 @@ /datum/component/bakeable/RegisterWithParent() 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)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/bakeable/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_ITEM_OVEN_PLACED_IN, COMSIG_ITEM_OVEN_PROCESS, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(parent, list(COMSIG_ITEM_OVEN_PLACED_IN, COMSIG_ITEM_OVEN_PROCESS, COMSIG_ATOM_EXAMINE)) /// Signal proc for [COMSIG_ITEM_OVEN_PLACED_IN] when baking starts (parent enters an oven) /datum/component/bakeable/proc/on_baking_start(datum/source, atom/used_oven, mob/baker) diff --git a/code/datums/components/burning.dm b/code/datums/components/burning.dm index 8320d1d992a..347340e3e2c 100644 --- a/code/datums/components/burning.dm +++ b/code/datums/components/burning.dm @@ -35,7 +35,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e return ..() /datum/component/burning/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) RegisterSignal(parent, COMSIG_ATOM_EXTINGUISH, PROC_REF(on_extinguish)) var/atom/atom_parent = parent @@ -43,7 +43,7 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e atom_parent.update_appearance() /datum/component/burning/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_PARENT_EXAMINE, COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_ATOM_EXTINGUISH)) + UnregisterSignal(parent, list(COMSIG_ATOM_EXAMINE, COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_ATOM_EXTINGUISH)) var/atom/atom_parent = parent if(!QDELETED(atom_parent)) atom_parent.resistance_flags &= ~ON_FIRE diff --git a/code/datums/components/clothing_fov_visor.dm b/code/datums/components/clothing_fov_visor.dm index a3d9a333cb9..69579ce2d81 100644 --- a/code/datums/components/clothing_fov_visor.dm +++ b/code/datums/components/clothing_fov_visor.dm @@ -26,7 +26,7 @@ UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_CLOTHING_VISOR_TOGGLE)) if(wearer) wearer.remove_fov_trait(src, fov_angle) - UnregisterSignal(wearer, COMSIG_PARENT_QDELETING) + UnregisterSignal(wearer, COMSIG_QDELETING) wearer = null return ..() @@ -35,7 +35,7 @@ SIGNAL_HANDLER is_worn = FALSE if(wearer) // Prevent any edge cases where on_drop is called with a different dropper to the one who equipped the visor. - UnregisterSignal(wearer, COMSIG_PARENT_QDELETING) + UnregisterSignal(wearer, COMSIG_QDELETING) wearer.remove_fov_trait(src, fov_angle) wearer = null if(visor_up) @@ -50,10 +50,10 @@ return is_worn = TRUE if(wearer && wearer != equipper) - UnregisterSignal(wearer, COMSIG_PARENT_QDELETING) + UnregisterSignal(wearer, COMSIG_QDELETING) wearer.remove_fov_trait(src, fov_angle) wearer = equipper - RegisterSignal(wearer, COMSIG_PARENT_QDELETING, PROC_REF(on_wearer_deleted)) + RegisterSignal(wearer, COMSIG_QDELETING, PROC_REF(on_wearer_deleted)) if(visor_up) return equipper.add_fov_trait(src, fov_angle) diff --git a/code/datums/components/combo_attacks.dm b/code/datums/components/combo_attacks.dm index 1657d4b5d3f..1524451b67a 100644 --- a/code/datums/components/combo_attacks.dm +++ b/code/datums/components/combo_attacks.dm @@ -33,14 +33,14 @@ src.can_attack_callback = can_attack_callback /datum/component/combo_attacks/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(on_examine_more)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more)) RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_self)) RegisterSignal(parent, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack)) /datum/component/combo_attacks/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_PARENT_EXAMINE, COMSIG_PARENT_EXAMINE_MORE, COMSIG_ITEM_ATTACK_SELF, COMSIG_ITEM_DROPPED, COMSIG_ITEM_ATTACK)) + UnregisterSignal(parent, list(COMSIG_ATOM_EXAMINE, COMSIG_ATOM_EXAMINE_MORE, COMSIG_ITEM_ATTACK_SELF, COMSIG_ITEM_DROPPED, COMSIG_ITEM_ATTACK)) /datum/component/combo_attacks/proc/on_examine(datum/source, mob/user, list/examine_list) SIGNAL_HANDLER diff --git a/code/datums/components/combustible_flooder.dm b/code/datums/components/combustible_flooder.dm index e92393a7d4a..2fa7e31695f 100644 --- a/code/datums/components/combustible_flooder.dm +++ b/code/datums/components/combustible_flooder.dm @@ -11,7 +11,7 @@ src.gas_amount = initialize_gas_amount src.temp_amount = initialize_temp_amount - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_react)) + RegisterSignal(parent, COMSIG_ATOM_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)) @@ -19,7 +19,7 @@ RegisterSignal(parent, COMSIG_TURF_EXPOSE, PROC_REF(hotspots_react)) /datum/component/combustible_flooder/UnregisterFromParent() - UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(parent, COMSIG_ATOM_ATTACKBY) UnregisterSignal(parent, COMSIG_ATOM_FIRE_ACT) UnregisterSignal(parent, COMSIG_ATOM_BULLET_ACT) UnregisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_WELDER)) diff --git a/code/datums/components/connect_containers.dm b/code/datums/components/connect_containers.dm index f8018168a13..22efc634359 100644 --- a/code/datums/components/connect_containers.dm +++ b/code/datums/components/connect_containers.dm @@ -32,13 +32,13 @@ /datum/component/connect_containers/proc/set_tracked(atom/movable/new_tracked) if(tracked) - UnregisterSignal(tracked, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(tracked, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) unregister_signals(tracked.loc) tracked = new_tracked if(!tracked) return RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) - RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel)) + RegisterSignal(tracked, COMSIG_QDELETING, PROC_REF(handle_tracked_qdel)) update_signals(tracked) /datum/component/connect_containers/proc/handle_tracked_qdel() diff --git a/code/datums/components/connect_loc_behalf.dm b/code/datums/components/connect_loc_behalf.dm index 297227e2aed..62701f5e39d 100644 --- a/code/datums/components/connect_loc_behalf.dm +++ b/code/datums/components/connect_loc_behalf.dm @@ -21,14 +21,14 @@ /datum/component/connect_loc_behalf/RegisterWithParent() RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) - RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel)) + RegisterSignal(tracked, COMSIG_QDELETING, PROC_REF(handle_tracked_qdel)) update_signals() /datum/component/connect_loc_behalf/UnregisterFromParent() unregister_signals() UnregisterSignal(tracked, list( COMSIG_MOVABLE_MOVED, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, )) tracked = null diff --git a/code/datums/components/connect_mob_behalf.dm b/code/datums/components/connect_mob_behalf.dm index 1c1a8a65234..b8aa014f810 100644 --- a/code/datums/components/connect_mob_behalf.dm +++ b/code/datums/components/connect_mob_behalf.dm @@ -19,12 +19,12 @@ src.tracked = tracked /datum/component/connect_mob_behalf/RegisterWithParent() - RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel)) + RegisterSignal(tracked, COMSIG_QDELETING, PROC_REF(handle_tracked_qdel)) update_signals() /datum/component/connect_mob_behalf/UnregisterFromParent() unregister_signals() - UnregisterSignal(tracked, COMSIG_PARENT_QDELETING) + UnregisterSignal(tracked, COMSIG_QDELETING) tracked = null tracked_mob = null diff --git a/code/datums/components/connect_range.dm b/code/datums/components/connect_range.dm index c87d203a2d6..95cb560c868 100644 --- a/code/datums/components/connect_range.dm +++ b/code/datums/components/connect_range.dm @@ -52,14 +52,14 @@ unregister_signals(isturf(tracked) ? tracked : tracked.loc) UnregisterSignal(tracked, list( COMSIG_MOVABLE_MOVED, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, )) tracked = new_tracked if(!tracked) return //Register signals on the new tracked atom and its surroundings. RegisterSignal(tracked, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) - RegisterSignal(tracked, COMSIG_PARENT_QDELETING, PROC_REF(handle_tracked_qdel)) + RegisterSignal(tracked, COMSIG_QDELETING, PROC_REF(handle_tracked_qdel)) update_signals(tracked) /datum/component/connect_range/proc/handle_tracked_qdel() diff --git a/code/datums/components/construction.dm b/code/datums/components/construction.dm index e0bac0ddbe7..af9cc9f2053 100644 --- a/code/datums/components/construction.dm +++ b/code/datums/components/construction.dm @@ -8,8 +8,8 @@ if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(action)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(action)) update_parent(index) /datum/component/construction/proc/examine(datum/source, mob/user, list/examine_list) diff --git a/code/datums/components/conveyor_movement.dm b/code/datums/components/conveyor_movement.dm index 4e9d685b351..4439b08e0a7 100644 --- a/code/datums/components/conveyor_movement.dm +++ b/code/datums/components/conveyor_movement.dm @@ -17,7 +17,7 @@ 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|MOVEMENT_LOOP_OUTSIDE_CONTROL) RegisterSignal(loop, COMSIG_MOVELOOP_PREPROCESS_CHECK, PROC_REF(should_move)) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_ended)) + RegisterSignal(loop, COMSIG_QDELETING, PROC_REF(loop_ended)) /datum/component/convey/proc/should_move(datum/move_loop/source) SIGNAL_HANDLER diff --git a/code/datums/components/crate_carrier.dm b/code/datums/components/crate_carrier.dm index c097ebb93c8..ce4081bd691 100644 --- a/code/datums/components/crate_carrier.dm +++ b/code/datums/components/crate_carrier.dm @@ -28,14 +28,14 @@ return ..() /datum/component/crate_carrier/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_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)) + UnregisterSignal(parent, list(COMSIG_LIVING_UNARMED_ATTACK, COMSIG_LIVING_DEATH, COMSIG_ATOM_EXAMINE)) -/// Signal proc for [COMSIG_PARENT_EXAMINE] to show when we're carrying crates +/// Signal proc for [COMSIG_ATOM_EXAMINE] to show when we're carrying crates /datum/component/crate_carrier/proc/on_examine(mob/living/source, mob/examiner, list/examine_list) SIGNAL_HANDLER diff --git a/code/datums/components/cult_ritual_item.dm b/code/datums/components/cult_ritual_item.dm index b76c1fd7acb..fa13f4844d4 100644 --- a/code/datums/components/cult_ritual_item.dm +++ b/code/datums/components/cult_ritual_item.dm @@ -51,7 +51,7 @@ RegisterSignal(parent, COMSIG_ITEM_ATTACK_EFFECT, PROC_REF(try_clear_rune)) if(examine_message) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/cult_ritual_item/UnregisterFromParent() UnregisterSignal(parent, list( @@ -59,11 +59,11 @@ COMSIG_ITEM_ATTACK, COMSIG_ITEM_ATTACK_OBJ, COMSIG_ITEM_ATTACK_EFFECT, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, )) /* - * Signal proc for [COMSIG_PARENT_EXAMINE]. + * Signal proc for [COMSIG_ATOM_EXAMINE]. * Gives the examiner, if they're a cultist, our set examine message. * Usually, this will include various instructions on how to use the thing. */ diff --git a/code/datums/components/curse_of_hunger.dm b/code/datums/components/curse_of_hunger.dm index a3100c79edb..36fa050a55e 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_REF(on_examine)) + RegisterSignal(cursed_item, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(cursed_item, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) /datum/component/curse_of_hunger/UnregisterFromParent() . = ..() UnregisterSignal(parent, list( - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, )) diff --git a/code/datums/components/customizable_reagent_holder.dm b/code/datums/components/customizable_reagent_holder.dm index 204c8186e1e..79ebf651d3f 100644 --- a/code/datums/components/customizable_reagent_holder.dm +++ b/code/datums/components/customizable_reagent_holder.dm @@ -62,8 +62,8 @@ /datum/component/customizable_reagent_holder/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(customizable_attack)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(customizable_attack)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(parent, COMSIG_ATOM_PROCESSED, PROC_REF(on_processed)) RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) ADD_TRAIT(parent, TRAIT_CUSTOMIZABLE_REAGENT_HOLDER, REF(src)) @@ -72,8 +72,8 @@ /datum/component/customizable_reagent_holder/UnregisterFromParent() . = ..() UnregisterSignal(parent, list( - COMSIG_PARENT_ATTACKBY, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_ATTACKBY, + COMSIG_ATOM_EXAMINE, COMSIG_ATOM_PROCESSED, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, )) diff --git a/code/datums/components/deadchat_control.dm b/code/datums/components/deadchat_control.dm index 5e1a9339a63..145b64c00de 100644 --- a/code/datums/components/deadchat_control.dm +++ b/code/datums/components/deadchat_control.dm @@ -30,7 +30,7 @@ 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)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) deadchat_mode = _deadchat_mode inputs = _inputs input_cooldown = _input_cooldown diff --git a/code/datums/components/deployable.dm b/code/datums/components/deployable.dm index 5308c847cd5..7a5e798b337 100644 --- a/code/datums/components/deployable.dm +++ b/code/datums/components/deployable.dm @@ -27,7 +27,7 @@ src.thing_to_be_deployed = thing_to_be_deployed src.delete_on_use = delete_on_use - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_attack_hand)) var/obj/item/typecast = thing_to_be_deployed diff --git a/code/datums/components/drift.dm b/code/datums/components/drift.dm index 0377c3dc70e..e974a3465ff 100644 --- a/code/datums/components/drift.dm +++ b/code/datums/components/drift.dm @@ -32,7 +32,7 @@ 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(drifting_loop, COMSIG_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 diff --git a/code/datums/components/egg_layer.dm b/code/datums/components/egg_layer.dm index 32812b4e3e1..7aceb7bd55d 100644 --- a/code/datums/components/egg_layer.dm +++ b/code/datums/components/egg_layer.dm @@ -41,11 +41,11 @@ /datum/component/egg_layer/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(feed_food)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(feed_food)) /datum/component/egg_layer/UnregisterFromParent() . = ..() - UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(parent, COMSIG_ATOM_ATTACKBY) /datum/component/egg_layer/Destroy(force, silent) . = ..() diff --git a/code/datums/components/electrified_buckle.dm b/code/datums/components/electrified_buckle.dm index cf1f13a17cd..ba6fc7858bd 100644 --- a/code/datums/components/electrified_buckle.dm +++ b/code/datums/components/electrified_buckle.dm @@ -58,7 +58,7 @@ if(usage_flags & SHOCK_REQUIREMENT_ITEM) required_object = input_item required_object.Move(parent_as_movable) - RegisterSignal(required_object, COMSIG_PARENT_QDELETING, PROC_REF(delete_self)) + RegisterSignal(required_object, COMSIG_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) @@ -109,7 +109,7 @@ UnregisterSignal(parent, requested_signal_parent_emits) if(required_object) - UnregisterSignal(required_object, list(COMSIG_PARENT_QDELETING, COMSIG_ASSEMBLY_PULSED)) + UnregisterSignal(required_object, list(COMSIG_QDELETING, COMSIG_ASSEMBLY_PULSED)) if(parent_as_movable && (required_object in parent_as_movable.contents)) required_object.Move(parent_as_movable.loc) diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm index c6933376d21..e49befeff06 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) - RegisterSignals(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), PROC_REF(weaponDeleted)) + RegisterSignals(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_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 @@ -108,7 +108,7 @@ victim.clear_alert(ALERT_EMBEDDED_OBJECT) victim.clear_mood_event("embedded") if(weapon) - UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) weapon = null limb = null return ..() @@ -117,11 +117,11 @@ 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)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(checkTweeze)) RegisterSignal(parent, COMSIG_MAGIC_RECALL, PROC_REF(magic_pull)) /datum/component/embedded/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL, COMSIG_PARENT_ATTACKBY, COMSIG_MAGIC_RECALL)) + UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_CARBON_EMBED_RIP, COMSIG_CARBON_EMBED_REMOVAL, COMSIG_ATOM_ATTACKBY, COMSIG_MAGIC_RECALL)) /datum/component/embedded/process(seconds_per_tick) var/mob/living/carbon/victim = parent @@ -221,10 +221,10 @@ var/mob/living/carbon/victim = parent limb._unembed_object(weapon) - UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) // have to do it here otherwise we trigger weaponDeleted() + UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) // have to do it here otherwise we trigger weaponDeleted() if(!weapon.unembedded()) // if it hasn't deleted itself due to drop del - UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(weapon, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) if(to_hands) INVOKE_ASYNC(to_hands, TYPE_PROC_REF(/mob, put_in_hands), weapon) else diff --git a/code/datums/components/engraved.dm b/code/datums/components/engraved.dm index e9ebbd123bf..016e3082a8d 100644 --- a/code/datums/components/engraved.dm +++ b/code/datums/components/engraved.dm @@ -64,13 +64,13 @@ return ..() //call this after since we null out the parent /datum/component/engraved/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_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) /datum/component/engraved/UnregisterFromParent() - UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) + UnregisterSignal(parent, COMSIG_ATOM_EXAMINE) //supporting component transfer means putting these here instead of destroy SSpersistence.wall_engravings -= src REMOVE_TRAIT(parent, TRAIT_NOT_ENGRAVABLE, TRAIT_GENERIC) diff --git a/code/datums/components/explodable.dm b/code/datums/components/explodable.dm index bf59f7aa3bb..31d78b45d56 100644 --- a/code/datums/components/explodable.dm +++ b/code/datums/components/explodable.dm @@ -23,7 +23,7 @@ if(!isatom(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(explodable_attack)) + RegisterSignal(parent, COMSIG_ATOM_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)) diff --git a/code/datums/components/faction_granter.dm b/code/datums/components/faction_granter.dm index 4ab7c098c4e..ad6b4f63369 100644 --- a/code/datums/components/faction_granter.dm +++ b/code/datums/components/faction_granter.dm @@ -27,10 +27,10 @@ /datum/component/faction_granter/RegisterWithParent() RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(on_self_attack)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/faction_granter/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF, COMSIG_ATOM_EXAMINE)) ///signal called on parent being examined /datum/component/faction_granter/proc/on_examine(datum/source, mob/user, list/examine_list) diff --git a/code/datums/components/fishing_spot.dm b/code/datums/components/fishing_spot.dm index 1b46b3cc541..a43aef04906 100644 --- a/code/datums/components/fishing_spot.dm +++ b/code/datums/components/fishing_spot.dm @@ -17,7 +17,7 @@ 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_REF(handle_attackby)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(handle_attackby)) RegisterSignal(parent, COMSIG_FISHING_ROD_CAST, PROC_REF(handle_cast)) diff --git a/code/datums/components/food/decomposition.dm b/code/datums/components/food/decomposition.dm index c8fa61368dc..ee5c8e22f1b 100644 --- a/code/datums/components/food/decomposition.dm +++ b/code/datums/components/food/decomposition.dm @@ -42,7 +42,7 @@ COMSIG_ITEM_DROPPED, //Object is dropped anywhere COMSIG_ATOM_EXITED), //Object exits a storage object (boxes, etc) PROC_REF(dropped)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) if(custom_time) // We have a custom decomposition time, set it to that original_time = custom_time @@ -63,7 +63,7 @@ COMSIG_MOVABLE_MOVED, COMSIG_ITEM_DROPPED, COMSIG_ATOM_EXITED, - COMSIG_PARENT_EXAMINE)) + COMSIG_ATOM_EXAMINE)) /datum/component/decomposition/proc/handle_movement() SIGNAL_HANDLER diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index b89f7976cc5..9068ce4b934 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -73,7 +73,7 @@ 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_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) RegisterSignals(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)) @@ -108,7 +108,7 @@ Behavior that's still missing from this component that original food items had t COMSIG_ITEM_ATTACK, COMSIG_ITEM_USED_AS_INGREDIENT, COMSIG_OOZE_EAT_ATOM, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, )) qdel(GetComponent(/datum/component/connect_loc_behalf)) diff --git a/code/datums/components/food/golem_food.dm b/code/datums/components/food/golem_food.dm index 0f728caebdb..818bb555a38 100644 --- a/code/datums/components/food/golem_food.dm +++ b/code/datums/components/food/golem_food.dm @@ -23,10 +23,10 @@ /datum/component/golem_food/RegisterWithParent() . = ..() RegisterSignal(parent, COMSIG_ITEM_ATTACK, PROC_REF(on_attack)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/golem_food/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK, COMSIG_ATOM_EXAMINE)) return ..() /datum/component/golem_food/Destroy(force, silent) @@ -53,7 +53,7 @@ /* food_buff = */ snack_type, /* owner = */ parent, ) - RegisterSignal(golem_snack, COMSIG_PARENT_QDELETING, PROC_REF(on_food_destroyed)) + RegisterSignal(golem_snack, COMSIG_QDELETING, PROC_REF(on_food_destroyed)) golem_snack.attack(target, user, click_parameters) return COMPONENT_CANCEL_ATTACK_CHAIN @@ -90,7 +90,7 @@ src.food_buff = food_buff src.owner = owner - RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_destroyed)) + RegisterSignal(owner, COMSIG_QDELETING, PROC_REF(on_parent_destroyed)) /// Clean ourselves up if our parent dies /obj/item/food/golem_food/proc/on_parent_destroyed(datum/destroyed_thing) diff --git a/code/datums/components/food/ice_cream_holder.dm b/code/datums/components/food/ice_cream_holder.dm index 60da9b207d6..09e5002db3d 100644 --- a/code/datums/components/food/ice_cream_holder.dm +++ b/code/datums/components/food/ice_cream_holder.dm @@ -59,7 +59,7 @@ if(change_name) RegisterSignal(owner, COMSIG_ATOM_UPDATE_NAME, PROC_REF(on_update_name)) if(!change_desc) - RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(on_examine_more)) + RegisterSignal(owner, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more)) else RegisterSignal(owner, COMSIG_ATOM_UPDATE_DESC, PROC_REF(on_update_desc)) diff --git a/code/datums/components/food_storage.dm b/code/datums/components/food_storage.dm index 503a16059e4..5ef93a206a8 100644 --- a/code/datums/components/food_storage.dm +++ b/code/datums/components/food_storage.dm @@ -18,7 +18,7 @@ /datum/component/food_storage/Initialize(_minimum_weight_class = WEIGHT_CLASS_SMALL, _bad_chance = 0, _good_chance = 100) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(try_inserting_item)) + RegisterSignal(parent, COMSIG_ATOM_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)) diff --git a/code/datums/components/force_move.dm b/code/datums/components/force_move.dm index 3c3cebbb7be..b8c36818621 100644 --- a/code/datums/components/force_move.dm +++ b/code/datums/components/force_move.dm @@ -14,7 +14,7 @@ RegisterSignal(mob_parent, COMSIG_ATOM_PRE_PRESSURE_PUSH, PROC_REF(stop_pressure)) if(spin) RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(slip_spin)) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_ended)) + RegisterSignal(loop, COMSIG_QDELETING, PROC_REF(loop_ended)) /datum/component/force_move/proc/stop_move(datum/source) SIGNAL_HANDLER diff --git a/code/datums/components/fullauto.dm b/code/datums/components/fullauto.dm index 2c5fd79c4fc..044619d594a 100644 --- a/code/datums/components/fullauto.dm +++ b/code/datums/components/fullauto.dm @@ -81,7 +81,7 @@ if(!QDELETED(shooter)) RegisterSignal(shooter, COMSIG_MOB_LOGOUT, PROC_REF(autofire_off)) UnregisterSignal(shooter, COMSIG_MOB_LOGIN) - RegisterSignals(parent, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(autofire_off)) + RegisterSignals(parent, list(COMSIG_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)) @@ -102,7 +102,7 @@ if(!QDELETED(shooter)) RegisterSignal(shooter, COMSIG_MOB_LOGIN, PROC_REF(on_client_login)) UnregisterSignal(shooter, COMSIG_MOB_LOGOUT) - UnregisterSignal(parent, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED)) + UnregisterSignal(parent, list(COMSIG_QDELETING, COMSIG_ITEM_DROPPED)) shooter = null parent.UnregisterSignal(parent, COMSIG_AUTOFIRE_SHOT) parent.UnregisterSignal(src, COMSIG_AUTOFIRE_ONMOUSEDOWN) diff --git a/code/datums/components/gags_recolorable.dm b/code/datums/components/gags_recolorable.dm index 262cbe77ea7..f864ee5bd0c 100644 --- a/code/datums/components/gags_recolorable.dm +++ b/code/datums/components/gags_recolorable.dm @@ -1,10 +1,10 @@ /datum/component/gags_recolorable /datum/component/gags_recolorable/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) /datum/component/gags_recolorable/UnregisterFromParent() - UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(parent, COMSIG_ATOM_ATTACKBY) /datum/component/gags_recolorable/proc/on_attackby(datum/source, obj/item/attacking_item, mob/user) SIGNAL_HANDLER diff --git a/code/datums/components/gps.dm b/code/datums/components/gps.dm index 4d75d114b94..b19828edd90 100644 --- a/code/datums/components/gps.dm +++ b/code/datums/components/gps.dm @@ -49,7 +49,7 @@ GLOBAL_LIST_EMPTY(GPS_list) RegisterSignal(parent, COMSIG_ITEM_ATTACK_SELF, PROC_REF(interact)) if(!emp_proof) RegisterSignal(parent, COMSIG_ATOM_EMP_ACT, PROC_REF(on_emp_act)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_AltClick)) ///Called on COMSIG_ITEM_ATTACK_SELF @@ -59,7 +59,7 @@ GLOBAL_LIST_EMPTY(GPS_list) if(user) INVOKE_ASYNC(src, PROC_REF(ui_interact), user) -///Called on COMSIG_PARENT_EXAMINE +///Called on COMSIG_ATOM_EXAMINE /datum/component/gps/item/proc/on_examine(datum/source, mob/user, list/examine_list) SIGNAL_HANDLER diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm index 8bef1f63e75..e18b12c7e0d 100644 --- a/code/datums/components/grillable.dm +++ b/code/datums/components/grillable.dm @@ -28,11 +28,11 @@ RegisterSignal(parent, COMSIG_ITEM_GRILL_TURNED_ON, PROC_REF(on_grill_turned_on)) RegisterSignal(parent, COMSIG_ITEM_GRILL_TURNED_OFF, PROC_REF(on_grill_turned_off)) RegisterSignal(parent, COMSIG_ITEM_GRILL_PROCESS, PROC_REF(on_grill)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/grillable/UnregisterFromParent() UnregisterSignal(parent, list( - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, COMSIG_ITEM_GRILL_TURNED_ON, COMSIG_ITEM_GRILL_TURNED_OFF, COMSIG_ITEM_GRILL_PROCESS, diff --git a/code/datums/components/heirloom.dm b/code/datums/components/heirloom.dm index 0c71dd6fa86..064c33ff7d7 100644 --- a/code/datums/components/heirloom.dm +++ b/code/datums/components/heirloom.dm @@ -12,14 +12,14 @@ owner = new_owner family_name = new_family_name - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/heirloom/Destroy(force, silent) owner = null return ..() /** - * Signal proc for [COMSIG_PARENT_EXAMINE]. + * Signal proc for [COMSIG_ATOM_EXAMINE]. * * Shows who owns the heirloom on examine. */ diff --git a/code/datums/components/holderloving.dm b/code/datums/components/holderloving.dm index e8f797511c2..0d2a5c4b3d9 100644 --- a/code/datums/components/holderloving.dm +++ b/code/datums/components/holderloving.dm @@ -31,7 +31,7 @@ /datum/component/holderloving/RegisterWithParent() RegisterSignal(holder, COMSIG_MOVABLE_MOVED, PROC_REF(check_my_loc)) - RegisterSignal(holder, COMSIG_PARENT_QDELETING, PROC_REF(holder_deleting)) + RegisterSignal(holder, COMSIG_QDELETING, PROC_REF(holder_deleting)) RegisterSignals(parent, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED, @@ -40,7 +40,7 @@ ), PROC_REF(check_my_loc)) /datum/component/holderloving/UnregisterFromParent() - UnregisterSignal(holder, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(holder, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) UnregisterSignal(parent, list( COMSIG_ITEM_DROPPED, COMSIG_ITEM_EQUIPPED, diff --git a/code/datums/components/interaction_booby_trap.dm b/code/datums/components/interaction_booby_trap.dm index 03892f3e93b..c099eec9174 100644 --- a/code/datums/components/interaction_booby_trap.dm +++ b/code/datums/components/interaction_booby_trap.dm @@ -50,14 +50,14 @@ active_sound_loop.start() RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_touched)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine)) if (defuse_tool) RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(defuse_tool), PROC_REF(on_defused)) if (length(additional_triggers)) RegisterSignals(parent, additional_triggers, PROC_REF(trigger_explosive)) /datum/component/interaction_booby_trap/Destroy(force, silent) - UnregisterSignal(parent, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_TOOL_ACT(defuse_tool), COMSIG_PARENT_EXAMINE_MORE) + additional_triggers) + UnregisterSignal(parent, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_TOOL_ACT(defuse_tool), COMSIG_ATOM_EXAMINE_MORE) + additional_triggers) QDEL_NULL(active_sound_loop) QDEL_NULL(on_triggered_callback) QDEL_NULL(on_defused_callback) diff --git a/code/datums/components/keep_me_secure.dm b/code/datums/components/keep_me_secure.dm index 822031580f0..903d3bf1d5d 100644 --- a/code/datums/components/keep_me_secure.dm +++ b/code/datums/components/keep_me_secure.dm @@ -26,13 +26,13 @@ last_move = world.time if (secured_callback || unsecured_callback) START_PROCESSING(SSobj, src) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(on_examine_more)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(on_examine_more)) /datum/component/keep_me_secure/UnregisterFromParent() STOP_PROCESSING(SSobj, src) - UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) + UnregisterSignal(parent, COMSIG_ATOM_EXAMINE) /// Returns whether the game is supposed to consider the parent "secure". /datum/component/keep_me_secure/proc/is_secured() diff --git a/code/datums/components/label.dm b/code/datums/components/label.dm index 822841af22d..4d95be84b19 100644 --- a/code/datums/components/label.dm +++ b/code/datums/components/label.dm @@ -22,11 +22,11 @@ apply_label() /datum/component/label/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackby)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(Examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(OnAttackby)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(Examine)) /datum/component/label/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(parent, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_EXAMINE)) /** This proc will fire after the parent is hit by a hand labeler which is trying to apply another label. diff --git a/code/datums/components/light_eater.dm b/code/datums/components/light_eater.dm index c3712939dad..0501af5e0cb 100644 --- a/code/datums/components/light_eater.dm +++ b/code/datums/components/light_eater.dm @@ -20,13 +20,13 @@ var/list/cached_eaten_lights = eaten_lights for(var/morsel in _eaten) LAZYSET(cached_eaten_lights, morsel, TRUE) - RegisterSignal(morsel, COMSIG_PARENT_QDELETING, PROC_REF(deref_eaten_light)) + RegisterSignal(morsel, COMSIG_QDELETING, PROC_REF(deref_eaten_light)) /datum/component/light_eater/Destroy(force, silent) for(var/light in eaten_lights) var/atom/eaten_light = light eaten_light.RemoveElement(/datum/element/light_eaten) - UnregisterSignal(eaten_light, COMSIG_PARENT_QDELETING) + UnregisterSignal(eaten_light, COMSIG_QDELETING) eaten_lights = null return ..() @@ -48,19 +48,19 @@ LAZYINITLIST(eaten_lights) var/list/cached_eaten_lights = eaten_lights for(var/morsel in _eaten) - RegisterSignal(morsel, COMSIG_PARENT_QDELETING, PROC_REF(deref_eaten_light)) + RegisterSignal(morsel, COMSIG_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_REF(deref_eaten_light)) + RegisterSignal(morsel, COMSIG_QDELETING, PROC_REF(deref_eaten_light)) return NONE /// Handles dereferencing deleted lights. /datum/component/light_eater/proc/deref_eaten_light(atom/eaten_light, force) SIGNAL_HANDLER - UnregisterSignal(eaten_light, COMSIG_PARENT_QDELETING) + UnregisterSignal(eaten_light, COMSIG_QDELETING) LAZYREMOVE(eaten_lights, eaten_light) return NONE diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 0895383d496..404b2e99709 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -86,9 +86,9 @@ . = ..() if(!(mat_container_flags & MATCONTAINER_NO_INSERT)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) if(mat_container_flags & MATCONTAINER_EXAMINE) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/material_container/vv_edit_var(var_name, var_value) @@ -96,14 +96,14 @@ . = ..() 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_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) else if(old_flags & MATCONTAINER_EXAMINE && !(mat_container_flags & MATCONTAINER_EXAMINE)) - UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) + UnregisterSignal(parent, COMSIG_ATOM_EXAMINE) if(old_flags & MATCONTAINER_NO_INSERT && !(mat_container_flags & MATCONTAINER_NO_INSERT)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) else if(!(old_flags & MATCONTAINER_NO_INSERT) && mat_container_flags & MATCONTAINER_NO_INSERT) - UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(parent, COMSIG_ATOM_ATTACKBY) /datum/component/material_container/proc/on_examine(datum/source, mob/user, list/examine_texts) diff --git a/code/datums/components/mind_linker.dm b/code/datums/components/mind_linker.dm index 2b8d3899173..0e82447e017 100644 --- a/code/datums/components/mind_linker.dm +++ b/code/datums/components/mind_linker.dm @@ -94,7 +94,7 @@ new_link.Grant(to_link) linked_mobs[to_link] = new_link - RegisterSignals(to_link, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING), PROC_REF(sig_unlink_mob)) + RegisterSignals(to_link, list(COMSIG_LIVING_DEATH, COMSIG_QDELETING), PROC_REF(sig_unlink_mob)) return TRUE @@ -115,7 +115,7 @@ post_unlink_callback?.Invoke(to_unlink) - UnregisterSignal(to_unlink, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING)) + UnregisterSignal(to_unlink, list(COMSIG_LIVING_DEATH, COMSIG_QDELETING)) var/datum/action/innate/linked_speech/old_link = linked_mobs[to_unlink] linked_mobs -= to_unlink diff --git a/code/datums/components/mob_harvest.dm b/code/datums/components/mob_harvest.dm index a177b64c836..8342ee411fe 100644 --- a/code/datums/components/mob_harvest.dm +++ b/code/datums/components/mob_harvest.dm @@ -79,8 +79,8 @@ living_parent.update_appearance(UPDATE_ICON_STATE) /datum/component/mob_harvest/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) // Only do update_icon_state business on non-carbon mobs if(!iscarbon(parent)) @@ -90,7 +90,7 @@ living_parent.update_appearance(UPDATE_ICON_STATE) /datum/component/mob_harvest/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_PARENT_EXAMINE, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_UPDATE_ICON_STATE)) + UnregisterSignal(parent, list(COMSIG_ATOM_EXAMINE, COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_UPDATE_ICON_STATE)) ///signal called on parent being examined /datum/component/mob_harvest/proc/on_examine(datum/source, mob/user, list/examine_list) diff --git a/code/datums/components/multiple_lives.dm b/code/datums/components/multiple_lives.dm index 3cac7e827d3..c5f90ba9698 100644 --- a/code/datums/components/multiple_lives.dm +++ b/code/datums/components/multiple_lives.dm @@ -16,11 +16,11 @@ /datum/component/multiple_lives/RegisterWithParent() RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(respawn)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_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)) + UnregisterSignal(parent, list(COMSIG_LIVING_DEATH, COMSIG_ATOM_EXAMINE, COMSIG_LIVING_WRITE_MEMORY)) /// Stops a dying station pet from overriding persistence data before we respawn it and thus causing issues. /datum/component/multiple_lives/proc/on_write_memory(mob/living/source, dead, gibbed) diff --git a/code/datums/components/nuclear_bomb_operator.dm b/code/datums/components/nuclear_bomb_operator.dm index 835783d6851..2224f95803b 100644 --- a/code/datums/components/nuclear_bomb_operator.dm +++ b/code/datums/components/nuclear_bomb_operator.dm @@ -29,8 +29,8 @@ /datum/component/nuclear_bomb_operator/RegisterWithParent() . = ..() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) - RegisterSignals(parent, list(COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING), PROC_REF(on_death)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + RegisterSignals(parent, list(COMSIG_LIVING_DEATH, COMSIG_QDELETING), PROC_REF(on_death)) RegisterSignal(parent, COMSIG_LIVING_UNARMED_ATTACK, PROC_REF(owner_attacked_atom)) // This only works for players, but I am not sure this should have AI anyway RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(atom_exited_owner)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) @@ -39,9 +39,9 @@ /datum/component/nuclear_bomb_operator/UnregisterFromParent() . = ..() UnregisterSignal(parent, list( - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, COMSIG_LIVING_DEATH, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_EXITED, COMSIG_ATOM_UPDATE_OVERLAYS, diff --git a/code/datums/components/omen.dm b/code/datums/components/omen.dm index 84fd4922001..a4846f73bd9 100644 --- a/code/datums/components/omen.dm +++ b/code/datums/components/omen.dm @@ -23,7 +23,7 @@ if(istype(vessel)) src.vessel = vessel - RegisterSignal(vessel, COMSIG_PARENT_QDELETING, PROC_REF(vessel_qdeleting)) + RegisterSignal(vessel, COMSIG_QDELETING, PROC_REF(vessel_qdeleting)) if(!isnull(permanent)) src.permanent = permanent if(!isnull(luck_mod)) @@ -37,7 +37,7 @@ if(vessel) vessel.visible_message(span_warning("[vessel] burns up in a sinister flash, taking an evil energy with it...")) - UnregisterSignal(vessel, COMSIG_PARENT_QDELETING) + UnregisterSignal(vessel, COMSIG_QDELETING) vessel.burn() vessel = null @@ -162,7 +162,7 @@ /datum/component/omen/proc/vessel_qdeleting(atom/source) SIGNAL_HANDLER - UnregisterSignal(vessel, COMSIG_PARENT_QDELETING) + UnregisterSignal(vessel, COMSIG_QDELETING) vessel = null /** diff --git a/code/datums/components/onwear_mood.dm b/code/datums/components/onwear_mood.dm index 8361a7653de..2d092d0a75e 100644 --- a/code/datums/components/onwear_mood.dm +++ b/code/datums/components/onwear_mood.dm @@ -21,10 +21,10 @@ /datum/component/onwear_mood/RegisterWithParent() RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, PROC_REF(affect_wearer)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/onwear_mood/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ATOM_EXAMINE)) clear_effects() /datum/component/onwear_mood/proc/affect_wearer(datum/source, mob/living/target, slot) @@ -33,7 +33,7 @@ return // only affects "worn" slots by default target.add_mood_event(REF(src), saved_event_type) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(target, COMSIG_MOB_UNEQUIPPED_ITEM, PROC_REF(clear_effects)) /datum/component/onwear_mood/proc/on_examine(datum/source, mob/user, list/examine_text) @@ -50,5 +50,5 @@ source ||= clothing.loc if(!istype(source)) return - UnregisterSignal(source, list(COMSIG_PARENT_EXAMINE, COMSIG_MOB_UNEQUIPPED_ITEM)) + UnregisterSignal(source, list(COMSIG_ATOM_EXAMINE, COMSIG_MOB_UNEQUIPPED_ITEM)) source.clear_mood_event(REF(src)) diff --git a/code/datums/components/overlay_lighting.dm b/code/datums/components/overlay_lighting.dm index de1048a3e16..236bb904ca2 100644 --- a/code/datums/components/overlay_lighting.dm +++ b/code/datums/components/overlay_lighting.dm @@ -220,15 +220,15 @@ parent_attached_to = new_parent_attached_to if(.) var/atom/movable/old_parent_attached_to = . - UnregisterSignal(old_parent_attached_to, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIGHT_EATER_QUEUE)) + UnregisterSignal(old_parent_attached_to, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIGHT_EATER_QUEUE)) if(old_parent_attached_to == current_holder) - RegisterSignal(old_parent_attached_to, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel)) + RegisterSignal(old_parent_attached_to, COMSIG_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_REF(on_parent_attached_to_qdel)) + UnregisterSignal(current_holder, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIGHT_EATER_QUEUE)) + RegisterSignal(parent_attached_to, COMSIG_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() @@ -240,7 +240,7 @@ return if(current_holder) if(current_holder != parent && current_holder != parent_attached_to) - UnregisterSignal(current_holder, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIGHT_EATER_QUEUE)) + UnregisterSignal(current_holder, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED, COMSIG_LIGHT_EATER_QUEUE)) if(directional) UnregisterSignal(current_holder, COMSIG_ATOM_DIR_CHANGE) if(overlay_lighting_flags & LIGHTING_ON) @@ -250,7 +250,7 @@ clean_old_turfs() return if(new_holder != parent && new_holder != parent_attached_to) - RegisterSignal(new_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdel)) + RegisterSignal(new_holder, COMSIG_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_REF(on_holder_moved)) @@ -284,7 +284,7 @@ SIGNAL_HANDLER if(QDELETED(current_holder)) return - UnregisterSignal(current_holder, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED)) + UnregisterSignal(current_holder, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) if(directional) UnregisterSignal(current_holder, COMSIG_ATOM_DIR_CHANGE) set_holder(null) @@ -324,7 +324,7 @@ ///Called when the current_holder is qdeleted, to remove the light effect. /datum/component/overlay_lighting/proc/on_parent_attached_to_qdel(atom/movable/source, force) SIGNAL_HANDLER - UnregisterSignal(parent_attached_to, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED)) + UnregisterSignal(parent_attached_to, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) if(directional) UnregisterSignal(parent_attached_to, COMSIG_ATOM_DIR_CHANGE) if(parent_attached_to == current_holder) @@ -369,7 +369,7 @@ if(directional) if(beam) cast_range = max(round(new_range * 0.5), 1) - else + else cast_range = clamp(round(new_range * 0.5), 1, 3) if(overlay_lighting_flags & LIGHTING_ON) make_luminosity_update() diff --git a/code/datums/components/palette.dm b/code/datums/components/palette.dm index e966ea93f0a..2ae66f50b23 100644 --- a/code/datums/components/palette.dm +++ b/code/datums/components/palette.dm @@ -35,7 +35,7 @@ src.selected_color = selected_color || "#ffffff" 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_ATOM_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)) RegisterSignal(parent, COMSIG_PAINTING_TOOL_PALETTE_COLOR_CHANGED, PROC_REF(palette_color_changed)) @@ -43,7 +43,7 @@ /datum/component/palette/Destroy() QDEL_NULL(color_picker_menu) QDEL_LIST(menu_choices) - UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF_SECONDARY, COMSIG_PARENT_EXAMINE, + UnregisterSignal(parent, list(COMSIG_ITEM_ATTACK_SELF_SECONDARY, COMSIG_ATOM_EXAMINE, COMSIG_ITEM_DROPPED, COMSIG_PAINTING_TOOL_SET_COLOR, COMSIG_PAINTING_TOOL_GET_ADDITIONAL_DATA)) return ..() diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index 620f28f1c13..a37f526389c 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -78,7 +78,7 @@ return ..() /datum/component/pellet_cloud/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(nullspace_parent)) + RegisterSignal(parent, COMSIG_PREQDELETED, PROC_REF(nullspace_parent)) if(isammocasing(parent)) RegisterSignal(parent, COMSIG_PELLET_CLOUD_INIT, PROC_REF(create_casing_pellets)) else if(isgrenade(parent)) @@ -90,7 +90,7 @@ RegisterSignal(parent, COMSIG_SUPPLYPOD_LANDED, PROC_REF(create_blast_pellets)) /datum/component/pellet_cloud/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_PARENT_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_DETONATE, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED)) + UnregisterSignal(parent, list(COMSIG_PREQDELETED, COMSIG_PELLET_CLOUD_INIT, COMSIG_GRENADE_DETONATE, COMSIG_GRENADE_ARMED, COMSIG_MOVABLE_MOVED, COMSIG_MINE_TRIGGERED, COMSIG_ITEM_DROPPED)) /** * create_casing_pellets() is for directed pellet clouds for ammo casings that have multiple pellets (buckshot and scatter lasers for instance) @@ -120,7 +120,7 @@ spread = round((i / num_pellets - 0.5) * distro) RegisterSignal(shell.loaded_projectile, COMSIG_PROJECTILE_SELF_ON_HIT, PROC_REF(pellet_hit)) - RegisterSignals(shell.loaded_projectile, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range)) + RegisterSignals(shell.loaded_projectile, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_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 @@ -215,7 +215,7 @@ if(martyr.stat != DEAD && martyr.client) LAZYADD(purple_hearts, martyr) - RegisterSignal(martyr, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE) + RegisterSignal(martyr, COMSIG_QDELETING, PROC_REF(on_target_qdel), override=TRUE) for(var/i in 1 to round(pellets_absorbed * 0.5)) pew(martyr) @@ -254,8 +254,8 @@ LAZYADDASSOC(targets_hit[target], "hits", 1) LAZYSET(targets_hit[target], "damage", damage) if(targets_hit[target]["hits"] == 1) - 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)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(on_target_qdel), override=TRUE) + UnregisterSignal(P, list(COMSIG_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT)) if(terminated == num_pellets) finalize() @@ -264,7 +264,7 @@ SIGNAL_HANDLER pellets -= P terminated++ - UnregisterSignal(P, list(COMSIG_PARENT_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT)) + UnregisterSignal(P, list(COMSIG_QDELETING, COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PROJECTILE_SELF_ON_HIT)) if(terminated == num_pellets) finalize() @@ -281,7 +281,7 @@ 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_REF(pellet_hit)) - RegisterSignals(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_PARENT_QDELETING), PROC_REF(pellet_range)) + RegisterSignals(P, list(COMSIG_PROJECTILE_RANGE_OUT, COMSIG_QDELETING), PROC_REF(pellet_range)) pellets += P P.fire() if(landmine_victim) @@ -295,7 +295,7 @@ for(var/atom/target in targets_hit) var/num_hits = targets_hit[target]["hits"] var/damage = targets_hit[target]["damage"] - UnregisterSignal(target, COMSIG_PARENT_QDELETING) + UnregisterSignal(target, COMSIG_QDELETING) var/obj/item/bodypart/hit_part if(isbodypart(target)) hit_part = target @@ -337,7 +337,7 @@ var/mob/living/martyr = M if(martyr.stat == DEAD && martyr.client) martyr.client.give_award(/datum/award/achievement/misc/lookoutsir, martyr) - UnregisterSignal(parent, COMSIG_PARENT_PREQDELETED) + UnregisterSignal(parent, COMSIG_PREQDELETED) if(queued_delete) qdel(parent) qdel(src) @@ -369,7 +369,7 @@ LAZYCLEARLIST(bodies) for(var/mob/living/L in get_turf(parent)) - RegisterSignal(L, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel), override=TRUE) + RegisterSignal(L, COMSIG_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 @@ -391,7 +391,7 @@ /datum/component/pellet_cloud/proc/on_target_qdel(atom/target) SIGNAL_HANDLER - UnregisterSignal(target, COMSIG_PARENT_QDELETING) + UnregisterSignal(target, COMSIG_QDELETING) targets_hit -= target LAZYREMOVE(bodies, target) LAZYREMOVE(purple_hearts, target) diff --git a/code/datums/components/pet_commands/obeys_commands.dm b/code/datums/components/pet_commands/obeys_commands.dm index 4ab2c9c81a8..f3201bc63db 100644 --- a/code/datums/components/pet_commands/obeys_commands.dm +++ b/code/datums/components/pet_commands/obeys_commands.dm @@ -29,11 +29,11 @@ /datum/component/obeys_commands/RegisterWithParent() RegisterSignal(parent, COMSIG_LIVING_BEFRIENDED, PROC_REF(add_friend)) RegisterSignal(parent, COMSIG_LIVING_UNFRIENDED, PROC_REF(remove_friend)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(display_menu)) /datum/component/obeys_commands/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_LIVING_BEFRIENDED, COMSIG_LIVING_UNFRIENDED, COMSIG_PARENT_EXAMINE, COMSIG_CLICK_ALT)) + UnregisterSignal(parent, list(COMSIG_LIVING_BEFRIENDED, COMSIG_LIVING_UNFRIENDED, COMSIG_ATOM_EXAMINE, COMSIG_CLICK_ALT)) /// Add someone to our friends list /datum/component/obeys_commands/proc/add_friend(datum/source, mob/living/new_friend) diff --git a/code/datums/components/phylactery.dm b/code/datums/components/phylactery.dm index 637f9c6e3f6..4a58660992a 100644 --- a/code/datums/components/phylactery.dm +++ b/code/datums/components/phylactery.dm @@ -43,7 +43,7 @@ src.stun_per_resurrection = stun_per_resurrection src.phylactery_color = phylactery_color - RegisterSignal(lich_mind, COMSIG_PARENT_QDELETING, PROC_REF(on_lich_mind_lost)) + RegisterSignal(lich_mind, COMSIG_QDELETING, PROC_REF(on_lich_mind_lost)) RegisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH, PROC_REF(check_if_lich_died)) var/obj/obj_parent = parent @@ -51,7 +51,7 @@ 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_REF(on_examine)) + RegisterSignal(obj_parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) SSpoints_of_interest.make_point_of_interest(obj_parent) @@ -62,7 +62,7 @@ // Stationloving items should really never be made a phylactery so I feel safe in doing this qdel(obj_parent.GetComponent(/datum/component/stationloving)) - UnregisterSignal(obj_parent, COMSIG_PARENT_EXAMINE) + UnregisterSignal(obj_parent, COMSIG_ATOM_EXAMINE) UnregisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH) // Sweep up any revive signals left on the mind's current UnregisterSignal(lich_mind.current, COMSIG_LIVING_REVIVE) @@ -71,7 +71,7 @@ return ..() /** - * Signal proc for [COMSIG_PARENT_EXAMINE]. + * Signal proc for [COMSIG_ATOM_EXAMINE]. * * Gives some flavor for the phylactery on examine. */ @@ -93,7 +93,7 @@ examine_list += span_green("A terrible aura surrounds this item. Its very existence is offensive to life itself...") /** - * Signal proc for [COMSIG_PARENT_QDELETING] registered on the lich's mind. + * Signal proc for [COMSIG_QDELETING] registered on the lich's mind. * * Minds shouldn't be getting deleted but if for some ungodly reason * the lich'd mind is deleted our component should go with it, as diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm index 5c53310237c..1236a690c96 100644 --- a/code/datums/components/plumbing/_plumbing.dm +++ b/code/datums/components/plumbing/_plumbing.dm @@ -53,7 +53,7 @@ RegisterSignal(parent, COMSIG_COMPONENT_ADDED, PROC_REF(enable)) /datum/component/plumbing/RegisterWithParent() - RegisterSignals(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING), PROC_REF(disable)) + RegisterSignals(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING), PROC_REF(disable)) RegisterSignals(parent, list(COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH), PROC_REF(toggle_active)) RegisterSignal(parent, COMSIG_OBJ_HIDE, PROC_REF(hide)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(create_overlays)) //called by lateinit on startup @@ -61,7 +61,7 @@ RegisterSignal(parent, 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, \ + UnregisterSignal(parent, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH, COMSIG_OBJ_HIDE, \ COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_ATOM_DIR_CHANGE, COMSIG_MOVABLE_CHANGE_DUCT_LAYER, COMSIG_COMPONENT_ADDED)) REMOVE_TRAIT(parent, TRAIT_UNDERFLOOR, REF(src)) @@ -343,9 +343,9 @@ /datum/component/plumbing/proc/set_recipient_reagents_holder(datum/reagents/receiver) if(recipient_reagents_holder) - UnregisterSignal(recipient_reagents_holder, COMSIG_PARENT_QDELETING) //stop tracking whoever we were tracking + UnregisterSignal(recipient_reagents_holder, COMSIG_QDELETING) //stop tracking whoever we were tracking if(receiver) - RegisterSignal(receiver, COMSIG_PARENT_QDELETING, PROC_REF(handle_reagent_del)) //on deletion call a wrapper proc that clears us, and maybe reagents too + RegisterSignal(receiver, COMSIG_QDELETING, PROC_REF(handle_reagent_del)) //on deletion call a wrapper proc that clears us, and maybe reagents too recipient_reagents_holder = receiver diff --git a/code/datums/components/radioactive_emitter.dm b/code/datums/components/radioactive_emitter.dm index 0cb51daf804..6a95f36079c 100644 --- a/code/datums/components/radioactive_emitter.dm +++ b/code/datums/components/radioactive_emitter.dm @@ -46,10 +46,10 @@ return ..() /datum/component/radioactive_emitter/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/radioactive_emitter/UnregisterFromParent() - UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) + UnregisterSignal(parent, COMSIG_ATOM_EXAMINE) /datum/component/radioactive_emitter/InheritComponent( datum/component/new_comp, diff --git a/code/datums/components/religious_tool.dm b/code/datums/components/religious_tool.dm index f28578c5ce9..2571f0c13d4 100644 --- a/code/datums/components/religious_tool.dm +++ b/code/datums/components/religious_tool.dm @@ -29,11 +29,11 @@ catalyst_type = override_catalyst_type /datum/component/religious_tool/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(AttemptActions)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(AttemptActions)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/religious_tool/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_PARENT_ATTACKBY, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(parent, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_EXAMINE)) /** * Sets the easy access variable to the global if it exists. diff --git a/code/datums/components/remote_materials.dm b/code/datums/components/remote_materials.dm index 5ff76e8945e..a3c61221c6f 100644 --- a/code/datums/components/remote_materials.dm +++ b/code/datums/components/remote_materials.dm @@ -26,7 +26,7 @@ handles linking back and forth. src.allow_standalone = allow_standalone src.mat_container_flags = mat_container_flags - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(OnAttackBy)) RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(OnMultitool)) var/turf/T = get_turf(parent) diff --git a/code/datums/components/rot.dm b/code/datums/components/rot.dm index beea0d209b2..11c4f2cb617 100644 --- a/code/datums/components/rot.dm +++ b/code/datums/components/rot.dm @@ -37,7 +37,7 @@ strength = severity RegisterSignals(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)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(rot_hit_react)) if(ismovable(parent)) AddComponent(/datum/component/connect_loc_behalf, parent, loc_connections) RegisterSignal(parent, COMSIG_MOVABLE_BUMP, PROC_REF(rot_react)) diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm index 65ffaa85dbb..dc009ffbf89 100644 --- a/code/datums/components/rotation.dm +++ b/code/datums/components/rotation.dm @@ -24,11 +24,11 @@ /datum/component/simple_rotation/proc/AddSignals() 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_EXAMINE, PROC_REF(ExamineMessage)) RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) /datum/component/simple_rotation/proc/RemoveSignals() - UnregisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_CLICK_ALT_SECONDARY, COMSIG_PARENT_EXAMINE, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM)) + UnregisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_CLICK_ALT_SECONDARY, COMSIG_ATOM_EXAMINE, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM)) /datum/component/simple_rotation/RegisterWithParent() AddSignals() diff --git a/code/datums/components/scope.dm b/code/datums/components/scope.dm index 4cc7145bc94..09bb40e5023 100644 --- a/code/datums/components/scope.dm +++ b/code/datums/components/scope.dm @@ -18,14 +18,14 @@ 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)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/scope/UnregisterFromParent() UnregisterSignal(parent, list( COMSIG_MOVABLE_MOVED, COMSIG_ITEM_AFTERATTACK_SECONDARY, COMSIG_GUN_TRY_FIRE, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, )) /datum/component/scope/process(seconds_per_tick) diff --git a/code/datums/components/seclight_attachable.dm b/code/datums/components/seclight_attachable.dm index 24681be3726..56761cfd1bf 100644 --- a/code/datums/components/seclight_attachable.dm +++ b/code/datums/components/seclight_attachable.dm @@ -95,9 +95,9 @@ 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)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(on_parent_deleted)) /datum/component/seclite_attachable/UnregisterFromParent() UnregisterSignal(parent, list( @@ -107,9 +107,9 @@ COMSIG_ATOM_UPDATE_ICON_STATE, COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_ITEM_UI_ACTION_CLICK, - COMSIG_PARENT_ATTACKBY, - COMSIG_PARENT_EXAMINE, - COMSIG_PARENT_QDELETING, + COMSIG_ATOM_ATTACKBY, + COMSIG_ATOM_EXAMINE, + COMSIG_QDELETING, )) /// Sets a new light as our current light for our parent. @@ -191,7 +191,7 @@ // We were deconstructed in any other way, so we can just drop the light on the ground (which removes it via signal). light.forceMove(source.drop_location()) -/// Signal proc for [COMSIG_PARENT_QDELETING] that deletes our light if our parent is deleted. +/// Signal proc for [COMSIG_QDELETING] that deletes our light if our parent is deleted. /datum/component/seclite_attachable/proc/on_parent_deleted(obj/item/source) SIGNAL_HANDLER @@ -211,7 +211,7 @@ return COMPONENT_ACTION_HANDLED -/// Signal proc for [COMSIG_PARENT_ATTACKBY] that allows a user to attach a seclite by hitting our parent with it. +/// Signal proc for [COMSIG_ATOM_ATTACKBY] that allows a user to attach a seclite by hitting our parent with it. /datum/component/seclite_attachable/proc/on_attackby(obj/item/source, obj/item/attacking_item, mob/attacker, params) SIGNAL_HANDLER @@ -251,7 +251,7 @@ if(source.Adjacent(user) && !issilicon(user)) user.put_in_hands(to_remove) -/// Signal proc for [COMSIG_PARENT_EXAMINE] that shows our item can have / does have a seclite attached. +/// Signal proc for [COMSIG_ATOM_EXAMINE] that shows our item can have / does have a seclite attached. /datum/component/seclite_attachable/proc/on_examine(obj/item/source, mob/examiner, list/examine_list) SIGNAL_HANDLER diff --git a/code/datums/components/shell.dm b/code/datums/components/shell.dm index f5689af556e..88747bd2f60 100644 --- a/code/datums/components/shell.dm +++ b/code/datums/components/shell.dm @@ -40,11 +40,11 @@ attach_circuit(starting_circuit) /datum/component/shell/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_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_REF(on_multitool_act)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attack_by)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attack_by)) if(!(shell_flags & SHELL_FLAG_CIRCUIT_UNREMOVABLE)) RegisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), PROC_REF(on_screwdriver_act)) RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_object_deconstruct)) @@ -88,12 +88,12 @@ /datum/component/shell/UnregisterFromParent() UnregisterSignal(parent, list( - COMSIG_PARENT_ATTACKBY, + COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_TOOL_ACT(TOOL_SCREWDRIVER), COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), COMSIG_OBJ_DECONSTRUCT, COMSIG_MOVABLE_SET_ANCHORED, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, COMSIG_ATOM_ATTACK_GHOST, COMSIG_ATOM_USB_CABLE_TRY_ATTACH, COMSIG_MOVABLE_CIRCUIT_LOADED, @@ -309,7 +309,7 @@ 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_REF(override_power_usage)) - RegisterSignal(circuitboard, COMSIG_PARENT_QDELETING, PROC_REF(on_circuit_delete)) + RegisterSignal(circuitboard, COMSIG_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) @@ -335,7 +335,7 @@ attached_circuit.remove_current_shell() UnregisterSignal(attached_circuit, list( COMSIG_MOVABLE_MOVED, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, COMSIG_CIRCUIT_ADD_COMPONENT_MANUALLY, COMSIG_CIRCUIT_PRE_POWER_USAGE, )) diff --git a/code/datums/components/shielded.dm b/code/datums/components/shielded.dm index d0f5dd49cc4..eeca72b5815 100644 --- a/code/datums/components/shielded.dm +++ b/code/datums/components/shielded.dm @@ -69,7 +69,7 @@ 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)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(check_recharge_rune)) var/atom/shield = parent if(ismob(shield.loc)) var/mob/holder = shield.loc @@ -78,7 +78,7 @@ set_wearer(holder) /datum/component/shielded/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_ITEM_HIT_REACT, COMSIG_PARENT_ATTACKBY)) + UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_ITEM_HIT_REACT, COMSIG_ATOM_ATTACKBY)) var/atom/shield = parent if(shield.loc == wearer) lost_wearer(src, wearer) @@ -120,14 +120,14 @@ SIGNAL_HANDLER if(wearer) - UnregisterSignal(wearer, list(COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_PARENT_QDELETING)) + UnregisterSignal(wearer, list(COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_QDELETING)) wearer.update_appearance(UPDATE_ICON) wearer = null /datum/component/shielded/proc/set_wearer(mob/user) wearer = user RegisterSignal(wearer, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) - RegisterSignal(wearer, COMSIG_PARENT_QDELETING, PROC_REF(lost_wearer)) + RegisterSignal(wearer, COMSIG_QDELETING, PROC_REF(lost_wearer)) if(current_charges) wearer.update_appearance(UPDATE_ICON) diff --git a/code/datums/components/simple_access.dm b/code/datums/components/simple_access.dm index b157b4a1874..a42d784f0c0 100644 --- a/code/datums/components/simple_access.dm +++ b/code/datums/components/simple_access.dm @@ -16,7 +16,7 @@ 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_REF(on_donor_removed)) - RegisterSignal(donor_atom, COMSIG_PARENT_QDELETING, PROC_REF(on_donor_removed)) + RegisterSignal(donor_atom, COMSIG_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 9637a2a746c..463c3ef7a0c 100644 --- a/code/datums/components/singularity.dm +++ b/code/datums/components/singularity.dm @@ -92,7 +92,7 @@ COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW, ), PROC_REF(consume_attack)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(consume_attackby)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(consume_attackby)) RegisterSignal(parent, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(moved)) RegisterSignal(parent, COMSIG_ATOM_BUMPED, PROC_REF(consume)) @@ -130,7 +130,7 @@ COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_BUMPED, COMSIG_MOVABLE_PRE_MOVE, - COMSIG_PARENT_ATTACKBY, + COMSIG_ATOM_ATTACKBY, )) /datum/component/singularity/process(seconds_per_tick) diff --git a/code/datums/components/slippery.dm b/code/datums/components/slippery.dm index 20840ba1704..9956a54df04 100644 --- a/code/datums/components/slippery.dm +++ b/code/datums/components/slippery.dm @@ -122,7 +122,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_REF(holder_deleted)) + RegisterSignal(holder, COMSIG_QDELETING, PROC_REF(holder_deleted)) /* * Detects if the holder mob is deleted. @@ -147,7 +147,7 @@ /datum/component/slippery/proc/on_drop(datum/source, mob/user) SIGNAL_HANDLER - UnregisterSignal(user, COMSIG_PARENT_QDELETING) + UnregisterSignal(user, COMSIG_QDELETING) qdel(GetComponent(/datum/component/connect_loc_behalf)) add_connect_loc_behalf_to_parent() diff --git a/code/datums/components/soul_stealer.dm b/code/datums/components/soul_stealer.dm index 88ce917e7e1..5b3c39a59da 100644 --- a/code/datums/components/soul_stealer.dm +++ b/code/datums/components/soul_stealer.dm @@ -17,11 +17,11 @@ return ..() /datum/component/soul_stealer/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_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)) + UnregisterSignal(parent, list(COMSIG_ATOM_EXAMINE, COMSIG_ITEM_AFTERATTACK)) ///signal called on parent being examined /datum/component/soul_stealer/proc/on_examine(datum/source, mob/user, list/examine_list) diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index 81eb38acc6a..48630cdc7ab 100644 --- a/code/datums/components/spawner.dm +++ b/code/datums/components/spawner.dm @@ -23,7 +23,7 @@ src.spawn_text = spawn_text src.max_spawned = max_spawned - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(stop_spawning)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(stop_spawning)) START_PROCESSING((spawn_time < 2 SECONDS ? SSfastprocess : SSprocessing), src) /datum/component/spawner/process() @@ -58,7 +58,7 @@ if (spawn_text) spawner.visible_message(span_danger("[created] [spawn_text] [spawner].")) - RegisterSignal(created, COMSIG_PARENT_QDELETING, PROC_REF(on_deleted)) + RegisterSignal(created, COMSIG_QDELETING, PROC_REF(on_deleted)) /// Remove weakrefs to atoms which have been killed or deleted without us picking it up somehow /datum/component/spawner/proc/validate_references() @@ -84,4 +84,4 @@ if (source.stat != DEAD) return spawned_things -= WEAKREF(source) - UnregisterSignal(source, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_STATCHANGE)) + UnregisterSignal(source, list(COMSIG_QDELETING, COMSIG_MOB_STATCHANGE)) diff --git a/code/datums/components/spin2win.dm b/code/datums/components/spin2win.dm index e277eb54546..c1c935509f9 100644 --- a/code/datums/components/spin2win.dm +++ b/code/datums/components/spin2win.dm @@ -42,11 +42,11 @@ return ..() /datum/component/spin2win/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_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)) + UnregisterSignal(parent, list(COMSIG_ATOM_EXAMINE, COMSIG_ITEM_ATTACK_SECONDARY)) ///signal called on parent being examined /datum/component/spin2win/proc/on_examine(datum/source, mob/user, list/examine_list) diff --git a/code/datums/components/spirit_holding.dm b/code/datums/components/spirit_holding.dm index dc11d5fd729..b5e99ad4822 100644 --- a/code/datums/components/spirit_holding.dm +++ b/code/datums/components/spirit_holding.dm @@ -19,12 +19,12 @@ QDEL_NULL(bound_spirit) /datum/component/spirit_holding/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_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)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(on_destroy)) /datum/component/spirit_holding/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_PARENT_EXAMINE, COMSIG_ITEM_ATTACK_SELF, COMSIG_PARENT_QDELETING)) + UnregisterSignal(parent, list(COMSIG_ATOM_EXAMINE, COMSIG_ITEM_ATTACK_SELF, COMSIG_QDELETING)) ///signal fired on examining the parent /datum/component/spirit_holding/proc/on_examine(datum/source, mob/user, list/examine_list) diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index 55f3fea216a..56740b199dd 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -30,7 +30,7 @@ /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 - RegisterSignals(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_PARENT_ATTACKBY), PROC_REF(play_squeak)) + RegisterSignals(parent, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_BLOB_ACT, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACKBY), PROC_REF(play_squeak)) if(ismovable(parent)) RegisterSignals(parent, list(COMSIG_MOVABLE_BUMP, COMSIG_MOVABLE_IMPACT, COMSIG_PROJECTILE_BEFORE_FIRE), PROC_REF(play_squeak)) @@ -117,7 +117,7 @@ SIGNAL_HANDLER holder = equipper RegisterSignal(holder, COMSIG_MOVABLE_DISPOSING, PROC_REF(disposing_react), override=TRUE) - RegisterSignal(holder, COMSIG_PARENT_QDELETING, PROC_REF(holder_deleted), override=TRUE) + RegisterSignal(holder, COMSIG_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 @@ -125,7 +125,7 @@ /datum/component/squeak/proc/on_drop(datum/source, mob/user) SIGNAL_HANDLER UnregisterSignal(user, COMSIG_MOVABLE_DISPOSING) - UnregisterSignal(user, COMSIG_PARENT_QDELETING) + UnregisterSignal(user, COMSIG_QDELETING) holder = null ///just gets rid of the reference to holder in the case that theyre qdeleted diff --git a/code/datums/components/stationloving.dm b/code/datums/components/stationloving.dm index 7a51b02a5af..72481bed279 100644 --- a/code/datums/components/stationloving.dm +++ b/code/datums/components/stationloving.dm @@ -18,7 +18,7 @@ relocate() /datum/component/stationloving/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(on_parent_pre_qdeleted)) + RegisterSignal(parent, COMSIG_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 @@ -33,7 +33,7 @@ /datum/component/stationloving/UnregisterFromParent() UnregisterSignal(parent, list( COMSIG_MOVABLE_Z_CHANGED, - COMSIG_PARENT_PREQDELETED, + COMSIG_PREQDELETED, COMSIG_ITEM_IMBUE_SOUL, COMSIG_ITEM_MARK_RETRIEVAL, COMSIG_MOVABLE_MOVED, diff --git a/code/datums/components/style/style_meter.dm b/code/datums/components/style/style_meter.dm index 2b0d4871cca..8c5b5ea87df 100644 --- a/code/datums/components/style/style_meter.dm +++ b/code/datums/components/style/style_meter.dm @@ -37,7 +37,7 @@ attacked_atom.add_overlay(meter_appearance) RegisterSignal(attacked_atom, COMSIG_ITEM_EQUIPPED, PROC_REF(check_wearing)) RegisterSignal(attacked_atom, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) - RegisterSignal(attacked_atom, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(attacked_atom, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(attacked_atom, COMSIG_CLICK_ALT, PROC_REF(on_altclick)) RegisterSignal(attacked_atom, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL), PROC_REF(on_multitool)) balloon_alert(user, "style meter attached") @@ -113,7 +113,7 @@ old_location.cut_overlay(meter_appearance) UnregisterSignal(old_location, COMSIG_ITEM_EQUIPPED) UnregisterSignal(old_location, COMSIG_ITEM_DROPPED) - UnregisterSignal(old_location, COMSIG_PARENT_EXAMINE) + UnregisterSignal(old_location, COMSIG_ATOM_EXAMINE) UnregisterSignal(old_location, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL)) if(!style_meter) return diff --git a/code/datums/components/supermatter_crystal.dm b/code/datums/components/supermatter_crystal.dm index 9e8c166e754..89954ecb7c4 100644 --- a/code/datums/components/supermatter_crystal.dm +++ b/code/datums/components/supermatter_crystal.dm @@ -13,7 +13,7 @@ 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_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)) @@ -29,7 +29,7 @@ COMSIG_ATOM_HULK_ATTACK, COMSIG_LIVING_UNARMED_ATTACK, COMSIG_ATOM_ATTACK_HAND, - COMSIG_PARENT_ATTACKBY, + COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_TOOL_ACT(TOOL_WRENCH), COMSIG_ATOM_BUMPED, COMSIG_ATOM_INTERCEPT_Z_FALL, diff --git a/code/datums/components/swabbing.dm b/code/datums/components/swabbing.dm index 29dd07b44ff..0fb13e6055d 100644 --- a/code/datums/components/swabbing.dm +++ b/code/datums/components/swabbing.dm @@ -22,7 +22,7 @@ This component is used in vat growing to swab for microbiological samples which return COMPONENT_INCOMPATIBLE RegisterSignal(parent, COMSIG_ITEM_PRE_ATTACK, PROC_REF(try_to_swab)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(handle_overlays)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_ICON, PROC_REF(handle_icon)) diff --git a/code/datums/components/tameable.dm b/code/datums/components/tameable.dm index 7adbb759dca..fa342bbbbd4 100644 --- a/code/datums/components/tameable.dm +++ b/code/datums/components/tameable.dm @@ -28,7 +28,7 @@ src.after_tame = after_tame src.unique = unique - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(try_tame)) + RegisterSignal(parent, COMSIG_ATOM_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 diff --git a/code/datums/components/tattoo.dm b/code/datums/components/tattoo.dm index 107af88cfbc..7289c301520 100644 --- a/code/datums/components/tattoo.dm +++ b/code/datums/components/tattoo.dm @@ -35,20 +35,20 @@ return ..() /datum/component/tattoo/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/tattoo/UnregisterFromParent() - UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) + UnregisterSignal(parent, COMSIG_ATOM_EXAMINE) /datum/component/tattoo/proc/on_examine(datum/source, mob/user, list/examine_list) SIGNAL_HANDLER 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_REF(on_bodypart_owner_examine)) + RegisterSignal(new_owner, COMSIG_ATOM_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) + UnregisterSignal(old_owner, COMSIG_ATOM_EXAMINE) /datum/component/tattoo/proc/on_bodypart_owner_examine(mob/living/carbon/bodypart_owner, mob/user, list/examine_list) SIGNAL_HANDLER diff --git a/code/datums/components/temporary_body.dm b/code/datums/components/temporary_body.dm index bdb97dace42..3da289a6d34 100644 --- a/code/datums/components/temporary_body.dm +++ b/code/datums/components/temporary_body.dm @@ -19,10 +19,10 @@ src.old_body_ref = WEAKREF(old_body) /datum/component/temporary_body/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(on_parent_destroy)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(on_parent_destroy)) /datum/component/temporary_body/UnregisterFromParent() - UnregisterSignal(parent, COMSIG_PARENT_QDELETING) + UnregisterSignal(parent, COMSIG_QDELETING) /** * Sends the mind of the temporary body back into their previous host diff --git a/code/datums/components/thermite.dm b/code/datums/components/thermite.dm index f07601ab026..913f2221163 100644 --- a/code/datums/components/thermite.dm +++ b/code/datums/components/thermite.dm @@ -67,9 +67,9 @@ RegisterSignal(parent, COMSIG_ATOM_FIRE_ACT, PROC_REF(on_fire_act)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_update_overlays)) RegisterSignal(parent, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(attackby_react)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(parent_qdeleting)) //probably necessary because turfs are wack + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(attackby_react)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(parent_qdeleting)) //probably necessary because turfs are wack var/turf/turf_parent = parent turf_parent.update_appearance() @@ -78,9 +78,9 @@ COMSIG_ATOM_FIRE_ACT, COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_COMPONENT_CLEAN_ACT, - COMSIG_PARENT_ATTACKBY, - COMSIG_PARENT_EXAMINE, - COMSIG_PARENT_QDELETING, + COMSIG_ATOM_ATTACKBY, + COMSIG_ATOM_EXAMINE, + COMSIG_QDELETING, )) var/turf/turf_parent = parent turf_parent.update_appearance() @@ -119,7 +119,7 @@ burn_callback = CALLBACK(src, PROC_REF(burn_parent), user) burn_timer = addtimer(burn_callback, min(amount * 0.35 SECONDS, 20 SECONDS), TIMER_STOPPABLE) //unregister everything mechanical, we are burning up - UnregisterSignal(parent, list(COMSIG_COMPONENT_CLEAN_ACT, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_FIRE_ACT)) + UnregisterSignal(parent, list(COMSIG_COMPONENT_CLEAN_ACT, COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_FIRE_ACT)) /** * Used to actually melt parent @@ -181,7 +181,7 @@ if(thing.get_temperature() >= FIRE_MINIMUM_TEMPERATURE_TO_EXIST) thermite_melt(user) -/// Signal handler for COMSIG_PARENT_QDELETING, necessary because turfs can be weird with qdel() +/// Signal handler for COMSIG_QDELETING, necessary because turfs can be weird with qdel() /datum/component/thermite/proc/parent_qdeleting(datum/source) SIGNAL_HANDLER diff --git a/code/datums/components/toggle_suit.dm b/code/datums/components/toggle_suit.dm index 9a5ec84edbf..596bf3b3252 100644 --- a/code/datums/components/toggle_suit.dm +++ b/code/datums/components/toggle_suit.dm @@ -21,10 +21,10 @@ /datum/component/toggle_icon/RegisterWithParent() RegisterSignal(parent, COMSIG_CLICK_ALT, PROC_REF(on_alt_click)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/component/toggle_icon/UnregisterFromParent() - UnregisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(parent, list(COMSIG_CLICK_ALT, COMSIG_ATOM_EXAMINE)) /* * Signal proc for COMSIG_CLICK_ALT. @@ -56,7 +56,7 @@ do_icon_toggle(source, living_user) /* - * Signal proc for COMSIG_PARENT_EXAMINE. + * Signal proc for COMSIG_ATOM_EXAMINE. * Lets the user know they can toggle the parent open or closed. * * source - the atom being examined (parent) diff --git a/code/datums/components/trapdoor.dm b/code/datums/components/trapdoor.dm index 154538b244b..219cf2841e6 100644 --- a/code/datums/components/trapdoor.dm +++ b/code/datums/components/trapdoor.dm @@ -54,7 +54,7 @@ /datum/component/trapdoor/RegisterWithParent() . = ..() RegisterSignal(parent, COMSIG_TURF_CHANGE, PROC_REF(turf_changed_pre)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) if(!src.assembly) RegisterSignal(SSdcs, COMSIG_GLOB_TRAPDOOR_LINK, PROC_REF(on_link_requested)) else @@ -67,7 +67,7 @@ if(assembly) UnregisterSignal(assembly, COMSIG_ASSEMBLY_PULSED) UnregisterSignal(parent, COMSIG_TURF_CHANGE) - UnregisterSignal(parent, COMSIG_PARENT_EXAMINE) + UnregisterSignal(parent, COMSIG_ATOM_EXAMINE) UnregisterSignal(parent, COMSIG_ATOM_TOOL_ACT(TOOL_MULTITOOL)) /datum/component/trapdoor/proc/try_unlink(turf/source, mob/user, obj/item/tool) diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index a0c491a27a5..bb28c4eeb02 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -202,7 +202,7 @@ offhand_item.desc = "Your second grip on [parent_item]." offhand_item.wielded = TRUE RegisterSignal(offhand_item, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) - RegisterSignal(offhand_item, COMSIG_PARENT_QDELETING, PROC_REF(on_destroy)) + RegisterSignal(offhand_item, COMSIG_QDELETING, PROC_REF(on_destroy)) user.put_in_inactive_hand(offhand_item) /** @@ -268,7 +268,7 @@ // Remove the object in the offhand if(offhand_item) - UnregisterSignal(offhand_item, list(COMSIG_ITEM_DROPPED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(offhand_item, list(COMSIG_ITEM_DROPPED, COMSIG_QDELETING)) qdel(offhand_item) // Clear any old refrence to an item that should be gone now offhand_item = null diff --git a/code/datums/components/udder.dm b/code/datums/components/udder.dm index 149cb6ee6f0..a72d67e0c9f 100644 --- a/code/datums/components/udder.dm +++ b/code/datums/components/udder.dm @@ -17,12 +17,12 @@ src.on_milk_callback = on_milk_callback /datum/component/udder/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) /datum/component/udder/UnregisterFromParent() QDEL_NULL(udder) - UnregisterSignal(parent, list(COMSIG_PARENT_EXAMINE, COMSIG_PARENT_ATTACKBY)) + UnregisterSignal(parent, list(COMSIG_ATOM_EXAMINE, COMSIG_ATOM_ATTACKBY)) ///signal called on parent being examined /datum/component/udder/proc/on_examine(datum/source, mob/user, list/examine_list) diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index eea548a7551..02156f69aa7 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -51,7 +51,7 @@ if(!isitem(parent)) return COMPONENT_INCOMPATIBLE - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(OnAttackBy)) + RegisterSignal(parent, COMSIG_ATOM_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_REF(implant_activation)) @@ -75,7 +75,7 @@ purchase_log = GLOB.uplink_purchase_logs_by_key[owner] else purchase_log = new(owner, src) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) src.lockable = lockable src.active = enabled if(!uplink_handler_override) diff --git a/code/datums/components/usb_port.dm b/code/datums/components/usb_port.dm index 8c805422e87..a1cf432dab7 100644 --- a/code/datums/components/usb_port.dm +++ b/code/datums/components/usb_port.dm @@ -48,7 +48,7 @@ /datum/component/usb_port/RegisterWithParent() 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_ATOM_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) @@ -58,7 +58,7 @@ UnregisterSignal(parent, list( COMSIG_ATOM_USB_CABLE_TRY_ATTACH, COMSIG_MOVABLE_MOVED, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, COMSIG_MOVABLE_CIRCUIT_LOADED, )) @@ -104,7 +104,7 @@ UnregisterSignal(attached_circuit, list( COMSIG_CIRCUIT_SHELL_REMOVED, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, COMSIG_CIRCUIT_SET_SHELL, )) @@ -114,7 +114,7 @@ UnregisterSignal(physical_object, list( COMSIG_MOVABLE_MOVED, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, )) /datum/component/usb_port/proc/attach_circuit_components(obj/item/integrated_circuit/circuitboard) @@ -175,7 +175,7 @@ new_physical_object = attached_circuit 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_QDELETING, PROC_REF(on_circuit_deleting)) RegisterSignal(attached_circuit, COMSIG_CIRCUIT_SET_SHELL, PROC_REF(on_set_shell)) set_physical_object(new_physical_object) @@ -191,7 +191,7 @@ usb_cable_beam = atom_parent.Beam(new_physical_object, "usb_cable_beam", 'icons/obj/wiremod.dmi') RegisterSignal(new_physical_object, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) - RegisterSignal(new_physical_object, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine_shell)) + RegisterSignal(new_physical_object, COMSIG_ATOM_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 4c242fa954d..c471dc13a16 100644 --- a/code/datums/components/vacuum.dm +++ b/code/datums/components/vacuum.dm @@ -71,7 +71,7 @@ SIGNAL_HANDLER vacuum_bag = new_bag - RegisterSignal(new_bag, COMSIG_PARENT_QDELETING, PROC_REF(detach_bag)) + RegisterSignal(new_bag, COMSIG_QDELETING, PROC_REF(detach_bag)) /** * Handler for when a trash bag is detached @@ -82,5 +82,5 @@ /datum/component/vacuum/proc/detach_bag(datum/source) SIGNAL_HANDLER if (vacuum_bag) // null check to avoid runtime on bag being deleted then sending detach as a result from parent - UnregisterSignal(vacuum_bag, COMSIG_PARENT_QDELETING) + UnregisterSignal(vacuum_bag, COMSIG_QDELETING) vacuum_bag = null diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 763f7f017b4..fd9d0a022cd 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -33,7 +33,7 @@ * * Lazy associated list in the structure of `signal -> registree/list of registrees` */ - var/list/_comp_lookup + var/list/_listen_lookup /// Lazy associated list in the structure of `target -> list(signal -> proctype)` that are run when the datum receives that signal var/list/list/_signal_procs @@ -141,7 +141,7 @@ ///Only override this if you know what you're doing. You do not know what you're doing ///This is a threat /datum/proc/_clear_signal_refs() - var/list/lookup = _comp_lookup + var/list/lookup = _listen_lookup if(lookup) for(var/sig in lookup) var/list/comps = lookup[sig] @@ -151,7 +151,7 @@ else var/datum/component/comp = comps comp.UnregisterSignal(src, sig) - _comp_lookup = lookup = null + _listen_lookup = lookup = null for(var/target in _signal_procs) UnregisterSignal(target, _signal_procs[target]) diff --git a/code/datums/elements/_element.dm b/code/datums/elements/_element.dm index 9e47e3acfcb..ee1d5a9af9a 100644 --- a/code/datums/elements/_element.dm +++ b/code/datums/elements/_element.dm @@ -26,7 +26,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_REF(OnTargetDelete), override = TRUE) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(OnTargetDelete), override = TRUE) /datum/element/proc/OnTargetDelete(datum/source, force) SIGNAL_HANDLER @@ -38,7 +38,7 @@ SHOULD_CALL_PARENT(TRUE) SEND_SIGNAL(source, COMSIG_ELEMENT_DETACH, src) - UnregisterSignal(source, COMSIG_PARENT_QDELETING) + UnregisterSignal(source, COMSIG_QDELETING) /datum/element/Destroy(force) if(!force) diff --git a/code/datums/elements/ai_held_item.dm b/code/datums/elements/ai_held_item.dm index 6bfb4e43b70..ba8a17f3f01 100644 --- a/code/datums/elements/ai_held_item.dm +++ b/code/datums/elements/ai_held_item.dm @@ -15,8 +15,8 @@ RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(on_click)) RegisterSignal(target, COMSIG_ATOM_EXITED, PROC_REF(atom_exited)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examined)) - RegisterSignals(target, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(on_death)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examined)) + RegisterSignals(target, list(COMSIG_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(on_death)) /// Returns the item held in a mob's blackboard, if it has one /datum/element/ai_held_item/proc/get_held_item(mob/living/source) diff --git a/code/datums/elements/art.dm b/code/datums/elements/art.dm index cec2d3b9a87..4f418ad0e4f 100644 --- a/code/datums/elements/art.dm +++ b/code/datums/elements/art.dm @@ -8,10 +8,10 @@ if(!isatom(target) || isarea(target)) return ELEMENT_INCOMPATIBLE impressiveness = impress - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/element/art/Detach(datum/target) - UnregisterSignal(target, COMSIG_PARENT_EXAMINE) + UnregisterSignal(target, COMSIG_ATOM_EXAMINE) return ..() /datum/element/art/proc/apply_moodlet(atom/source, mob/living/user, impress) diff --git a/code/datums/elements/can_barricade.dm b/code/datums/elements/can_barricade.dm index dd53ed73804..49be7f5aafd 100644 --- a/code/datums/elements/can_barricade.dm +++ b/code/datums/elements/can_barricade.dm @@ -10,14 +10,14 @@ if(!isatom(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_ATTACKBY, PROC_REF(on_start_barricade)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_ATTACKBY, PROC_REF(on_start_barricade)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) target.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 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)) + UnregisterSignal(target, list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_EXAMINE, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM)) // We don't remove HAS_CONTEXTUAL_SCREENTIPS_1, since there could be other stuff still hooked to it, // and being set without signals is not dangerous, just less performant. // A lot of things don't do this, perhaps make a proc that checks if any signals are still set, and if not, diff --git a/code/datums/elements/chemical_transfer.dm b/code/datums/elements/chemical_transfer.dm index 60d833cedec..09391cbf390 100644 --- a/code/datums/elements/chemical_transfer.dm +++ b/code/datums/elements/chemical_transfer.dm @@ -29,11 +29,11 @@ src.attacker_message = attacker_message src.victim_message = victim_message RegisterSignal(target, COMSIG_ITEM_ATTACK, PROC_REF(on_attack)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/element/chemical_transfer/Detach(datum/target) . = ..() - UnregisterSignal(target, list(COMSIG_ITEM_ATTACK, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(target, list(COMSIG_ITEM_ATTACK, COMSIG_ATOM_EXAMINE)) ///signal called on parent being examined /datum/element/chemical_transfer/proc/on_examine(datum/target, mob/user, list/examine_list) diff --git a/code/datums/elements/climbable.dm b/code/datums/elements/climbable.dm index e88af1961ba..17833e4d432 100644 --- a/code/datums/elements/climbable.dm +++ b/code/datums/elements/climbable.dm @@ -19,13 +19,13 @@ src.climb_stun = climb_stun RegisterSignal(target, COMSIG_ATOM_ATTACK_HAND, PROC_REF(attack_hand)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_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) - UnregisterSignal(target, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_PARENT_EXAMINE, COMSIG_MOUSEDROPPED_ONTO, COMSIG_ATOM_BUMPED)) + UnregisterSignal(target, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_EXAMINE, COMSIG_MOUSEDROPPED_ONTO, COMSIG_ATOM_BUMPED)) REMOVE_TRAIT(target, TRAIT_CLIMBABLE, ELEMENT_TRAIT(type)) return ..() diff --git a/code/datums/elements/cuffsnapping.dm b/code/datums/elements/cuffsnapping.dm index 004b0410573..19a59bd4c7c 100644 --- a/code/datums/elements/cuffsnapping.dm +++ b/code/datums/elements/cuffsnapping.dm @@ -41,11 +41,11 @@ src.snap_time_weak = snap_time_weak src.snap_time_strong = snap_time_strong - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(target, COMSIG_ITEM_ATTACK , PROC_REF(try_cuffsnap_target)) /datum/element/cuffsnapping/Detach(datum/target) - UnregisterSignal(target, list(COMSIG_ITEM_ATTACK, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(target, list(COMSIG_ITEM_ATTACK, COMSIG_ATOM_EXAMINE)) return ..() diff --git a/code/datums/elements/decals/_decal.dm b/code/datums/elements/decals/_decal.dm index bf6fa1bc25c..71dd8abdf30 100644 --- a/code/datums/elements/decals/_decal.dm +++ b/code/datums/elements/decals/_decal.dm @@ -89,7 +89,7 @@ if(_cleanable) RegisterSignal(target, COMSIG_COMPONENT_CLEAN_ACT, PROC_REF(clean_react), TRUE) if(_description) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examine),TRUE) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(examine),TRUE) RegisterSignal(target, COMSIG_TURF_ON_SHUTTLE_MOVE, PROC_REF(shuttle_move_react),TRUE) @@ -113,7 +113,7 @@ return TRUE /datum/element/decal/Detach(atom/source) - UnregisterSignal(source, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_PARENT_EXAMINE, COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_TURF_ON_SHUTTLE_MOVE, COMSIG_ATOM_SMOOTHED_ICON)) + UnregisterSignal(source, list(COMSIG_ATOM_DIR_CHANGE, COMSIG_COMPONENT_CLEAN_ACT, COMSIG_ATOM_EXAMINE, COMSIG_ATOM_UPDATE_OVERLAYS, COMSIG_TURF_ON_SHUTTLE_MOVE, COMSIG_ATOM_SMOOTHED_ICON)) SSdcs.UnregisterSignal(source, COMSIG_ATOM_DIR_CHANGE) source.update_appearance(UPDATE_OVERLAYS) if(isitem(source)) diff --git a/code/datums/elements/deliver_first.dm b/code/datums/elements/deliver_first.dm index 9633a376107..0fb83a25456 100644 --- a/code/datums/elements/deliver_first.dm +++ b/code/datums/elements/deliver_first.dm @@ -24,7 +24,7 @@ return ELEMENT_INCOMPATIBLE src.goal_area_type = goal_area_type src.payment = payment - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_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)) @@ -36,7 +36,7 @@ . = ..() REMOVE_TRAIT(target, TRAIT_BANNED_FROM_CARGO_SHUTTLE, REF(src)) UnregisterSignal(target, list( - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, COMSIG_MOVABLE_MOVED, COMSIG_ATOM_EMAG_ACT, COMSIG_CLOSET_PRE_OPEN, diff --git a/code/datums/elements/digitalcamo.dm b/code/datums/elements/digitalcamo.dm index f85d856231b..3f4db60de2d 100644 --- a/code/datums/elements/digitalcamo.dm +++ b/code/datums/elements/digitalcamo.dm @@ -10,7 +10,7 @@ . = ..() if(!isliving(target) || (target in attached_mobs)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(target, COMSIG_LIVING_CAN_TRACK, PROC_REF(can_track)) var/image/img = image(loc = target) img.override = TRUE @@ -19,7 +19,7 @@ /datum/element/digitalcamo/Detach(datum/target) . = ..() - UnregisterSignal(target, list(COMSIG_PARENT_EXAMINE, COMSIG_LIVING_CAN_TRACK)) + UnregisterSignal(target, list(COMSIG_ATOM_EXAMINE, COMSIG_LIVING_CAN_TRACK)) for(var/mob/living/silicon/ai/AI in GLOB.player_list) AI.client.images -= attached_mobs[target] attached_mobs -= target diff --git a/code/datums/elements/embed.dm b/code/datums/elements/embed.dm index c1150df6de7..854193c1974 100644 --- a/code/datums/elements/embed.dm +++ b/code/datums/elements/embed.dm @@ -37,7 +37,7 @@ RegisterSignal(target, COMSIG_ELEMENT_ATTACH, PROC_REF(severancePackage)) if(isitem(target)) RegisterSignal(target, COMSIG_MOVABLE_IMPACT_ZONE, PROC_REF(checkEmbed)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(examined)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(examined)) RegisterSignal(target, COMSIG_EMBED_TRY_FORCE, PROC_REF(tryForceEmbed)) RegisterSignal(target, COMSIG_ITEM_DISABLE_EMBED, PROC_REF(detachFromWeapon)) if(!initialized) @@ -61,7 +61,7 @@ /datum/element/embed/Detach(obj/target) . = ..() if(isitem(target)) - UnregisterSignal(target, list(COMSIG_MOVABLE_IMPACT_ZONE, COMSIG_ELEMENT_ATTACH, COMSIG_MOVABLE_IMPACT, COMSIG_PARENT_EXAMINE, COMSIG_EMBED_TRY_FORCE, COMSIG_ITEM_DISABLE_EMBED)) + UnregisterSignal(target, list(COMSIG_MOVABLE_IMPACT_ZONE, COMSIG_ELEMENT_ATTACH, COMSIG_MOVABLE_IMPACT, COMSIG_ATOM_EXAMINE, COMSIG_EMBED_TRY_FORCE, COMSIG_ITEM_DISABLE_EMBED)) else UnregisterSignal(target, list(COMSIG_PROJECTILE_SELF_ON_HIT, COMSIG_ELEMENT_ATTACH)) diff --git a/code/datums/elements/envenomable_casing.dm b/code/datums/elements/envenomable_casing.dm index fe68d7408ad..c300cb35c6a 100644 --- a/code/datums/elements/envenomable_casing.dm +++ b/code/datums/elements/envenomable_casing.dm @@ -16,11 +16,11 @@ return ELEMENT_INCOMPATIBLE src.amount_allowed = amount_allowed RegisterSignal(target, COMSIG_ITEM_AFTERATTACK, PROC_REF(on_afterattack)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/element/envenomable_casing/Detach(datum/target) . = ..() - UnregisterSignal(target, list(COMSIG_ITEM_AFTERATTACK, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(target, list(COMSIG_ITEM_AFTERATTACK, COMSIG_ATOM_EXAMINE)) ///signal called on the parent attacking an item /datum/element/envenomable_casing/proc/on_afterattack(obj/item/ammo_casing/casing, atom/target, mob/user, proximity_flag, click_parameters) diff --git a/code/datums/elements/food/microwavable.dm b/code/datums/elements/food/microwavable.dm index 6462825899c..86a43c0603c 100644 --- a/code/datums/elements/food/microwavable.dm +++ b/code/datums/elements/food/microwavable.dm @@ -17,10 +17,10 @@ RegisterSignal(target, COMSIG_ITEM_MICROWAVE_ACT, PROC_REF(on_microwaved)) if(!ispath(result_typepath, default_typepath)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/element/microwavable/Detach(datum/source) - UnregisterSignal(source, list(COMSIG_ITEM_MICROWAVE_ACT, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(source, list(COMSIG_ITEM_MICROWAVE_ACT, COMSIG_ATOM_EXAMINE)) return ..() /** @@ -66,7 +66,7 @@ return recipe_result /** - * Signal proc for [COMSIG_PARENT_EXAMINE]. + * Signal proc for [COMSIG_ATOM_EXAMINE]. * Lets examiners know we can be microwaved if we're not the default mess type */ /datum/element/microwavable/proc/on_examine(atom/source, mob/user, list/examine_list) diff --git a/code/datums/elements/food/processable.dm b/code/datums/elements/food/processable.dm index 81e31676070..b45fc33f8b1 100644 --- a/code/datums/elements/food/processable.dm +++ b/code/datums/elements/food/processable.dm @@ -32,11 +32,11 @@ RegisterSignal(atom_target, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context_from_item)) RegisterSignal(target, COMSIG_ATOM_TOOL_ACT(tool_behaviour), PROC_REF(try_process)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(OnExamine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(OnExamine)) /datum/element/processable/Detach(datum/target) . = ..() - UnregisterSignal(target, list(COMSIG_ATOM_TOOL_ACT(tool_behaviour), COMSIG_PARENT_EXAMINE, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM)) + UnregisterSignal(target, list(COMSIG_ATOM_TOOL_ACT(tool_behaviour), COMSIG_ATOM_EXAMINE, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM)) /datum/element/processable/proc/try_process(datum/source, mob/living/user, obj/item/I, list/mutable_recipes) SIGNAL_HANDLER diff --git a/code/datums/elements/light_eaten.dm b/code/datums/elements/light_eaten.dm index 36bf1f20067..d5a0d6eafd2 100644 --- a/code/datums/elements/light_eaten.dm +++ b/code/datums/elements/light_eaten.dm @@ -13,7 +13,7 @@ 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)) + RegisterSignal(atom_target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /// Because the lighting system does not like movable lights getting set_light() called. switch(atom_target.light_system) @@ -29,7 +29,7 @@ COMSIG_ATOM_SET_LIGHT_POWER, COMSIG_ATOM_SET_LIGHT_RANGE, COMSIG_ATOM_SET_LIGHT_ON, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, )) return ..() diff --git a/code/datums/elements/loomable.dm b/code/datums/elements/loomable.dm index 827302ffdcd..070bc47f5ca 100644 --- a/code/datums/elements/loomable.dm +++ b/code/datums/elements/loomable.dm @@ -35,11 +35,11 @@ src.target_needs_anchoring = target_needs_anchoring src.loom_time = loom_time RegisterSignal(target, COMSIG_ITEM_ATTACK_OBJ, PROC_REF(try_and_loom_me)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/element/loomable/Detach(obj/item/source) . = ..() - UnregisterSignal(source, list(COMSIG_ITEM_ATTACK_OBJ, COMSIG_PARENT_EXAMINE)) + UnregisterSignal(source, list(COMSIG_ITEM_ATTACK_OBJ, COMSIG_ATOM_EXAMINE)) /// Adds an examine blurb to the description of any item that can be loomed /datum/element/loomable/proc/on_examine(obj/item/source, mob/examiner, list/examine_list) diff --git a/code/datums/elements/noticable_organ.dm b/code/datums/elements/noticable_organ.dm index c87e81edd36..9288c18a627 100644 --- a/code/datums/elements/noticable_organ.dm +++ b/code/datums/elements/noticable_organ.dm @@ -29,7 +29,7 @@ /datum/element/noticable_organ/Detach(obj/item/organ/target) UnregisterSignal(target, list(COMSIG_ORGAN_IMPLANTED, COMSIG_ORGAN_REMOVED)) if(target.owner) - UnregisterSignal(target.owner, COMSIG_PARENT_EXAMINE) + UnregisterSignal(target.owner, COMSIG_ATOM_EXAMINE) return ..() /// Proc that returns true or false if the organ should show its examine check. @@ -41,12 +41,12 @@ /datum/element/noticable_organ/proc/on_implanted(obj/item/organ/target, mob/living/carbon/receiver) SIGNAL_HANDLER - RegisterSignal(receiver, COMSIG_PARENT_EXAMINE, PROC_REF(on_receiver_examine)) + RegisterSignal(receiver, COMSIG_ATOM_EXAMINE, PROC_REF(on_receiver_examine)) /datum/element/noticable_organ/proc/on_removed(obj/item/organ/target, mob/living/carbon/loser) SIGNAL_HANDLER - UnregisterSignal(loser, COMSIG_PARENT_EXAMINE) + UnregisterSignal(loser, COMSIG_ATOM_EXAMINE) /datum/element/noticable_organ/proc/on_receiver_examine(mob/living/carbon/examined, mob/user, list/examine_list) SIGNAL_HANDLER diff --git a/code/datums/elements/organ_set_bonus.dm b/code/datums/elements/organ_set_bonus.dm index 1680a0eb0dc..aeb63356fb4 100644 --- a/code/datums/elements/organ_set_bonus.dm +++ b/code/datums/elements/organ_set_bonus.dm @@ -21,7 +21,7 @@ /datum/element/organ_set_bonus/Detach(obj/item/organ/target) UnregisterSignal(target, list(COMSIG_ORGAN_IMPLANTED, COMSIG_ORGAN_REMOVED)) if(target.owner) - UnregisterSignal(target.owner, COMSIG_PARENT_EXAMINE) + UnregisterSignal(target.owner, COMSIG_ATOM_EXAMINE) return ..() /datum/element/organ_set_bonus/proc/on_implanted(obj/item/organ/target, mob/living/carbon/receiver) diff --git a/code/datums/elements/radiation_protected_clothing.dm b/code/datums/elements/radiation_protected_clothing.dm index e0ebb351eae..6d6d98c14b4 100644 --- a/code/datums/elements/radiation_protected_clothing.dm +++ b/code/datums/elements/radiation_protected_clothing.dm @@ -10,11 +10,11 @@ return ELEMENT_INCOMPATIBLE ADD_TRAIT(target, TRAIT_RADIATION_PROTECTED_CLOTHING, REF(src)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/element/radiation_protected_clothing/Detach(datum/source, ...) REMOVE_TRAIT(source, TRAIT_RADIATION_PROTECTED_CLOTHING, REF(src)) - UnregisterSignal(source, COMSIG_PARENT_EXAMINE) + UnregisterSignal(source, COMSIG_ATOM_EXAMINE) return ..() diff --git a/code/datums/elements/rust.dm b/code/datums/elements/rust.dm index 095a9724ec3..5f5ee0b26e8 100644 --- a/code/datums/elements/rust.dm +++ b/code/datums/elements/rust.dm @@ -16,7 +16,7 @@ rust_overlay = image(rust_icon, rust_icon_state) ADD_TRAIT(target, TRAIT_RUSTY, ELEMENT_TRAIT(type)) RegisterSignal(target, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(apply_rust_overlay)) - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(handle_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(handle_examine)) RegisterSignals(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_appearance() @@ -24,7 +24,7 @@ /datum/element/rust/Detach(atom/source) . = ..() UnregisterSignal(source, COMSIG_ATOM_UPDATE_OVERLAYS) - UnregisterSignal(source, COMSIG_PARENT_EXAMINE) + UnregisterSignal(source, COMSIG_ATOM_EXAMINE) UnregisterSignal(source, list(COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_WELDER), COMSIG_ATOM_SECONDARY_TOOL_ACT(TOOL_RUSTSCRAPER))) REMOVE_TRAIT(source, TRAIT_RUSTY, ELEMENT_TRAIT(type)) source.update_appearance() diff --git a/code/datums/elements/series.dm b/code/datums/elements/series.dm index 398c28a47ca..3707b974d72 100644 --- a/code/datums/elements/series.dm +++ b/code/datums/elements/series.dm @@ -20,11 +20,11 @@ subtype_list = subtypesof(subtype) src.series_name = series_name var/atom/attached = target - RegisterSignal(attached, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(attached, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/element/series/Detach(datum/target) . = ..() - UnregisterSignal(target, COMSIG_PARENT_EXAMINE) + UnregisterSignal(target, COMSIG_ATOM_EXAMINE) ///signal called examining /datum/element/series/proc/on_examine(datum/target, mob/user, list/examine_list) diff --git a/code/datums/elements/wall_engraver.dm b/code/datums/elements/wall_engraver.dm index 72e74c7d35c..7204d8cacef 100644 --- a/code/datums/elements/wall_engraver.dm +++ b/code/datums/elements/wall_engraver.dm @@ -7,12 +7,12 @@ if (!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_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) . = ..() - UnregisterSignal(source, COMSIG_PARENT_EXAMINE) + UnregisterSignal(source, COMSIG_ATOM_EXAMINE) UnregisterSignal(source, COMSIG_ITEM_PRE_ATTACK_SECONDARY) ///signal called on parent being examined diff --git a/code/datums/elements/weapon_description.dm b/code/datums/elements/weapon_description.dm index 158f422deec..1217d478482 100644 --- a/code/datums/elements/weapon_description.dm +++ b/code/datums/elements/weapon_description.dm @@ -15,7 +15,7 @@ . = ..() if(!isitem(target)) // Do not attach this to anything that isn't an item return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(warning_label)) + RegisterSignal(target, COMSIG_ATOM_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) @@ -23,7 +23,7 @@ /datum/element/weapon_description/Detach(datum/target) . = ..() - UnregisterSignal(target, list(COMSIG_PARENT_EXAMINE, COMSIG_TOPIC)) + UnregisterSignal(target, list(COMSIG_ATOM_EXAMINE, COMSIG_TOPIC)) /** * diff --git a/code/datums/hud.dm b/code/datums/hud.dm index 984928e7fb5..47a813c5300 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -139,7 +139,7 @@ GLOBAL_LIST_INIT(huds, list( if(!hud_users_all_z_levels[new_viewer]) hud_users_all_z_levels[new_viewer] = 1 - 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_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) var/turf/their_turf = get_turf(new_viewer) @@ -171,7 +171,7 @@ GLOBAL_LIST_INIT(huds, list( if(!hud_atoms_all_z_levels[former_viewer])//make sure we arent unregistering changes on a mob thats also a hud atom for this hud UnregisterSignal(former_viewer, COMSIG_MOVABLE_Z_CHANGED) - UnregisterSignal(former_viewer, COMSIG_PARENT_QDELETING) + UnregisterSignal(former_viewer, COMSIG_QDELETING) hud_users_all_z_levels -= former_viewer @@ -195,7 +195,7 @@ GLOBAL_LIST_INIT(huds, list( // No matter where or who you are, you matter to me :) 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 + RegisterSignal(new_hud_atom, COMSIG_QDELETING, PROC_REF(unregister_atom), override = TRUE) //both hud atoms and hud users use these signals hud_atoms_all_z_levels[new_hud_atom] = TRUE var/turf/atom_turf = get_turf(new_hud_atom) @@ -217,7 +217,7 @@ GLOBAL_LIST_INIT(huds, list( //make sure we arent unregistering a hud atom thats also a hud user mob if(!hud_users_all_z_levels[hud_atom_to_remove]) UnregisterSignal(hud_atom_to_remove, COMSIG_MOVABLE_Z_CHANGED) - UnregisterSignal(hud_atom_to_remove, COMSIG_PARENT_QDELETING) + UnregisterSignal(hud_atom_to_remove, COMSIG_QDELETING) for(var/mob/mob_to_remove as anything in hud_users_all_z_levels) remove_atom_from_single_hud(mob_to_remove, hud_atom_to_remove) diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 156068ce4f8..449f55ae660 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -233,10 +233,10 @@ /// A simple proc to change who our parent is set to, also handling registering and unregistering the QDELETING signals on the parent. /datum/looping_sound/proc/set_parent(new_parent) if(parent) - UnregisterSignal(parent, COMSIG_PARENT_QDELETING) + UnregisterSignal(parent, COMSIG_QDELETING) parent = new_parent if(parent) - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(handle_parent_del)) + RegisterSignal(parent, COMSIG_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/cqc.dm b/code/datums/martial/cqc.dm index 65ce4812f57..c982f0e086c 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -16,10 +16,10 @@ /datum/martial_art/cqc/teach(mob/living/cqc_user, make_temporary) . = ..() - RegisterSignal(cqc_user, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(cqc_user, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) /datum/martial_art/cqc/on_remove(mob/living/cqc_user) - UnregisterSignal(cqc_user, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(cqc_user, COMSIG_ATOM_ATTACKBY) . = ..() ///Signal from getting attacked with an item, for a special interaction with touch spells diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 308bd570073..cfbb37e08a9 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -14,12 +14,12 @@ if(!.) return target.add_traits(list(TRAIT_NOGUNS, TRAIT_HARDLY_WOUNDED, TRAIT_NODISMEMBER), SLEEPING_CARP_TRAIT) - RegisterSignal(target, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(target, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) target.faction |= FACTION_CARP //:D /datum/martial_art/the_sleeping_carp/on_remove(mob/living/target) target.remove_traits(list(TRAIT_NOGUNS, TRAIT_HARDLY_WOUNDED, TRAIT_NODISMEMBER), SLEEPING_CARP_TRAIT) - UnregisterSignal(target, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(target, COMSIG_ATOM_ATTACKBY) target.faction -= FACTION_CARP //:( . = ..() diff --git a/code/datums/mergers/_merger.dm b/code/datums/mergers/_merger.dm index e99e9c7dfef..1ee6cc4cfc3 100644 --- a/code/datums/mergers/_merger.dm +++ b/code/datums/mergers/_merger.dm @@ -36,7 +36,7 @@ /datum/merger/proc/RemoveMember(atom/thing, clean=TRUE) SEND_SIGNAL(thing, COMSIG_MERGER_REMOVING, src) UnregisterSignal(thing, COMSIG_MOVABLE_MOVED) - UnregisterSignal(thing, COMSIG_PARENT_QDELETING) + UnregisterSignal(thing, COMSIG_QDELETING) if(!thing.mergers) return thing.mergers -= id @@ -50,7 +50,7 @@ /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, COMSIG_MOVABLE_MOVED, PROC_REF(QueueRefresh)) - RegisterSignal(thing, COMSIG_PARENT_QDELETING, PROC_REF(HandleMemberDel)) + RegisterSignal(thing, COMSIG_QDELETING, PROC_REF(HandleMemberDel)) if(!thing.mergers) thing.mergers = list() else if(thing.mergers[id]) diff --git a/code/datums/mind/_mind.dm b/code/datums/mind/_mind.dm index 2e74de07a51..2d797090683 100644 --- a/code/datums/mind/_mind.dm +++ b/code/datums/mind/_mind.dm @@ -157,10 +157,10 @@ if(new_current && QDELETED(new_current)) CRASH("Tried to set a mind's current var to a qdeleted mob, what the fuck") if(current) - UnregisterSignal(src, COMSIG_PARENT_QDELETING) + UnregisterSignal(src, COMSIG_QDELETING) current = new_current if(current) - RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(clear_current)) + RegisterSignal(src, COMSIG_QDELETING, PROC_REF(clear_current)) /datum/mind/proc/clear_current(datum/source) SIGNAL_HANDLER diff --git a/code/datums/mood.dm b/code/datums/mood.dm index a1496746b79..79fb8486db9 100644 --- a/code/datums/mood.dm +++ b/code/datums/mood.dm @@ -50,7 +50,7 @@ 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)) + RegisterSignal(mob_to_make_moody, COMSIG_QDELETING, PROC_REF(clear_parent_ref)) mob_to_make_moody.become_area_sensitive(MOOD_DATUM_TRAIT) if(mob_to_make_moody.hud_used) @@ -63,7 +63,7 @@ unmodify_hud() mob_parent.lose_area_sensitivity(MOOD_DATUM_TRAIT) - UnregisterSignal(mob_parent, list(COMSIG_MOB_HUD_CREATED, COMSIG_ENTER_AREA, COMSIG_LIVING_REVIVE, COMSIG_MOB_STATCHANGE, COMSIG_PARENT_QDELETING)) + UnregisterSignal(mob_parent, list(COMSIG_MOB_HUD_CREATED, COMSIG_ENTER_AREA, COMSIG_LIVING_REVIVE, COMSIG_MOB_STATCHANGE, COMSIG_QDELETING)) mob_parent = null @@ -280,7 +280,7 @@ mood_screen_object = new mood_screen_object.color = "#4b96c4" hud.infodisplay += mood_screen_object - RegisterSignal(hud, COMSIG_PARENT_QDELETING, PROC_REF(unmodify_hud)) + RegisterSignal(hud, COMSIG_QDELETING, PROC_REF(unmodify_hud)) RegisterSignal(mood_screen_object, COMSIG_CLICK, PROC_REF(hud_click)) /// Removes the mood HUD object diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index fa89be0f85f..a8fad8ac337 100644 --- a/code/datums/progressbar.dm +++ b/code/datums/progressbar.dm @@ -45,7 +45,7 @@ user_client = user.client add_prog_bar_image_to_client() - RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(on_user_delete)) + RegisterSignal(user, COMSIG_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)) diff --git a/code/datums/proximity_monitor/fields/projectile_dampener.dm b/code/datums/proximity_monitor/fields/projectile_dampener.dm index 94a7afd279f..7f625d64524 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_REF(on_projector_del)) + RegisterSignal(projector, COMSIG_QDELETING, PROC_REF(on_projector_del)) recalculate_field() START_PROCESSING(SSfastprocess, src) diff --git a/code/datums/proximity_monitor/proximity_monitor.dm b/code/datums/proximity_monitor/proximity_monitor.dm index 7b5648c9e2b..c7c8165a431 100644 --- a/code/datums/proximity_monitor/proximity_monitor.dm +++ b/code/datums/proximity_monitor/proximity_monitor.dm @@ -23,17 +23,17 @@ if(new_host == host) return if(host) //No need to delete the connect range and containers comps. They'll be updated with the new tracked host. - UnregisterSignal(host, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(host, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) if(hasprox_receiver) - UnregisterSignal(hasprox_receiver, COMSIG_PARENT_QDELETING) + UnregisterSignal(hasprox_receiver, COMSIG_QDELETING) if(new_receiver) hasprox_receiver = new_receiver if(new_receiver != new_host) - RegisterSignal(new_receiver, COMSIG_PARENT_QDELETING, PROC_REF(on_host_or_receiver_del)) + RegisterSignal(new_receiver, COMSIG_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_REF(on_host_or_receiver_del)) + RegisterSignal(new_host, COMSIG_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_REF(on_moved)) diff --git a/code/datums/quirks/_quirk.dm b/code/datums/quirks/_quirk.dm index 267750f5761..8e27619f9ba 100644 --- a/code/datums/quirks/_quirk.dm +++ b/code/datums/quirks/_quirk.dm @@ -90,7 +90,7 @@ else RegisterSignal(quirk_holder, COMSIG_MOB_LOGIN, PROC_REF(on_quirk_holder_first_login)) - RegisterSignal(quirk_holder, COMSIG_PARENT_QDELETING, PROC_REF(on_holder_qdeleting)) + RegisterSignal(quirk_holder, COMSIG_QDELETING, PROC_REF(on_holder_qdeleting)) return TRUE @@ -99,7 +99,7 @@ if(!quirk_holder) CRASH("Attempted to remove quirk from the current holder when it has no current holder.") - UnregisterSignal(quirk_holder, list(COMSIG_MOB_LOGIN, COMSIG_PARENT_QDELETING)) + UnregisterSignal(quirk_holder, list(COMSIG_MOB_LOGIN, COMSIG_QDELETING)) quirk_holder.quirks -= src diff --git a/code/datums/signals.dm b/code/datums/signals.dm new file mode 100644 index 00000000000..9a43c88fa7e --- /dev/null +++ b/code/datums/signals.dm @@ -0,0 +1,124 @@ +/** + * Register to listen for a signal from the passed in target + * + * 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: + * * datum/target The target to listen for signals from + * * signal_type A signal name + * * proctype The proc to call back when the signal is emitted + * * override If a previous registration exists you must explicitly set this + */ +/datum/proc/RegisterSignal(datum/target, signal_type, proctype, override = FALSE) + if(QDELETED(src) || QDELETED(target)) + return + + if (islist(signal_type)) + var/static/list/known_failures = list() + var/list/signal_type_list = signal_type + var/message = "([target.type]) is registering [signal_type_list.Join(", ")] as a list, the older method. Change it to RegisterSignals." + + if (!(message in known_failures)) + known_failures[message] = TRUE + stack_trace("[target] [message]") + + RegisterSignals(target, signal_type, proctype, override) + return + + var/list/procs = (_signal_procs ||= list()) + var/list/target_procs = (procs[target] ||= list()) + var/list/lookup = (target._listen_lookup ||= list()) + + if(!override && target_procs[signal_type]) + var/override_message = "[signal_type] overridden. Use override = TRUE to suppress this warning.\nTarget: [target] ([target.type]) Proc: [proctype]" + log_signal(override_message) + stack_trace(override_message) + + target_procs[signal_type] = proctype + var/list/looked_up = lookup[signal_type] + + if(isnull(looked_up)) // Nothing has registered here yet + lookup[signal_type] = src + else if(looked_up == src) // We already registered here + return + else if(!length(looked_up)) // One other thing registered here + lookup[signal_type] = list((looked_up) = TRUE, (src) = TRUE) + else // Many other things have registered here + looked_up[src] = TRUE + +/// Registers multiple signals to the same proc. +/datum/proc/RegisterSignals(datum/target, list/signal_types, proctype, override = FALSE) + for (var/signal_type in signal_types) + RegisterSignal(target, signal_type, proctype, override) + +/** + * Stop listening to a given signal from target + * + * Breaks the relationship between target and source datum, removing the callback when the signal fires + * + * Doesn't care if a registration exists or not + * + * Arguments: + * * datum/target Datum to stop listening to signals from + * * sig_typeor_types Signal string key or list of signal keys to stop listening to specifically + */ +/datum/proc/UnregisterSignal(datum/target, sig_type_or_types) + var/list/lookup = target._listen_lookup + if(!_signal_procs || !_signal_procs[target] || !lookup) + return + if(!islist(sig_type_or_types)) + sig_type_or_types = list(sig_type_or_types) + for(var/sig in sig_type_or_types) + if(!_signal_procs[target][sig]) + if(!istext(sig)) + stack_trace("We're unregistering with something that isn't a valid signal \[[sig]\], you fucked up") + continue + switch(length(lookup[sig])) + if(2) + lookup[sig] = (lookup[sig]-src)[1] + if(1) + stack_trace("[target] ([target.type]) somehow has single length list inside _listen_lookup") + if(src in lookup[sig]) + lookup -= sig + if(!length(lookup)) + target._listen_lookup = null + break + if(0) + if(lookup[sig] != src) + continue + lookup -= sig + if(!length(lookup)) + target._listen_lookup = null + break + else + lookup[sig] -= src + + _signal_procs[target] -= sig_type_or_types + if(!_signal_procs[target].len) + _signal_procs -= target + +/** + * Internal proc to handle most all of the signaling procedure + * + * Will runtime if used on datums with an empty lookup list + * + * Use the [SEND_SIGNAL] define instead + */ +/datum/proc/_SendSignal(sigtype, list/arguments) + var/target = _listen_lookup[sigtype] + if(!length(target)) + var/datum/listening_datum = target + return NONE | call(listening_datum, listening_datum._signal_procs[src][sigtype])(arglist(arguments)) + . = NONE + // This exists so that even if one of the signal receivers unregisters the signal, + // all the objects that are receiving the signal get the signal this final time. + // AKA: No you can't cancel the signal reception of another object by doing an unregister in the same signal. + var/list/queued_calls = list() + for(var/datum/listening_datum as anything in target) + queued_calls[listening_datum] = listening_datum._signal_procs[src][sigtype] + for(var/datum/listening_datum as anything in queued_calls) + . |= call(listening_datum, queued_calls[listening_datum])(arglist(arguments)) diff --git a/code/datums/status_effects/debuffs/choke.dm b/code/datums/status_effects/debuffs/choke.dm index 6b3a3ff5a18..f688e57c322 100644 --- a/code/datums/status_effects/debuffs/choke.dm +++ b/code/datums/status_effects/debuffs/choke.dm @@ -49,7 +49,7 @@ 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_REF(remove_choke)) + RegisterSignal(choking_on, COMSIG_QDELETING, PROC_REF(remove_choke)) RegisterSignal(choking_on, COMSIG_MOVABLE_MOVED, PROC_REF(hazard_moved)) ADD_TRAIT(owner, TRAIT_MUTE, CHOKING_TRAIT) diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm index 3fe5d94e548..d6df0be2f6e 100644 --- a/code/datums/status_effects/neutral.dm +++ b/code/datums/status_effects/neutral.dm @@ -185,8 +185,8 @@ return RegisterSignal(owner, COMSIG_MOVABLE_MOVED, PROC_REF(check_owner_in_range)) - RegisterSignals(offered_item, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(dropped_item)) - //RegisterSignal(owner, COMSIG_PARENT_EXAMINE_MORE, PROC_REF(check_fake_out)) + RegisterSignals(offered_item, list(COMSIG_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(dropped_item)) + //RegisterSignal(owner, COMSIG_ATOM_EXAMINE_MORE, PROC_REF(check_fake_out)) /datum/status_effect/offering/Destroy() for(var/i in possible_takers) @@ -379,7 +379,7 @@ /datum/status_effect/eigenstasium/Destroy() if(alt_clone) - UnregisterSignal(alt_clone, COMSIG_PARENT_QDELETING) + UnregisterSignal(alt_clone, COMSIG_QDELETING) QDEL_NULL(alt_clone) return ..() @@ -466,7 +466,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_REF(remove_clone_from_var)) + RegisterSignal(alt_clone, COMSIG_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) @@ -515,7 +515,7 @@ /datum/status_effect/eigenstasium/proc/remove_clone_from_var() SIGNAL_HANDLER - UnregisterSignal(alt_clone, COMSIG_PARENT_QDELETING) + UnregisterSignal(alt_clone, COMSIG_QDELETING) /datum/status_effect/eigenstasium/on_remove() if(!QDELETED(alt_clone))//catch any stragilers diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index 51a610183ca..50860f172f4 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -121,14 +121,14 @@ RegisterSignal(resolve_parent, COMSIG_MOUSEDROPPED_ONTO, PROC_REF(on_mousedropped_onto)) 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_ATOM_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_REF(mass_empty)) RegisterSignals(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_parent, COMSIG_ATOM_ATTACKBY_SECONDARY, PROC_REF(open_storage_attackby_secondary)) RegisterSignal(resolve_location, COMSIG_ATOM_ENTERED, PROC_REF(handle_enter)) RegisterSignal(resolve_location, COMSIG_ATOM_EXITED, PROC_REF(handle_exit)) diff --git a/code/datums/visual_data.dm b/code/datums/visual_data.dm index 3ef597113bf..e6c89544a33 100644 --- a/code/datums/visual_data.dm +++ b/code/datums/visual_data.dm @@ -85,10 +85,10 @@ /datum/visual_data/proc/set_eye(atom/new_eye) var/atom/old_eye = client_eye?.resolve() if(old_eye) - UnregisterSignal(old_eye, COMSIG_PARENT_QDELETING) + UnregisterSignal(old_eye, COMSIG_QDELETING) if(new_eye) // Need to update any party's client.eyes - RegisterSignal(new_eye, COMSIG_PARENT_QDELETING, PROC_REF(eye_deleted)) + RegisterSignal(new_eye, COMSIG_QDELETING, PROC_REF(eye_deleted)) client_eye = WEAKREF(new_eye) on_update() diff --git a/code/datums/weakrefs.dm b/code/datums/weakrefs.dm index 27bd5d94330..dedc0d8eff9 100644 --- a/code/datums/weakrefs.dm +++ b/code/datums/weakrefs.dm @@ -87,7 +87,7 @@ * adding it to an atom's contents or vis_contents, giving it a key (if it's a mob), attaching it to an atom (if it's an image), * or assigning it to a datum or list referenced somewhere other than a temporary value. * - * Unless you're resolving a weakref to a datum in a COMSIG_PARENT_QDELETING signal handler registered on that very same datum, + * Unless you're resolving a weakref to a datum in a COMSIG_QDELETING signal handler registered on that very same datum, * just use resolve instead. */ /datum/weakref/proc/hard_resolve() diff --git a/code/datums/wires/_wires.dm b/code/datums/wires/_wires.dm index 95ada4deabb..1d8573a9b0b 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_REF(on_holder_qdel)) + RegisterSignal(holder, COMSIG_QDELETING, PROC_REF(on_holder_qdel)) if(randomize) randomize() else diff --git a/code/datums/wounds/_wounds.dm b/code/datums/wounds/_wounds.dm index 86e2722e358..49986be64ce 100644 --- a/code/datums/wounds/_wounds.dm +++ b/code/datums/wounds/_wounds.dm @@ -184,11 +184,11 @@ /datum/wound/proc/set_victim(new_victim) if(victim) - UnregisterSignal(victim, COMSIG_PARENT_QDELETING) + UnregisterSignal(victim, COMSIG_QDELETING) remove_wound_from_victim() victim = new_victim if(victim) - RegisterSignal(victim, COMSIG_PARENT_QDELETING, PROC_REF(null_victim)) + RegisterSignal(victim, COMSIG_QDELETING, PROC_REF(null_victim)) /datum/wound/proc/source_died() SIGNAL_HANDLER @@ -243,9 +243,9 @@ return FALSE //Limb can either be a reference to something or `null`. Returning the number variable makes it clear no change was made. . = limb if(limb) - UnregisterSignal(limb, COMSIG_PARENT_QDELETING) + UnregisterSignal(limb, COMSIG_QDELETING) limb = new_value - RegisterSignal(new_value, COMSIG_PARENT_QDELETING, PROC_REF(source_died)) + RegisterSignal(new_value, COMSIG_QDELETING, PROC_REF(source_died)) if(. && disabling) var/obj/item/bodypart/old_limb = . old_limb.remove_traits(list(TRAIT_PARALYSIS, TRAIT_DISABLED_BY_WOUND), REF(src)) diff --git a/code/datums/wounds/scars/_scars.dm b/code/datums/wounds/scars/_scars.dm index 743ac98e730..d8de1ab7752 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_REF(limb_gone)) + RegisterSignal(limb, COMSIG_QDELETING, PROC_REF(limb_gone)) severity = W.severity if(limb.owner) @@ -92,7 +92,7 @@ return limb = BP - RegisterSignal(limb, COMSIG_PARENT_QDELETING, PROC_REF(limb_gone)) + RegisterSignal(limb, COMSIG_QDELETING, PROC_REF(limb_gone)) if(limb.owner) victim = limb.owner if(limb.biological_state != biology) diff --git a/code/datums/wounds/slash.dm b/code/datums/wounds/slash.dm index 53b09b10fdb..88f6eeee0e1 100644 --- a/code/datums/wounds/slash.dm +++ b/code/datums/wounds/slash.dm @@ -48,9 +48,9 @@ /datum/wound/slash/proc/set_highest_scar(datum/scar/new_scar) if(highest_scar) - UnregisterSignal(highest_scar, COMSIG_PARENT_QDELETING) + UnregisterSignal(highest_scar, COMSIG_QDELETING) if(new_scar) - RegisterSignal(new_scar, COMSIG_PARENT_QDELETING, PROC_REF(clear_highest_scar)) + RegisterSignal(new_scar, COMSIG_QDELETING, PROC_REF(clear_highest_scar)) highest_scar = new_scar /datum/wound/slash/proc/clear_highest_scar(datum/source) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 8f484ef43c2..3c6a9cd77bc 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -704,7 +704,7 @@ * Default behaviour is to get the name and icon of the object and it's reagents where * the [TRANSPARENT] flag is set on the reagents holder * - * Produces a signal [COMSIG_PARENT_EXAMINE] + * Produces a signal [COMSIG_ATOM_EXAMINE] */ /atom/proc/examine(mob/user) var/examine_string = get_examine_string(user, thats = TRUE) @@ -726,7 +726,7 @@ if(reagents) var/user_sees_reagents = user.can_see_reagents() - var/reagent_sigreturn = SEND_SIGNAL(src, COMSIG_PARENT_REAGENT_EXAMINE, user, ., user_sees_reagents) + var/reagent_sigreturn = SEND_SIGNAL(src, COMSIG_ATOM_REAGENT_EXAMINE, user, ., user_sees_reagents) if(!(reagent_sigreturn & STOP_GENERIC_REAGENT_EXAMINE)) if(reagents.flags & TRANSPARENT) if(reagents.total_volume > 0) @@ -746,7 +746,7 @@ else . += span_danger("It's empty.") - SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) + SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE, user, .) /** * Called when a mob examines (shift click or verb) this atom twice (or more) within EXAMINE_MORE_WINDOW (default 1 second) @@ -754,14 +754,14 @@ * This is where you can put extra information on something that may be superfluous or not important in critical gameplay * moments, while allowing people to manually double-examine to take a closer look * - * Produces a signal [COMSIG_PARENT_EXAMINE_MORE] + * Produces a signal [COMSIG_ATOM_EXAMINE_MORE] */ /atom/proc/examine_more(mob/user) SHOULD_CALL_PARENT(TRUE) RETURN_TYPE(/list) . = list() - SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE_MORE, user, .) + SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE_MORE, user, .) /** * Updates the appearence of the icon diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index fa1add2c43b..019ade57089 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -709,7 +709,7 @@ GLOBAL_LIST_EMPTY(possible_items) /datum/objective/protect_object/proc/set_target(obj/O) protect_target = O - RegisterSignal(protect_target, COMSIG_PARENT_QDELETING, PROC_REF(on_objective_qdel)) + RegisterSignal(protect_target, COMSIG_QDELETING, PROC_REF(on_objective_qdel)) update_explanation_text() /datum/objective/protect_object/update_explanation_text() diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 65af3ac9c8d..932444e63a8 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -2290,12 +2290,12 @@ /obj/machinery/computer/scan_consolenew/proc/set_connected_scanner(new_scanner) if(connected_scanner) - UnregisterSignal(connected_scanner, COMSIG_PARENT_QDELETING) + UnregisterSignal(connected_scanner, COMSIG_QDELETING) if(connected_scanner.linked_console == src) connected_scanner.set_linked_console(null) connected_scanner = new_scanner if(connected_scanner) - RegisterSignal(connected_scanner, COMSIG_PARENT_QDELETING, PROC_REF(react_to_scanner_del)) + RegisterSignal(connected_scanner, COMSIG_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 0fa013c491b..5eeeb86f3f8 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_REF(unconnect_launchpad)) + RegisterSignal(connected_mechpad, COMSIG_QDELETING, PROC_REF(unconnect_launchpad)) /obj/machinery/computer/mechpad/proc/unconnect_launchpad(obj/machinery/mechpad/pad) SIGNAL_HANDLER @@ -110,12 +110,12 @@ /obj/machinery/computer/mechpad/proc/add_pad(obj/machinery/mechpad/pad) mechpads += pad - RegisterSignal(pad, COMSIG_PARENT_QDELETING, PROC_REF(remove_pad)) + RegisterSignal(pad, COMSIG_QDELETING, PROC_REF(remove_pad)) /obj/machinery/computer/mechpad/proc/remove_pad(obj/machinery/mechpad/pad) SIGNAL_HANDLER mechpads -= pad - UnregisterSignal(pad, COMSIG_PARENT_QDELETING) + UnregisterSignal(pad, COMSIG_QDELETING) /** * Tries to call the launch proc on the connected mechpad, returns if unavailable diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 0449acce128..dbcb36ff3cf 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -148,10 +148,10 @@ //This is only called by the scanner. if you ever want to use this outside of that context you'll need to refactor things a bit /obj/machinery/dna_scannernew/proc/set_linked_console(new_console) if(linked_console) - UnregisterSignal(linked_console, COMSIG_PARENT_QDELETING) + UnregisterSignal(linked_console, COMSIG_QDELETING) linked_console = new_console if(linked_console) - RegisterSignal(linked_console, COMSIG_PARENT_QDELETING, PROC_REF(react_to_console_del)) + RegisterSignal(linked_console, COMSIG_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/door.dm b/code/game/machinery/doors/door.dm index 276fe6875fa..39691a77632 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -309,7 +309,7 @@ else if(weapon.item_flags & NOBLUDGEON || user.combat_mode) return ..() else if(!user.combat_mode && istype(weapon, /obj/item/stack/sheet/mineral/wood)) - return ..() // we need this so our can_barricade element can be called using COMSIG_PARENT_ATTACKBY + return ..() // we need this so our can_barricade element can be called using COMSIG_ATOM_ATTACKBY else if(try_to_activate_door(user)) return TRUE return ..() diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 66066bb11de..526ed3df3ab 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -543,7 +543,7 @@ return 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)) + RegisterSignal(user, COMSIG_QDELETING, PROC_REF(handle_held_open_adjacency)) handle_held_open_adjacency(user) else close() @@ -570,7 +570,7 @@ correct_state() UnregisterSignal(user, COMSIG_MOVABLE_MOVED) UnregisterSignal(user, COMSIG_LIVING_SET_BODY_POSITION) - UnregisterSignal(user, COMSIG_PARENT_QDELETING) + UnregisterSignal(user, COMSIG_QDELETING) if(user) user.balloon_alert_to_viewers("released [src]", "released [src]") diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index c7a1542180c..d474998081b 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -183,7 +183,7 @@ DEFINE_BITFIELD(turret_flags, list( turret_gun.forceMove(src) stored_gun = turret_gun - RegisterSignal(stored_gun, COMSIG_PARENT_QDELETING, PROC_REF(null_gun)) + RegisterSignal(stored_gun, COMSIG_QDELETING, PROC_REF(null_gun)) var/list/gun_properties = stored_gun.get_turret_properties() //required properties diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 121954ab71c..8bc9a6c5401 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -193,7 +193,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_REF(on_my_card_deleted)) + RegisterSignal(my_card, COMSIG_QDELETING, PROC_REF(on_my_card_deleted)) to_chat(user, span_notice("You link the wheel to your account.")) power_change() return diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 8491dc53c16..e93db63c631 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -361,7 +361,7 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) 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_REF(pre_move)) RegisterSignal(loop, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(post_move)) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(loop_done)) + RegisterSignal(loop, COMSIG_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 242f8395bb0..a7f8f141a2e 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -436,7 +436,7 @@ qdel(src) return - RegisterSignal(hotspot, COMSIG_PARENT_QDELETING, PROC_REF(burn_process)) + RegisterSignal(hotspot, COMSIG_QDELETING, PROC_REF(burn_process)) /** * Ignites other oil pools around itself. diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index 8fb5d73807e..9d2d13f9925 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_REF(decrement_total_effect)) + RegisterSignal(loop, COMSIG_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 550c53c9c1a..231feb2ec3d 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_REF(end_particle)) + RegisterSignal(loop, COMSIG_QDELETING, PROC_REF(end_particle)) /obj/effect/particle_effect/expl_particles/proc/end_particle(datum/source) SIGNAL_HANDLER diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm index 731f91e907c..2edca60a320 100644 --- a/code/game/objects/effects/effect_system/effects_water.dm +++ b/code/game/objects/effects/effect_system/effects_water.dm @@ -40,7 +40,7 @@ /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_REF(post_forcemove)) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(movement_stopped)) + RegisterSignal(loop, COMSIG_QDELETING, PROC_REF(movement_stopped)) return loop /obj/effect/particle_effect/water/extinguisher/proc/post_forcemove(datum/move_loop/source, success) @@ -65,7 +65,7 @@ /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_REF(post_forcemove)) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(movement_stopped)) + RegisterSignal(loop, COMSIG_QDELETING, PROC_REF(movement_stopped)) return loop ///////////////////////////////////////////// diff --git a/code/game/objects/effects/particle_holder.dm b/code/game/objects/effects/particle_holder.dm index 56b99904a01..c9d902ca076 100644 --- a/code/game/objects/effects/particle_holder.dm +++ b/code/game/objects/effects/particle_holder.dm @@ -22,7 +22,7 @@ var/atom/movable/lie_about_areas = loc lie_about_areas.vis_contents += src if(!ismovable(loc)) - RegisterSignal(loc, COMSIG_PARENT_QDELETING, PROC_REF(immovable_deleted)) + RegisterSignal(loc, COMSIG_QDELETING, PROC_REF(immovable_deleted)) if(particle_flags & PARTICLE_ATTACH_MOB) RegisterSignal(loc, COMSIG_MOVABLE_MOVED, PROC_REF(on_move)) diff --git a/code/game/objects/effects/poster_motivational.dm b/code/game/objects/effects/poster_motivational.dm index d8b80d1c46a..12c22a30fbf 100644 --- a/code/game/objects/effects/poster_motivational.dm +++ b/code/game/objects/effects/poster_motivational.dm @@ -77,7 +77,7 @@ /datum/proximity_monitor/advanced/quirk_posters/New(atom/_host, range, _ignore_if_not_on_turf = TRUE, department) . = ..() src.department = department - RegisterSignal(host, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(host, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/proximity_monitor/advanced/quirk_posters/field_turf_crossed(atom/movable/crossed, turf/location) if (!isliving(crossed) || !can_see(crossed, host, current_range)) diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 2a295c3eabd..a014857994a 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -73,7 +73,7 @@ var/datum/move_loop/loop = SSmove_manager.move(AM, direction, speed, tiles ? tiles * speed : INFINITY) 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)) + RegisterSignal(loop, COMSIG_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/items.dm b/code/game/objects/items.dm index acef5c01b33..c4f29deefe2 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -293,7 +293,7 @@ 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_REF(on_action_deleted)) + RegisterSignal(action, COMSIG_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 @@ -307,7 +307,7 @@ if(!action) return - UnregisterSignal(action, COMSIG_PARENT_QDELETING) + UnregisterSignal(action, COMSIG_QDELETING) LAZYREMOVE(actions, action) qdel(action) diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index 17b26159dfd..88a3a98a5bb 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_REF(owner_deleted)) + RegisterSignal(owner, COMSIG_QDELETING, PROC_REF(owner_deleted)) /obj/item/toy/plush/carpplushie/dehy_carp/plop(obj/item/toy/plush/Daddy) return FALSE @@ -69,5 +69,5 @@ /obj/item/toy/plush/carpplushie/dehy_carp/proc/owner_deleted(datum/source) SIGNAL_HANDLER - UnregisterSignal(owner, COMSIG_PARENT_QDELETING) + UnregisterSignal(owner, COMSIG_QDELETING) owner = null diff --git a/code/game/objects/items/food/salad.dm b/code/game/objects/items/food/salad.dm index 1d565060755..ebbccd53af1 100644 --- a/code/game/objects/items/food/salad.dm +++ b/code/game/objects/items/food/salad.dm @@ -178,7 +178,7 @@ /obj/item/reagent_containers/cup/bowl/Initialize(mapload) . = ..() - RegisterSignal(src, COMSIG_PARENT_REAGENT_EXAMINE, PROC_REF(reagent_special_examine)) + RegisterSignal(src, COMSIG_ATOM_REAGENT_EXAMINE, PROC_REF(reagent_special_examine)) AddElement(/datum/element/foodlike_drink) AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/salad/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 6) AddComponent( \ diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index e6cdafbac3a..b136fc68cda 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -22,16 +22,16 @@ var/mob/living/owner = loc if(!istype(owner)) return - RegisterSignal(owner, COMSIG_PARENT_EXAMINE, PROC_REF(ownerExamined)) + RegisterSignal(owner, COMSIG_ATOM_EXAMINE, PROC_REF(ownerExamined)) /obj/item/hand_item/circlegame/Destroy() var/mob/owner = loc if(istype(owner)) - UnregisterSignal(owner, COMSIG_PARENT_EXAMINE) + UnregisterSignal(owner, COMSIG_ATOM_EXAMINE) return ..() /obj/item/hand_item/circlegame/dropped(mob/user) - UnregisterSignal(user, COMSIG_PARENT_EXAMINE) //loc will have changed by the time this is called, so Destroy() can't catch it + UnregisterSignal(user, COMSIG_ATOM_EXAMINE) //loc will have changed by the time this is called, so Destroy() can't catch it // this is a dropdel item. return ..() diff --git a/code/game/objects/items/implants/implant_deathrattle.dm b/code/game/objects/items/implants/implant_deathrattle.dm index 90e75cf66a1..64f85c020c8 100644 --- a/code/game/objects/items/implants/implant_deathrattle.dm +++ b/code/game/objects/items/implants/implant_deathrattle.dm @@ -22,7 +22,7 @@ return 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)) + RegisterSignal(implant, COMSIG_QDELETING, PROC_REF(on_implant_destruction)) implants += implant diff --git a/code/game/objects/items/melee/baton.dm b/code/game/objects/items/melee/baton.dm index 33432093df0..f315d090fb2 100644 --- a/code/game/objects/items/melee/baton.dm +++ b/code/game/objects/items/melee/baton.dm @@ -438,7 +438,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_REF(convert)) + RegisterSignal(src, COMSIG_ATOM_ATTACKBY, PROC_REF(convert)) update_appearance() /obj/item/melee/baton/security/get_cell() @@ -456,7 +456,7 @@ /obj/item/melee/baton/security/Destroy() if(cell) QDEL_NULL(cell) - UnregisterSignal(src, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(src, COMSIG_ATOM_ATTACKBY) return ..() /obj/item/melee/baton/security/proc/convert(datum/source, obj/item/item, mob/user) diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 33e23d48301..4deb6aeb58a 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() - RegisterSignals(defib_instance, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED), PROC_REF(on_defib_instance_qdel_or_moved)) + RegisterSignals(defib_instance, list(COMSIG_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/stacks/golem_food/golem_status_effects.dm b/code/game/objects/items/stacks/golem_food/golem_status_effects.dm index f6ebd7ef7d2..84e6e280c0c 100644 --- a/code/game/objects/items/stacks/golem_food/golem_status_effects.dm +++ b/code/game/objects/items/stacks/golem_food/golem_status_effects.dm @@ -295,7 +295,7 @@ arm.unarmed_attack_effect = ATTACK_EFFECT_CLAW arm.unarmed_attack_sound = 'sound/weapons/slash.ogg' arm.unarmed_miss_sound = 'sound/weapons/slashmiss.ogg' - RegisterSignal(arm, COMSIG_PARENT_QDELETING, PROC_REF(on_arm_destroyed)) + RegisterSignal(arm, COMSIG_QDELETING, PROC_REF(on_arm_destroyed)) LAZYADD(modified_arms, arm) /datum/status_effect/golem/diamond/on_remove() @@ -315,7 +315,7 @@ arm.unarmed_attack_effect = initial(arm.unarmed_attack_effect) arm.unarmed_attack_sound = initial(arm.unarmed_attack_sound) arm.unarmed_miss_sound = initial(arm.unarmed_miss_sound) - UnregisterSignal(arm, COMSIG_PARENT_QDELETING) + UnregisterSignal(arm, COMSIG_QDELETING) /// Remove references to deleted arms /datum/status_effect/golem/diamond/proc/on_arm_destroyed(obj/item/bodypart/arm/arm) @@ -365,7 +365,7 @@ arm.unarmed_damage_low += damage_increase arm.unarmed_damage_high += damage_increase arm.unarmed_stun_threshold += damage_increase // We don't want to make knockdown more likely - RegisterSignal(arm, COMSIG_PARENT_QDELETING, PROC_REF(on_arm_destroyed)) + RegisterSignal(arm, COMSIG_QDELETING, PROC_REF(on_arm_destroyed)) LAZYADD(modified_arms, arm) /datum/status_effect/golem/titanium/on_remove() @@ -384,7 +384,7 @@ arm.unarmed_damage_low -= damage_increase arm.unarmed_damage_high -= damage_increase arm.unarmed_stun_threshold -= damage_increase - UnregisterSignal(arm, COMSIG_PARENT_QDELETING) + UnregisterSignal(arm, COMSIG_QDELETING) /// Remove references to deleted arms /datum/status_effect/golem/titanium/proc/on_arm_destroyed(obj/item/bodypart/arm/arm) diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index e2ddc23dcf5..a126f264150 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -316,7 +316,7 @@ 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_REF(resin_stop_check)) - RegisterSignal(loop, COMSIG_PARENT_QDELETING, PROC_REF(resin_landed)) + RegisterSignal(loop, COMSIG_QDELETING, PROC_REF(resin_landed)) return if(nozzle_mode == RESIN_FOAM) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 59415cf3515..5abe8facbc3 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -256,8 +256,8 @@ var/obj/effect/portal/portal1 = created[1] var/obj/effect/portal/portal2 = created[2] - RegisterSignal(portal1, COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy)) - RegisterSignal(portal2, COMSIG_PARENT_QDELETING, PROC_REF(on_portal_destroy)) + RegisterSignal(portal1, COMSIG_QDELETING, PROC_REF(on_portal_destroy)) + RegisterSignal(portal2, COMSIG_QDELETING, PROC_REF(on_portal_destroy)) try_move_adjacent(portal1, user.dir) active_portal_pairs[portal1] = portal2 diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index d5d1da22508..925387aaa91 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -186,7 +186,7 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag) SIGNAL_HANDLER if(!machine) return - UnregisterSignal(machine, COMSIG_PARENT_QDELETING) + UnregisterSignal(machine, COMSIG_QDELETING) machine.on_unset_machine(src) machine = null @@ -198,7 +198,7 @@ GLOBAL_LIST_EMPTY(objects_by_id_tag) if(machine) unset_machine() machine = O - RegisterSignal(O, COMSIG_PARENT_QDELETING, PROC_REF(unset_machine)) + RegisterSignal(O, COMSIG_QDELETING, PROC_REF(unset_machine)) if(istype(O)) O.obj_flags |= IN_USE diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index ef7b9fcc3e7..1ef893ebf27 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -170,7 +170,7 @@ /obj/structure/alien/weeds/Destroy() if(parent_node) - UnregisterSignal(parent_node, COMSIG_PARENT_QDELETING) + UnregisterSignal(parent_node, COMSIG_QDELETING) parent_node = null return ..() @@ -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_REF(after_parent_destroyed)) + check_weed.RegisterSignal(parent_node, COMSIG_QDELETING, PROC_REF(after_parent_destroyed)) /** * Called when the parent node is destroyed @@ -236,7 +236,7 @@ if(new_parent == previous_node) continue parent_node = new_parent - RegisterSignal(parent_node, COMSIG_PARENT_QDELETING, PROC_REF(after_parent_destroyed)) + RegisterSignal(parent_node, COMSIG_QDELETING, PROC_REF(after_parent_destroyed)) return parent_node return FALSE diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 4a9accebc19..c8beb2f0469 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -97,7 +97,7 @@ LINEN BINS RegisterSignal(src, COMSIG_ITEM_PICKUP, PROC_REF(on_pickup)) RegisterSignal(sleeper, COMSIG_MOVABLE_MOVED, PROC_REF(smooth_sheets)) RegisterSignal(sleeper, COMSIG_LIVING_SET_BODY_POSITION, PROC_REF(smooth_sheets)) - RegisterSignal(sleeper, COMSIG_PARENT_QDELETING, PROC_REF(smooth_sheets)) + RegisterSignal(sleeper, COMSIG_QDELETING, PROC_REF(smooth_sheets)) /obj/item/bedsheet/proc/smooth_sheets(mob/living/sleeper) SIGNAL_HANDLER @@ -105,7 +105,7 @@ LINEN BINS UnregisterSignal(src, COMSIG_ITEM_PICKUP) UnregisterSignal(sleeper, COMSIG_MOVABLE_MOVED) UnregisterSignal(sleeper, COMSIG_LIVING_SET_BODY_POSITION) - UnregisterSignal(sleeper, COMSIG_PARENT_QDELETING) + UnregisterSignal(sleeper, COMSIG_QDELETING) balloon_alert(sleeper, "smoothed sheets") layer = initial(layer) SET_PLANE_IMPLICIT(src, initial(plane)) @@ -121,7 +121,7 @@ LINEN BINS UnregisterSignal(src, COMSIG_ITEM_PICKUP) UnregisterSignal(sleeper, COMSIG_MOVABLE_MOVED) UnregisterSignal(sleeper, COMSIG_LIVING_SET_BODY_POSITION) - UnregisterSignal(sleeper, COMSIG_PARENT_QDELETING) + UnregisterSignal(sleeper, COMSIG_QDELETING) signal_sleeper = null /obj/item/bedsheet/attackby(obj/item/I, mob/user, params) diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm index ca7b6403011..8f2d2f6f3b4 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_REF(on_attached_delete)) + RegisterSignal(attached_item, COMSIG_QDELETING, PROC_REF(on_attached_delete)) handle_density() /** @@ -143,7 +143,7 @@ */ /obj/structure/training_machine/proc/on_attached_delete() SIGNAL_HANDLER - UnregisterSignal(attached_item, COMSIG_PARENT_QDELETING) + UnregisterSignal(attached_item, COMSIG_QDELETING) vis_contents -= attached_item attached_item.vis_flags &= ~(VIS_INHERIT_ID | VIS_INHERIT_PLANE) attached_item = null @@ -162,7 +162,7 @@ if (!attached_item) return if (istype(attached_item, /obj/item/storage/toolbox/syndicate)) - UnregisterSignal(attached_item, COMSIG_PARENT_QDELETING) + UnregisterSignal(attached_item, COMSIG_QDELETING) qdel(attached_item) else if (user) INVOKE_ASYNC(user, TYPE_PROC_REF(/mob, put_in_hands), attached_item) 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 f94e03dc36a..fa52db037e2 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -103,7 +103,7 @@ 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_REF(before_pipe_transfer)) RegisterSignal(engine, COMSIG_MOVELOOP_POSTPROCESS, PROC_REF(after_pipe_transfer)) - RegisterSignal(engine, COMSIG_PARENT_QDELETING, PROC_REF(engine_finish)) + RegisterSignal(engine, COMSIG_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/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index 68395f911d6..37ff89cb844 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -98,15 +98,15 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( changing_turf = TRUE qdel(src) //Just get the side effects and call Destroy //We do this here so anything that doesn't want to persist can clear itself - var/list/old_comp_lookup = _comp_lookup?.Copy() + var/list/old_listen_lookup = _listen_lookup?.Copy() var/list/old_signal_procs = _signal_procs?.Copy() var/turf/new_turf = new path(src) // WARNING WARNING // Turfs DO NOT lose their signals when they get replaced, REMEMBER THIS // It's possible because turfs are fucked, and if you have one in a list and it's replaced with another one, the list ref points to the new turf - if(old_comp_lookup) - LAZYOR(new_turf._comp_lookup, old_comp_lookup) + if(old_listen_lookup) + LAZYOR(new_turf._listen_lookup, old_listen_lookup) if(old_signal_procs) LAZYOR(new_turf._signal_procs, old_signal_procs) diff --git a/code/game/turfs/open/asteroid.dm b/code/game/turfs/open/asteroid.dm index c3f32160f41..526bdf9cfca 100644 --- a/code/game/turfs/open/asteroid.dm +++ b/code/game/turfs/open/asteroid.dm @@ -99,7 +99,7 @@ return TRUE else if(istype(W, /obj/item/storage/bag/ore)) for(var/obj/item/stack/ore/O in src) - SEND_SIGNAL(W, COMSIG_PARENT_ATTACKBY, O) + SEND_SIGNAL(W, COMSIG_ATOM_ATTACKBY, O) /turf/open/floor/plating/lavaland_baseturf diff --git a/code/modules/admin/greyscale_modify_menu.dm b/code/modules/admin/greyscale_modify_menu.dm index 59803f23b2d..e9936723f78 100644 --- a/code/modules/admin/greyscale_modify_menu.dm +++ b/code/modules/admin/greyscale_modify_menu.dm @@ -58,7 +58,7 @@ ReadColorsFromString(starting_colors || target?.greyscale_colors) if(target) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(ui_close)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(ui_close)) refresh_preview() diff --git a/code/modules/admin/tag.dm b/code/modules/admin/tag.dm index 432894e3b3f..27a440e5461 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_REF(handle_tagged_del), override = TRUE) + RegisterSignal(target_datum, COMSIG_QDELETING, PROC_REF(handle_tagged_del), override = TRUE) to_chat(owner, span_notice("[target_datum] has been tagged.")) /// Get ahead of the curve with deleting diff --git a/code/modules/admin/verbs/lua/_wrappers.dm b/code/modules/admin/verbs/lua/_wrappers.dm index d21a0aca99c..d77d02de4ee 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, TYPE_PROC_REF(/datum, lua_reference_cleanup), override = TRUE) + ret_datum.RegisterSignal(ret_datum, COMSIG_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, TYPE_PROC_REF(/datum, lua_reference_cleanup), override = TRUE) + ret_datum.RegisterSignal(ret_datum, COMSIG_QDELETING, TYPE_PROC_REF(/datum, lua_reference_cleanup), override = TRUE) return ret /proc/wrap_lua_print(state_id, list/arguments) diff --git a/code/modules/admin/view_variables/mark_datum.dm b/code/modules/admin/view_variables/mark_datum.dm index b7296f2553a..44c3b2b83b2 100644 --- a/code/modules/admin/view_variables/mark_datum.dm +++ b/code/modules/admin/view_variables/mark_datum.dm @@ -2,10 +2,10 @@ if(!holder) return if(holder.marked_datum) - holder.UnregisterSignal(holder.marked_datum, COMSIG_PARENT_QDELETING) + holder.UnregisterSignal(holder.marked_datum, COMSIG_QDELETING) vv_update_display(holder.marked_datum, "marked", "") holder.marked_datum = D - holder.RegisterSignal(holder.marked_datum, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum/admins, handle_marked_del)) + holder.RegisterSignal(holder.marked_datum, COMSIG_QDELETING, TYPE_PROC_REF(/datum/admins, handle_marked_del)) vv_update_display(D, "marked", VV_MSG_MARKED) /client/proc/mark_datum_mapview(datum/D as mob|obj|turf|area in view(view)) @@ -15,5 +15,5 @@ /datum/admins/proc/handle_marked_del(datum/source) SIGNAL_HANDLER - UnregisterSignal(marked_datum, COMSIG_PARENT_QDELETING) + UnregisterSignal(marked_datum, COMSIG_QDELETING) marked_datum = null diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 531ca4dc8ca..49a6d2b2bdb 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -351,7 +351,7 @@ return UnregisterSignal(target, COMSIG_MIND_TRANSFERRED) if(target.current) - UnregisterSignal(target.current, list(COMSIG_PARENT_QDELETING, COMSIG_MOB_MIND_TRANSFERRED_INTO)) + UnregisterSignal(target.current, list(COMSIG_QDELETING, COMSIG_MOB_MIND_TRANSFERRED_INTO)) target = null /datum/objective/sacrifice/find_target(dupe_search_range, list/blacklist) @@ -375,7 +375,7 @@ // 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_REF(on_mind_transfer)) - RegisterSignal(target.current, COMSIG_PARENT_QDELETING, PROC_REF(on_target_body_del)) + RegisterSignal(target.current, COMSIG_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!") @@ -397,13 +397,13 @@ if(!isliving(target.current)) 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_REF(on_target_body_del)) + UnregisterSignal(previous_body, list(COMSIG_QDELETING, COMSIG_MOB_MIND_TRANSFERRED_INTO)) + RegisterSignal(target.current, COMSIG_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)) + UnregisterSignal(target.current, list(COMSIG_QDELETING, COMSIG_MOB_MIND_TRANSFERRED_INTO)) //we check if the mind is bodyless only after mindswap shenanigeans to avoid issues. addtimer(CALLBACK(src, PROC_REF(do_we_have_a_body)), 0 SECONDS) @@ -411,7 +411,7 @@ 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_REF(on_target_body_del)) + RegisterSignal(target.current, COMSIG_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() @@ -521,7 +521,7 @@ deltimer(blood_target_reset_timer) blood_target = new_target - RegisterSignal(blood_target, COMSIG_PARENT_QDELETING, PROC_REF(unset_blood_target_and_timer)) + RegisterSignal(blood_target, COMSIG_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) @@ -559,7 +559,7 @@ to_chat(cultist.current, span_bold(span_cultlarge("The blood mark has expired!"))) cultist.current.client.images -= blood_target_image - UnregisterSignal(blood_target, COMSIG_PARENT_QDELETING) + UnregisterSignal(blood_target, COMSIG_QDELETING) blood_target = null QDEL_NULL(blood_target_image) diff --git a/code/modules/antagonists/heretic/heretic_antag.dm b/code/modules/antagonists/heretic/heretic_antag.dm index b8d4e7feb4b..8d75a1d9b2f 100644 --- a/code/modules/antagonists/heretic/heretic_antag.dm +++ b/code/modules/antagonists/heretic/heretic_antag.dm @@ -407,7 +407,7 @@ target_image.overlays = target.overlays LAZYSET(sac_targets, target, target_image) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_deleted)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(on_target_deleted)) /** * Removes [target] from the heretic's sacrifice list. @@ -418,11 +418,11 @@ return FALSE LAZYREMOVE(sac_targets, target) - UnregisterSignal(target, COMSIG_PARENT_QDELETING) + UnregisterSignal(target, COMSIG_QDELETING) return TRUE /** - * Signal proc for [COMSIG_PARENT_QDELETING] registered on sac targets + * Signal proc for [COMSIG_QDELETING] registered on sac targets * if sacrifice targets are deleted (gibbed, dusted, whatever), free their slot and reference */ /datum/antagonist/heretic/proc/on_target_deleted(mob/living/carbon/human/source) diff --git a/code/modules/antagonists/heretic/heretic_focus.dm b/code/modules/antagonists/heretic/heretic_focus.dm index d6faf2577c2..b7c79b6d6ca 100644 --- a/code/modules/antagonists/heretic/heretic_focus.dm +++ b/code/modules/antagonists/heretic/heretic_focus.dm @@ -7,7 +7,7 @@ if(!isitem(target)) return ELEMENT_INCOMPATIBLE - RegisterSignal(target, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(target, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(target, COMSIG_ITEM_EQUIPPED, PROC_REF(on_equip)) RegisterSignal(target, COMSIG_ITEM_DROPPED, PROC_REF(on_drop)) @@ -20,12 +20,12 @@ /datum/element/heretic_focus/Detach(obj/item/source) . = ..() - UnregisterSignal(source, list(COMSIG_PARENT_EXAMINE, COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) + UnregisterSignal(source, list(COMSIG_ATOM_EXAMINE, COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) if(isliving(source.loc)) REMOVE_TRAIT(source.loc, TRAIT_ALLOW_HERETIC_CASTING, ELEMENT_TRAIT(source)) /** - * Signal proc for [COMSIG_PARENT_EXAMINE]. + * Signal proc for [COMSIG_ATOM_EXAMINE]. * Let's the examiner see that this item is a heretic focus */ /datum/element/heretic_focus/proc/on_examine(obj/item/source, mob/user, list/examine_list) diff --git a/code/modules/antagonists/heretic/influences.dm b/code/modules/antagonists/heretic/influences.dm index d24a1b6e637..97786c60e4c 100644 --- a/code/modules/antagonists/heretic/influences.dm +++ b/code/modules/antagonists/heretic/influences.dm @@ -254,16 +254,16 @@ being_drained = TRUE balloon_alert(user, "draining influence...") - RegisterSignal(user, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(user, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) if(!do_after(user, 10 SECONDS, src)) being_drained = FALSE balloon_alert(user, "interrupted!") - UnregisterSignal(user, COMSIG_PARENT_EXAMINE) + UnregisterSignal(user, COMSIG_ATOM_EXAMINE) return // We don't need to set being_drained back since we delete after anyways - UnregisterSignal(user, COMSIG_PARENT_EXAMINE) + UnregisterSignal(user, COMSIG_ATOM_EXAMINE) balloon_alert(user, "influence drained") var/datum/antagonist/heretic/heretic_datum = IS_HERETIC(user) @@ -287,7 +287,7 @@ qdel(src) /* - * Signal proc for [COMSIG_PARENT_EXAMINE], registered on the user draining the influence. + * Signal proc for [COMSIG_ATOM_EXAMINE], registered on the user draining the influence. * * Gives a chance for examiners to see that the heretic is interacting with an infuence. */ diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm index 5e3bfb438a6..bbaf6014821 100644 --- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm @@ -253,7 +253,7 @@ /datum/heretic_knowledge/duel_stance/on_gain(mob/user, datum/antagonist/heretic/our_heretic) ADD_TRAIT(user, TRAIT_NODISMEMBER, type) - RegisterSignal(user, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(user, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(user, COMSIG_CARBON_GAIN_WOUND, PROC_REF(on_wound_gain)) RegisterSignal(user, COMSIG_LIVING_HEALTH_UPDATE, PROC_REF(on_health_update)) @@ -264,7 +264,7 @@ if(in_duelist_stance) user.remove_traits(list(TRAIT_HARDLY_WOUNDED, TRAIT_BATON_RESISTANCE), type) - UnregisterSignal(user, list(COMSIG_PARENT_EXAMINE, COMSIG_CARBON_GAIN_WOUND, COMSIG_LIVING_HEALTH_UPDATE)) + UnregisterSignal(user, list(COMSIG_ATOM_EXAMINE, COMSIG_CARBON_GAIN_WOUND, COMSIG_LIVING_HEALTH_UPDATE)) /datum/heretic_knowledge/duel_stance/proc/on_examine(mob/living/source, mob/user, list/examine_list) SIGNAL_HANDLER diff --git a/code/modules/antagonists/heretic/magic/furious_steel.dm b/code/modules/antagonists/heretic/magic/furious_steel.dm index f4e8596fbba..b1becf5c63c 100644 --- a/code/modules/antagonists/heretic/magic/furious_steel.dm +++ b/code/modules/antagonists/heretic/magic/furious_steel.dm @@ -63,12 +63,12 @@ // Delete existing if(blade_effect) stack_trace("[type] had an existing blade effect in on_activation. This might be an exploit, and should be investigated.") - UnregisterSignal(blade_effect, COMSIG_PARENT_QDELETING) + UnregisterSignal(blade_effect, COMSIG_QDELETING) QDEL_NULL(blade_effect) 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_REF(on_status_effect_deleted)) + RegisterSignal(blade_effect, COMSIG_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/shadow_cloak.dm b/code/modules/antagonists/heretic/magic/shadow_cloak.dm index af7bf9d9493..55927fd722f 100644 --- a/code/modules/antagonists/heretic/magic/shadow_cloak.dm +++ b/code/modules/antagonists/heretic/magic/shadow_cloak.dm @@ -73,12 +73,12 @@ ) active_cloak = cast_on.apply_status_effect(/datum/status_effect/shadow_cloak) - RegisterSignal(active_cloak, COMSIG_PARENT_QDELETING, PROC_REF(on_early_cloak_loss)) + RegisterSignal(active_cloak, COMSIG_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)) - UnregisterSignal(active_cloak, COMSIG_PARENT_QDELETING) + UnregisterSignal(active_cloak, COMSIG_QDELETING) qdel(active_cloak) active_cloak = null @@ -94,7 +94,7 @@ deltimer(uncloak_timer) uncloak_timer = null -/// Signal proc for [COMSIG_PARENT_QDELETING], if our cloak is deleted early, impart negative effects +/// Signal proc for [COMSIG_QDELETING], if our cloak is deleted early, impart negative effects /datum/action/cooldown/spell/shadow_cloak/proc/on_early_cloak_loss(datum/status_effect/source) SIGNAL_HANDLER diff --git a/code/modules/antagonists/heretic/magic/star_touch.dm b/code/modules/antagonists/heretic/magic/star_touch.dm index f7fe11ea08f..4ce65676069 100644 --- a/code/modules/antagonists/heretic/magic/star_touch.dm +++ b/code/modules/antagonists/heretic/magic/star_touch.dm @@ -192,7 +192,7 @@ current_target = target active = TRUE current_beam = user.Beam(current_target, icon_state="cosmic_beam", time = 1 MINUTES, maxdistance = max_range, beam_type = /obj/effect/ebeam/cosmic) - RegisterSignal(current_beam, COMSIG_PARENT_QDELETING, PROC_REF(beam_died)) + RegisterSignal(current_beam, COMSIG_QDELETING, PROC_REF(beam_died)) SSblackbox.record_feedback("tally", "gun_fired", 1, type) if(current_target) diff --git a/code/modules/antagonists/heretic/status_effects/buffs.dm b/code/modules/antagonists/heretic/status_effects/buffs.dm index 17d0eb9a5bd..f1852ff07f9 100644 --- a/code/modules/antagonists/heretic/status_effects/buffs.dm +++ b/code/modules/antagonists/heretic/status_effects/buffs.dm @@ -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_REF(remove_blade)) + RegisterSignal(blade, COMSIG_QDELETING, PROC_REF(remove_blade)) playsound(get_turf(owner), 'sound/items/unsheath.ogg', 33, TRUE) /// Signal proc for [COMSIG_HUMAN_CHECK_SHIELDS]. diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm index 0d0ead89b6f..00f3c7effab 100644 --- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm +++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm @@ -16,7 +16,7 @@ var/disguise = "engineer" var/mob/listeningTo var/static/list/signalCache = list( // list here all signals that should break the camouflage - COMSIG_PARENT_ATTACKBY, + COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_MOVABLE_IMPACT_ZONE, COMSIG_ATOM_BULLET_ACT, diff --git a/code/modules/antagonists/revenant/haunted_item.dm b/code/modules/antagonists/revenant/haunted_item.dm index 7692d8d29f5..8973139f51e 100644 --- a/code/modules/antagonists/revenant/haunted_item.dm +++ b/code/modules/antagonists/revenant/haunted_item.dm @@ -75,10 +75,10 @@ return ..() /datum/component/haunted_item/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_hit_by_holy_tool)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_hit_by_holy_tool)) /datum/component/haunted_item/UnregisterFromParent() - UnregisterSignal(parent, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(parent, COMSIG_ATOM_ATTACKBY) /// Removes the haunting, showing any despawn message we have and qdeling our component /datum/component/haunted_item/proc/clear_haunting() @@ -89,7 +89,7 @@ qdel(src) -/// Signal proc for [COMSIG_PARENT_ATTACKBY], when we get smacked by holy stuff we should stop being ghostly. +/// Signal proc for [COMSIG_ATOM_ATTACKBY], when we get smacked by holy stuff we should stop being ghostly. /datum/component/haunted_item/proc/on_hit_by_holy_tool(obj/item/source, obj/item/attacking_item, mob/living/attacker, params) SIGNAL_HANDLER diff --git a/code/modules/antagonists/space_dragon/space_dragon.dm b/code/modules/antagonists/space_dragon/space_dragon.dm index 25fb005ca61..7c49bed6b95 100644 --- a/code/modules/antagonists/space_dragon/space_dragon.dm +++ b/code/modules/antagonists/space_dragon/space_dragon.dm @@ -90,7 +90,7 @@ speech_action_icon = 'icons/mob/actions/actions_space_dragon.dmi', \ speech_action_icon_state = "wavespeak", \ ) - RegisterSignal(wavespeak, COMSIG_PARENT_QDELETING, PROC_REF(clear_wavespeak)) + RegisterSignal(wavespeak, COMSIG_QDELETING, PROC_REF(clear_wavespeak)) /datum/antagonist/space_dragon/remove_innate_effects(mob/living/mob_override) var/mob/living/antag = mob_override || owner.current diff --git a/code/modules/antagonists/traitor/components/demoraliser.dm b/code/modules/antagonists/traitor/components/demoraliser.dm index beab862e876..47cdae620f4 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_REF(on_examine)) + RegisterSignal(host, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /datum/proximity_monitor/advanced/demoraliser/field_turf_crossed(atom/movable/crossed, turf/location) if (!isliving(crossed)) @@ -21,7 +21,7 @@ on_seen(crossed) /* - * Signal proc for [COMSIG_PARENT_EXAMINE]. + * Signal proc for [COMSIG_ATOM_EXAMINE]. * Immediately tries to apply a mood to the examiner, ignoring the proximity check. * If someone wants to make themselves sad through a camera that's their choice I guess. */ 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 2eef6b96cb2..01d1febb9ac 100644 --- a/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm +++ b/code/modules/antagonists/traitor/components/traitor_objective_mind_tracker.dm @@ -18,7 +18,7 @@ /datum/component/traitor_objective_mind_tracker/RegisterWithParent() RegisterSignal(target, COMSIG_MIND_TRANSFERRED, PROC_REF(handle_mind_transferred)) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(delete_self)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(delete_self)) RegisterSignals(parent, list(COMSIG_TRAITOR_OBJECTIVE_COMPLETED, COMSIG_TRAITOR_OBJECTIVE_FAILED), PROC_REF(delete_self)) handle_mind_transferred(target) diff --git a/code/modules/antagonists/traitor/objectives/assassination.dm b/code/modules/antagonists/traitor/objectives/assassination.dm index 8e3320d0e96..4efcbb111be 100644 --- a/code/modules/antagonists/traitor/objectives/assassination.dm +++ b/code/modules/antagonists/traitor/objectives/assassination.dm @@ -94,7 +94,7 @@ RegisterSignal(card, COMSIG_ITEM_EQUIPPED, PROC_REF(on_card_planted)) AddComponent(/datum/component/traitor_objective_register, card, \ succeed_signals = null, \ - fail_signals = list(COMSIG_PARENT_QDELETING), \ + fail_signals = list(COMSIG_QDELETING), \ penalty = TRUE) /datum/traitor_objective/target_player/assassinate/calling_card/proc/on_card_planted(datum/source, mob/living/equipper, slot) @@ -111,10 +111,10 @@ . = ..() if(!.) //didn't generate return FALSE - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdeleted)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(on_target_qdeleted)) /datum/traitor_objective/target_player/assassinate/calling_card/ungenerate_objective() - UnregisterSignal(target, COMSIG_PARENT_QDELETING) + UnregisterSignal(target, COMSIG_QDELETING) . = ..() //unsets kill target if(card) UnregisterSignal(card, COMSIG_ITEM_EQUIPPED) @@ -135,7 +135,7 @@ . = ..() if(!.) //didn't generate return FALSE - AddComponent(/datum/component/traitor_objective_register, behead_goal, fail_signals = list(COMSIG_PARENT_QDELETING)) + AddComponent(/datum/component/traitor_objective_register, behead_goal, fail_signals = list(COMSIG_QDELETING)) RegisterSignal(target, COMSIG_CARBON_REMOVE_LIMB, PROC_REF(on_target_dismembered)) /datum/traitor_objective/target_player/assassinate/behead/ungenerate_objective() diff --git a/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm b/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm index 1825a4c0486..5be1d609126 100644 --- a/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm +++ b/code/modules/antagonists/traitor/objectives/demoralise_graffiti.dm @@ -37,7 +37,7 @@ user.put_in_hands(spray) spray.balloon_alert(user, "the spraycan materializes in your hand") - RegisterSignal(spray, COMSIG_PARENT_QDELETING, PROC_REF(on_spray_destroyed)) + RegisterSignal(spray, COMSIG_QDELETING, PROC_REF(on_spray_destroyed)) RegisterSignal(spray, COMSIG_TRAITOR_GRAFFITI_DRAWN, PROC_REF(on_rune_complete)) /** @@ -63,9 +63,9 @@ /datum/traitor_objective/demoralise/graffiti/proc/on_rune_complete(atom/spray, obj/effect/decal/cleanable/traitor_rune/drawn_rune) SIGNAL_HANDLER rune = drawn_rune - UnregisterSignal(spray, COMSIG_PARENT_QDELETING) + UnregisterSignal(spray, COMSIG_QDELETING) UnregisterSignal(spray, COMSIG_TRAITOR_GRAFFITI_DRAWN) - RegisterSignal(drawn_rune, COMSIG_PARENT_QDELETING, PROC_REF(on_rune_destroyed)) + RegisterSignal(drawn_rune, COMSIG_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)) @@ -81,7 +81,7 @@ /datum/traitor_objective/demoralise/graffiti/ungenerate_objective() if (rune) - UnregisterSignal(rune, COMSIG_PARENT_QDELETING) + UnregisterSignal(rune, COMSIG_QDELETING) UnregisterSignal(rune, COMSIG_DEMORALISING_EVENT) UnregisterSignal(rune, COMSIG_TRAITOR_GRAFFITI_SLIPPED) rune = null diff --git a/code/modules/antagonists/traitor/objectives/demoralise_poster.dm b/code/modules/antagonists/traitor/objectives/demoralise_poster.dm index 2df6bd07456..868c8a14266 100644 --- a/code/modules/antagonists/traitor/objectives/demoralise_poster.dm +++ b/code/modules/antagonists/traitor/objectives/demoralise_poster.dm @@ -43,7 +43,7 @@ posters += poster_when_placed 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)) + RegisterSignal(poster_when_placed, COMSIG_QDELETING, PROC_REF(on_poster_destroy)) user.put_in_hands(posterbox) posterbox.balloon_alert(user, "the box materializes in your hand") @@ -53,7 +53,7 @@ /datum/traitor_objective/demoralise/poster/ungenerate_objective() for (var/poster in posters) UnregisterSignal(poster, COMSIG_DEMORALISING_EVENT) - UnregisterSignal(poster, COMSIG_PARENT_QDELETING) + UnregisterSignal(poster, COMSIG_QDELETING) posters.Cut() return ..() diff --git a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm index eb6064becda..c3dd93f01e2 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm @@ -137,10 +137,10 @@ if(!length(possible_targets)) return FALSE target_mind = pick(possible_targets) - AddComponent(/datum/component/traitor_objective_register, target_mind.current, fail_signals = list(COMSIG_PARENT_QDELETING)) + AddComponent(/datum/component/traitor_objective_register, target_mind.current, fail_signals = list(COMSIG_QDELETING)) var/datum/quirk/item_quirk/family_heirloom/quirk = locate() in target_mind.current.quirks target_item = quirk.heirloom.resolve() - AddComponent(/datum/component/traitor_objective_register, target_item, succeed_signals = list(COMSIG_PARENT_QDELETING)) + AddComponent(/datum/component/traitor_objective_register, target_item, succeed_signals = list(COMSIG_QDELETING)) replace_in_name("%TARGET%", target_mind.name) replace_in_name("%JOB TITLE%", target_mind.assigned_role.title) replace_in_name("%ITEM%", target_item.name) diff --git a/code/modules/antagonists/traitor/objectives/destroy_item.dm b/code/modules/antagonists/traitor/objectives/destroy_item.dm index 7a4898f2b3d..965c49de27e 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_item.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_item.dm @@ -50,7 +50,7 @@ if(target_item.exists_on_map) var/list/items = GLOB.steal_item_handler.objectives_by_path[target_item.targetitem] for(var/obj/item/item as anything in items) - AddComponent(/datum/component/traitor_objective_register, item, succeed_signals = list(COMSIG_PARENT_QDELETING)) + AddComponent(/datum/component/traitor_objective_register, item, succeed_signals = list(COMSIG_QDELETING)) tracked_items += item if(length(target_item.special_equipment)) special_equipment = target_item.special_equipment @@ -80,7 +80,7 @@ /datum/traitor_objective/destroy_item/proc/on_item_pickup(datum/source, obj/item/item, slot) SIGNAL_HANDLER if(istype(item, target_item.targetitem) && !(item in tracked_items)) - AddComponent(/datum/component/traitor_objective_register, item, succeed_signals = list(COMSIG_PARENT_QDELETING)) + AddComponent(/datum/component/traitor_objective_register, item, succeed_signals = list(COMSIG_QDELETING)) tracked_items += item /datum/traitor_objective/destroy_item/ungenerate_objective() diff --git a/code/modules/antagonists/traitor/objectives/eyesnatching.dm b/code/modules/antagonists/traitor/objectives/eyesnatching.dm index d82a9856fca..e752acd237e 100644 --- a/code/modules/antagonists/traitor/objectives/eyesnatching.dm +++ b/code/modules/antagonists/traitor/objectives/eyesnatching.dm @@ -107,7 +107,7 @@ replace_in_name("%TARGET%", target_mind.name) replace_in_name("%JOB TITLE%", target_mind.assigned_role.title) RegisterSignal(target, COMSIG_CARBON_LOSE_ORGAN, PROC_REF(check_eye_removal)) - AddComponent(/datum/component/traitor_objective_register, target, fail_signals = list(COMSIG_PARENT_QDELETING)) + AddComponent(/datum/component/traitor_objective_register, target, fail_signals = list(COMSIG_QDELETING)) return TRUE /datum/traitor_objective/target_player/eyesnatching/proc/check_eye_removal(datum/source, obj/item/organ/internal/eyes/removed) diff --git a/code/modules/antagonists/traitor/objectives/infect.dm b/code/modules/antagonists/traitor/objectives/infect.dm index ae7be48c756..c7f243e2209 100644 --- a/code/modules/antagonists/traitor/objectives/infect.dm +++ b/code/modules/antagonists/traitor/objectives/infect.dm @@ -45,7 +45,7 @@ RegisterSignal(ehms, COMSIG_AFTER_INJECT, PROC_REF(on_injected)) AddComponent(/datum/component/traitor_objective_register, ehms, \ succeed_signals = null, \ - fail_signals = list(COMSIG_PARENT_QDELETING), \ + fail_signals = list(COMSIG_QDELETING), \ penalty = TRUE) /datum/traitor_objective/target_player/infect/proc/on_injected(datum/source, mob/living/user, mob/living/injected) diff --git a/code/modules/antagonists/traitor/objectives/kidnapping.dm b/code/modules/antagonists/traitor/objectives/kidnapping.dm index bdbbb416f3b..b07ac80f97f 100644 --- a/code/modules/antagonists/traitor/objectives/kidnapping.dm +++ b/code/modules/antagonists/traitor/objectives/kidnapping.dm @@ -158,7 +158,7 @@ var/datum/mind/target_mind = pick(possible_targets) target = target_mind.current - AddComponent(/datum/component/traitor_objective_register, target, fail_signals = list(COMSIG_PARENT_QDELETING)) + AddComponent(/datum/component/traitor_objective_register, target, fail_signals = list(COMSIG_QDELETING)) var/list/possible_areas = GLOB.the_station_areas.Copy() for(var/area/possible_area as anything in possible_areas) if(ispath(possible_area, /area/station/hallway) || ispath(possible_area, /area/station/security) || initial(possible_area.outdoors)) diff --git a/code/modules/antagonists/traitor/objectives/kill_pet.dm b/code/modules/antagonists/traitor/objectives/kill_pet.dm index 511e40c0984..b156ca85560 100644 --- a/code/modules/antagonists/traitor/objectives/kill_pet.dm +++ b/code/modules/antagonists/traitor/objectives/kill_pet.dm @@ -85,12 +85,12 @@ if(target_pet.stat == DEAD) return FALSE AddComponent(/datum/component/traitor_objective_register, target_pet, \ - succeed_signals = list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH)) + succeed_signals = list(COMSIG_QDELETING, COMSIG_LIVING_DEATH)) replace_in_name("%DEPARTMENT HEAD%", target.title) replace_in_name("%PET%", target_pet.name) return TRUE /datum/traitor_objective/kill_pet/ungenerate_objective() if(target_pet) - UnregisterSignal(target_pet, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH)) + UnregisterSignal(target_pet, list(COMSIG_QDELETING, COMSIG_LIVING_DEATH)) target_pet = null diff --git a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm index b066683741b..fae2343b121 100644 --- a/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm +++ b/code/modules/antagonists/traitor/objectives/sabotage_machinery.dm @@ -55,7 +55,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han /// Marks a given machine as our target /datum/traitor_objective/sabotage_machinery/proc/prepare_machine(obj/machinery/machine) - AddComponent(/datum/component/traitor_objective_register, machine, succeed_signals = list(COMSIG_PARENT_QDELETING)) + AddComponent(/datum/component/traitor_objective_register, machine, succeed_signals = list(COMSIG_QDELETING)) // Destroy machines which are in annoying locations, are annoying when destroyed, and aren't directly interacted with /datum/traitor_objective/sabotage_machinery/destroy @@ -176,7 +176,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han on_triggered_callback = CALLBACK(src, PROC_REF(on_triggered)),\ on_defused_callback = CALLBACK(src, PROC_REF(on_defused)),\ ) - RegisterSignal(target, COMSIG_PARENT_QDELETING, GLOBAL_PROC_REF(qdel), src) + RegisterSignal(target, COMSIG_QDELETING, GLOBAL_PROC_REF(qdel), src) moveToNullspace() /// Called when applied trap is triggered, mark success @@ -186,7 +186,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han /// Called when applied trap has been defused, retrieve this item from nullspace /obj/item/traitor_machine_trapper/proc/on_defused(atom/machine, mob/defuser, obj/item/tool) - UnregisterSignal(machine, COMSIG_PARENT_QDELETING) + UnregisterSignal(machine, COMSIG_QDELETING) playsound(machine, 'sound/effects/structure_stress/pop3.ogg', 100, vary = TRUE) forceMove(get_turf(machine)) visible_message(span_warning("A [src] falls out from the [machine]!")) @@ -215,7 +215,7 @@ GLOBAL_DATUM_INIT(objective_machine_handler, /datum/objective_target_machine_han if(!place || !is_station_level(place.z)) machine_instances_by_path[machine_type] -= machine continue - RegisterSignal(machine, COMSIG_PARENT_QDELETING, PROC_REF(machine_destroyed)) + RegisterSignal(machine, COMSIG_QDELETING, PROC_REF(machine_destroyed)) UnregisterSignal(SSdcs, COMSIG_GLOB_NEW_MACHINE) /datum/objective_target_machine_handler/proc/machine_destroyed(atom/machine) diff --git a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm index b155c6c5327..e825dc0d843 100644 --- a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm +++ b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm @@ -42,7 +42,7 @@ disk = new(user.drop_location()) user.put_in_hands(disk) AddComponent(/datum/component/traitor_objective_register, disk, \ - fail_signals = list(COMSIG_PARENT_QDELETING)) + fail_signals = list(COMSIG_QDELETING)) /datum/traitor_objective/sleeper_protocol/proc/on_surgery_success(datum/source, datum/surgery_step/step, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results) SIGNAL_HANDLER diff --git a/code/modules/antagonists/traitor/objectives/steal.dm b/code/modules/antagonists/traitor/objectives/steal.dm index ce0020c8cad..1d45b7e40a7 100644 --- a/code/modules/antagonists/traitor/objectives/steal.dm +++ b/code/modules/antagonists/traitor/objectives/steal.dm @@ -51,7 +51,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) if(!place || !is_station_level(place.z)) objectives_by_path[typepath] -= object return - RegisterSignal(object, COMSIG_PARENT_QDELETING, PROC_REF(remove_item)) + RegisterSignal(object, COMSIG_QDELETING, PROC_REF(remove_item)) /datum/objective_item_handler/proc/remove_item(atom/source) SIGNAL_HANDLER @@ -185,7 +185,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) bug.balloon_alert(user, "the scanner materializes in your hand") bug.target_object_type = target_item.targetitem AddComponent(/datum/component/traitor_objective_register, bug, \ - fail_signals = list(COMSIG_PARENT_QDELETING), \ + fail_signals = list(COMSIG_QDELETING), \ penalty = telecrystal_penalty) 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)) @@ -290,7 +290,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) target.vis_contents += src vis_flags |= VIS_INHERIT_PLANE planted_on = target - RegisterSignal(planted_on, COMSIG_PARENT_QDELETING, PROC_REF(handle_planted_on_deletion)) + RegisterSignal(planted_on, COMSIG_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() @@ -308,7 +308,7 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) vis_flags &= ~VIS_INHERIT_PLANE planted_on.vis_contents -= src anchored = FALSE - UnregisterSignal(planted_on, COMSIG_PARENT_QDELETING) + UnregisterSignal(planted_on, COMSIG_QDELETING) planted_on = null /obj/item/traitor_bug/attackby_storage_insert(datum/storage, atom/storage_holder, mob/user) diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm index b83f3c9737b..0aa32f06691 100644 --- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm +++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm @@ -663,9 +663,9 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27) ///Used to connect air alarm with a sensor /obj/machinery/airalarm/proc/connect_sensor(obj/machinery/air_sensor/sensor) if(!isnull(connected_sensor)) - UnregisterSignal(connected_sensor, COMSIG_PARENT_QDELETING) + UnregisterSignal(connected_sensor, COMSIG_QDELETING) connected_sensor = sensor - RegisterSignal(connected_sensor, COMSIG_PARENT_QDELETING, PROC_REF(disconnect_sensor)) + RegisterSignal(connected_sensor, COMSIG_QDELETING, PROC_REF(disconnect_sensor)) my_area = get_area(connected_sensor) var/turf/our_turf = get_turf(connected_sensor) @@ -677,7 +677,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/airalarm, 27) ///Used to reset the air alarm to default configuration after disconnecting from air sensor /obj/machinery/airalarm/proc/disconnect_sensor() - UnregisterSignal(connected_sensor, COMSIG_PARENT_QDELETING) + UnregisterSignal(connected_sensor, COMSIG_QDELETING) connected_sensor = null my_area = get_area(src) diff --git a/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm b/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm index 1f38c3d40cb..de30b6f3db8 100644 --- a/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm +++ b/code/modules/atmospherics/machinery/air_alarm/air_alarm_circuit.dm @@ -134,7 +134,7 @@ 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_REF(on_duplicate_removed)) + RegisterSignal(component, COMSIG_QDELETING, PROC_REF(on_duplicate_removed)) component.connected_alarm = connected_alarm alarm_duplicates += component @@ -289,7 +289,7 @@ 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_REF(on_duplicate_removed)) + RegisterSignal(component, COMSIG_QDELETING, PROC_REF(on_duplicate_removed)) component.connected_alarm = connected_alarm component.scrubbers.possible_options = extract_id_tags(connected_alarm.my_area.air_scrubbers) scrubber_duplicates += component @@ -508,7 +508,7 @@ 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_REF(on_duplicate_removed)) + RegisterSignal(component, COMSIG_QDELETING, PROC_REF(on_duplicate_removed)) vent_duplicates += component component.connected_alarm = connected_alarm component.vents.possible_options = extract_id_tags(connected_alarm.my_area.air_vents) diff --git a/code/modules/atmospherics/machinery/bluespace_vendor.dm b/code/modules/atmospherics/machinery/bluespace_vendor.dm index 2c1ffdb17fb..1c97236bd69 100644 --- a/code/modules/atmospherics/machinery/bluespace_vendor.dm +++ b/code/modules/atmospherics/machinery/bluespace_vendor.dm @@ -168,7 +168,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_REF(unregister_machine)) + RegisterSignal(connected_machine, COMSIG_QDELETING, PROC_REF(unregister_machine)) mode = BS_MODE_IDLE update_appearance() @@ -176,7 +176,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/bluespace_vendor, 30) /obj/machinery/bluespace_vendor/proc/unregister_machine() SIGNAL_HANDLER if(connected_machine) - UnregisterSignal(connected_machine, COMSIG_PARENT_QDELETING) + UnregisterSignal(connected_machine, COMSIG_QDELETING) LAZYREMOVE(connected_machine.vendors, src) connected_machine = null mode = BS_MODE_OFF diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_procs.dm index 8184fad1114..c3c2cafbd99 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_REF(unregister_signals)) + RegisterSignal(linked_interface, COMSIG_QDELETING, PROC_REF(unregister_signals)) linked_input.active = TRUE linked_input.update_appearance() - RegisterSignal(linked_input, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) + RegisterSignal(linked_input, COMSIG_QDELETING, PROC_REF(unregister_signals)) linked_output.active = TRUE linked_output.update_appearance() - RegisterSignal(linked_output, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) + RegisterSignal(linked_output, COMSIG_QDELETING, PROC_REF(unregister_signals)) linked_moderator.active = TRUE linked_moderator.update_appearance() - RegisterSignal(linked_moderator, COMSIG_PARENT_QDELETING, PROC_REF(unregister_signals)) + RegisterSignal(linked_moderator, COMSIG_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_REF(unregister_signals)) + RegisterSignal(corner, COMSIG_QDELETING, PROC_REF(unregister_signals)) soundloop = new(src, TRUE) soundloop.volume = 5 @@ -118,15 +118,15 @@ /obj/machinery/atmospherics/components/unary/hypertorus/core/proc/unregister_signals(only_signals = FALSE) SIGNAL_HANDLER if(linked_interface) - UnregisterSignal(linked_interface, COMSIG_PARENT_QDELETING) + UnregisterSignal(linked_interface, COMSIG_QDELETING) if(linked_input) - UnregisterSignal(linked_input, COMSIG_PARENT_QDELETING) + UnregisterSignal(linked_input, COMSIG_QDELETING) if(linked_output) - UnregisterSignal(linked_output, COMSIG_PARENT_QDELETING) + UnregisterSignal(linked_output, COMSIG_QDELETING) if(linked_moderator) - UnregisterSignal(linked_moderator, COMSIG_PARENT_QDELETING) + UnregisterSignal(linked_moderator, COMSIG_QDELETING) for(var/obj/machinery/hypertorus/corner/corner in corners) - UnregisterSignal(corner, COMSIG_PARENT_QDELETING) + UnregisterSignal(corner, COMSIG_QDELETING) if(!only_signals) deactivate() diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 718fd71a8a3..97c6c51cb5e 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -188,11 +188,11 @@ user.put_in_hands(holding) else holding.forceMove(get_turf(src)) - UnregisterSignal(holding, COMSIG_PARENT_QDELETING) + UnregisterSignal(holding, COMSIG_QDELETING) holding = null if(new_tank) holding = new_tank - RegisterSignal(holding, COMSIG_PARENT_QDELETING, PROC_REF(unregister_holding)) + RegisterSignal(holding, COMSIG_QDELETING, PROC_REF(unregister_holding)) SSair.start_processing_machine(src) update_appearance() @@ -253,7 +253,7 @@ /obj/machinery/portable_atmospherics/proc/unregister_holding() SIGNAL_HANDLER - UnregisterSignal(holding, COMSIG_PARENT_QDELETING) + UnregisterSignal(holding, COMSIG_QDELETING) holding = null #undef PORTABLE_ATMOS_IGNORE_ATMOS_LIMIT diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index 7989cd086c7..1bfd4cf5029 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -476,7 +476,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_REF(remove_glow)) + RegisterSignal(glow_effect, COMSIG_QDELETING, PROC_REF(remove_glow)) /obj/structure/closet/supplypod/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) . = ..() @@ -493,7 +493,7 @@ /obj/structure/closet/supplypod/proc/remove_glow() SIGNAL_HANDLER - UnregisterSignal(glow_effect, COMSIG_PARENT_QDELETING) + UnregisterSignal(glow_effect, COMSIG_QDELETING) vis_contents -= glow_effect glow_effect = null diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 199bc7016dd..44386a2680f 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -535,7 +535,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( // Yes this is the same as what's found in qdel(). Yes it does need to be here // Get off my back - SEND_SIGNAL(src, COMSIG_PARENT_QDELETING, TRUE) + SEND_SIGNAL(src, COMSIG_QDELETING, TRUE) Destroy() //Clean up signals and timers. return ..() diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 5b022a33226..30bee1d8a44 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -482,11 +482,11 @@ /obj/item/clothing/accessory/allergy_dogtag/on_uniform_equip(obj/item/clothing/under/U, user) . = ..() - RegisterSignal(U,COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(U,COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) /obj/item/clothing/accessory/allergy_dogtag/on_uniform_dropped(obj/item/clothing/under/U, user) . = ..() - UnregisterSignal(U,COMSIG_PARENT_EXAMINE) + UnregisterSignal(U,COMSIG_ATOM_EXAMINE) ///What happens when we examine the uniform /obj/item/clothing/accessory/allergy_dogtag/proc/on_examine(datum/source, mob/user, list/examine_list) diff --git a/code/modules/escape_menu/escape_menu.dm b/code/modules/escape_menu/escape_menu.dm index aebd636e5e9..a954822a83e 100644 --- a/code/modules/escape_menu/escape_menu.dm +++ b/code/modules/escape_menu/escape_menu.dm @@ -44,7 +44,7 @@ GLOBAL_LIST_EMPTY(escape_menus) page_holder = new(client) show_page() - RegisterSignal(client, COMSIG_PARENT_QDELETING, PROC_REF(on_client_qdel)) + RegisterSignal(client, COMSIG_QDELETING, PROC_REF(on_client_qdel)) RegisterSignal(client, COMSIG_CLIENT_MOB_LOGIN, PROC_REF(on_client_mob_login)) if (!isnull(ckey)) diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index ce292abd421..9c5b64dab7e 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -177,7 +177,7 @@ ///Handles the initial steps of clogging a vent, either at event start or when the vent moves. /datum/round_event/vent_clog/proc/clog_vent() - RegisterSignal(vent, COMSIG_PARENT_QDELETING, PROC_REF(vent_move)) + RegisterSignal(vent, COMSIG_QDELETING, PROC_REF(vent_move)) RegisterSignal(vent, COMSIG_PLUNGER_ACT, PROC_REF(plunger_unclog)) for(var/turf/nearby_turf in view(2, get_turf(vent))) @@ -188,7 +188,7 @@ ///Clears the signals related to the event, before we wrap things up. /datum/round_event/vent_clog/proc/clear_signals() - UnregisterSignal(vent, list(COMSIG_PARENT_QDELETING, COMSIG_PLUNGER_ACT)) + UnregisterSignal(vent, list(COMSIG_QDELETING, COMSIG_PLUNGER_ACT)) /datum/round_event_control/vent_clog/major name = "Ventilation Clog: Major" diff --git a/code/modules/explorer_drone/control_console.dm b/code/modules/explorer_drone/control_console.dm index 1935bfb9c14..f4ed3260231 100644 --- a/code/modules/explorer_drone/control_console.dm +++ b/code/modules/explorer_drone/control_console.dm @@ -19,7 +19,7 @@ end_drone_control() controlled_drone = drone controlled_drone.controlled = TRUE - RegisterSignal(controlled_drone,COMSIG_PARENT_QDELETING, PROC_REF(drone_destroyed)) + RegisterSignal(controlled_drone,COMSIG_QDELETING, PROC_REF(drone_destroyed)) RegisterSignal(controlled_drone,COMSIG_EXODRONE_STATUS_CHANGED, PROC_REF(on_exodrone_status_changed)) update_icon() @@ -37,7 +37,7 @@ /obj/machinery/computer/exodrone_control_console/proc/end_drone_control() if(controlled_drone) controlled_drone.controlled = FALSE - UnregisterSignal(controlled_drone,list(COMSIG_PARENT_QDELETING,COMSIG_EXODRONE_STATUS_CHANGED)) + UnregisterSignal(controlled_drone,list(COMSIG_QDELETING,COMSIG_EXODRONE_STATUS_CHANGED)) controlled_drone = null update_icon() diff --git a/code/modules/explorer_drone/scanner_array.dm b/code/modules/explorer_drone/scanner_array.dm index 5c06f4d7d79..b47ebebad64 100644 --- a/code/modules/explorer_drone/scanner_array.dm +++ b/code/modules/explorer_drone/scanner_array.dm @@ -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_REF(cleanup_current_scan)) + RegisterSignal(current_scan,COMSIG_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 d2b20830acd..56d3e1ca805 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_REF(feed_feedback)) + RegisterSignal(src,COMSIG_ATOM_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 8e6f6bf6a31..1c1508e688b 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -147,13 +147,13 @@ if(isnull(last_feeding)) //Fish start fed. last_feeding = world.time RegisterSignal(aquarium, COMSIG_ATOM_EXITED, PROC_REF(aquarium_exited)) - RegisterSignal(aquarium, COMSIG_PARENT_ATTACKBY, PROC_REF(attack_reaction)) + RegisterSignal(aquarium, COMSIG_ATOM_ATTACKBY, PROC_REF(attack_reaction)) /obj/item/fish/proc/aquarium_exited(datum/source, atom/movable/gone, direction) SIGNAL_HANDLER if(src != gone) return - UnregisterSignal(source,list(COMSIG_ATOM_EXITED,COMSIG_PARENT_ATTACKBY)) + UnregisterSignal(source,list(COMSIG_ATOM_EXITED,COMSIG_ATOM_ATTACKBY)) /// Our aquarium is hit with stuff /obj/item/fish/proc/attack_reaction(datum/source, obj/item/thing, mob/user, params) diff --git a/code/modules/fishing/fishing_rod.dm b/code/modules/fishing/fishing_rod.dm index 882bd968b91..d34c04ac118 100644 --- a/code/modules/fishing/fishing_rod.dm +++ b/code/modules/fishing/fishing_rod.dm @@ -140,7 +140,7 @@ 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_REF(check_los)) - RegisterSignal(fishing_line_beam, COMSIG_PARENT_QDELETING, PROC_REF(clear_line)) + RegisterSignal(fishing_line_beam, COMSIG_QDELETING, PROC_REF(clear_line)) fishing_lines += fishing_line_beam INVOKE_ASYNC(fishing_line_beam, TYPE_PROC_REF(/datum/beam/, Start)) user.update_held_items() diff --git a/code/modules/food_and_drinks/machinery/food_cart.dm b/code/modules/food_and_drinks/machinery/food_cart.dm index d51042f8549..0fc002c76fd 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_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)) + RegisterSignal(cart_griddle, COMSIG_QDELETING, PROC_REF(lost_part)) + RegisterSignal(cart_smartfridge, COMSIG_QDELETING, PROC_REF(lost_part)) + RegisterSignal(cart_table, COMSIG_QDELETING, PROC_REF(lost_part)) + RegisterSignal(cart_tent, COMSIG_QDELETING, PROC_REF(lost_part)) /obj/machinery/food_cart/Destroy() if(cart_griddle) @@ -113,10 +113,10 @@ SIGNAL_HANDLER //okay, so it's deleting the fridge or griddle which are more important. We're gonna break the machine then - UnregisterSignal(cart_griddle, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED)) - UnregisterSignal(cart_smartfridge, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED)) - UnregisterSignal(cart_table, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED)) - UnregisterSignal(cart_tent, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_MOVED)) + UnregisterSignal(cart_griddle, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) + UnregisterSignal(cart_smartfridge, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) + UnregisterSignal(cart_table, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) + UnregisterSignal(cart_tent, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) atom_break() /obj/machinery/food_cart/atom_break(damage_flag) diff --git a/code/modules/food_and_drinks/machinery/griddle.dm b/code/modules/food_and_drinks/machinery/griddle.dm index 0eff54aa39a..93f80a8a241 100644 --- a/code/modules/food_and_drinks/machinery/griddle.dm +++ b/code/modules/food_and_drinks/machinery/griddle.dm @@ -112,7 +112,7 @@ SEND_SIGNAL(item_to_grill, COMSIG_ITEM_GRILL_TURNED_ON) 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)) + RegisterSignal(item_to_grill, COMSIG_QDELETING, PROC_REF(ItemRemovedFromGrill)) update_grill_audio() update_appearance() @@ -122,7 +122,7 @@ ungrill.vis_flags &= ~VIS_INHERIT_PLANE griddled_objects -= ungrill vis_contents -= ungrill - UnregisterSignal(ungrill, list(COMSIG_ITEM_GRILLED, COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(ungrill, list(COMSIG_ITEM_GRILLED, COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) update_grill_audio() /obj/machinery/griddle/proc/ItemMoved(obj/item/I, atom/OldLoc, Dir, Forced) diff --git a/code/modules/food_and_drinks/machinery/stove.dm b/code/modules/food_and_drinks/machinery/stove.dm index 481f672a36c..87cf51f7cb8 100644 --- a/code/modules/food_and_drinks/machinery/stove.dm +++ b/code/modules/food_and_drinks/machinery/stove.dm @@ -49,7 +49,7 @@ /obj/item/reagent_containers/cup/soup_pot/Initialize(mapload, vol) . = ..() RegisterSignal(reagents, COMSIG_REAGENTS_CLEAR_REAGENTS, PROC_REF(on_reagents_cleared)) - RegisterSignal(src, COMSIG_PARENT_REAGENT_EXAMINE, PROC_REF(reagent_special_examine)) + RegisterSignal(src, COMSIG_ATOM_REAGENT_EXAMINE, PROC_REF(reagent_special_examine)) register_context() /obj/item/reagent_containers/cup/soup_pot/add_context(atom/source, list/context, obj/item/held_item, mob/user) diff --git a/code/modules/food_and_drinks/machinery/stove_component.dm b/code/modules/food_and_drinks/machinery/stove_component.dm index c4dc9f7bd3e..898cd7e3513 100644 --- a/code/modules/food_and_drinks/machinery/stove_component.dm +++ b/code/modules/food_and_drinks/machinery/stove_component.dm @@ -37,13 +37,13 @@ add_container(spawn_container) /datum/component/stove/RegisterWithParent() - RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND_SECONDARY, PROC_REF(on_attack_hand_secondary)) RegisterSignal(parent, COMSIG_ATOM_EXITED, PROC_REF(on_exited)) RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, PROC_REF(on_overlay_update)) RegisterSignal(parent, COMSIG_OBJ_DECONSTRUCT, PROC_REF(on_deconstructed)) RegisterSignal(parent, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, PROC_REF(on_requesting_context)) - RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine)) RegisterSignal(parent, COMSIG_MACHINERY_REFRESH_PARTS, PROC_REF(on_refresh_parts)) var/obj/machinery/real_parent = parent @@ -62,8 +62,8 @@ COMSIG_ATOM_EXITED, COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM, COMSIG_ATOM_UPDATE_OVERLAYS, - COMSIG_PARENT_ATTACKBY, - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_ATTACKBY, + COMSIG_ATOM_EXAMINE, COMSIG_MACHINERY_REFRESH_PARTS, )) diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index f10b9e6d905..92006b7caac 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -47,13 +47,13 @@ /obj/item/pizzabox/proc/register_bomb(new_bomb) bomb = new_bomb if(istype(bomb)) - RegisterSignal(bomb, COMSIG_PARENT_QDELETING, PROC_REF(clear_bomb)) + RegisterSignal(bomb, COMSIG_QDELETING, PROC_REF(clear_bomb)) /obj/item/pizzabox/proc/clear_bomb(datum/source) SIGNAL_HANDLER if(isnull(bomb)) return - UnregisterSignal(bomb, COMSIG_PARENT_QDELETING) + UnregisterSignal(bomb, COMSIG_QDELETING) bomb = null /obj/item/pizzabox/Destroy() diff --git a/code/modules/food_and_drinks/plate.dm b/code/modules/food_and_drinks/plate.dm index a458bad7cf0..6c6b33bcdd2 100644 --- a/code/modules/food_and_drinks/plate.dm +++ b/code/modules/food_and_drinks/plate.dm @@ -55,7 +55,7 @@ item_to_plate.flags_1 |= IS_ONTOP_1 item_to_plate.vis_flags |= VIS_INHERIT_PLANE RegisterSignal(item_to_plate, COMSIG_MOVABLE_MOVED, PROC_REF(ItemMoved)) - RegisterSignal(item_to_plate, COMSIG_PARENT_QDELETING, PROC_REF(ItemMoved)) + RegisterSignal(item_to_plate, COMSIG_QDELETING, PROC_REF(ItemMoved)) // We gotta offset ourselves via pixel_w/z, so we don't end up z fighting with the plane item_to_plate.pixel_w = item_to_plate.pixel_x item_to_plate.pixel_z = item_to_plate.pixel_y @@ -68,7 +68,7 @@ removed_item.flags_1 &= ~IS_ONTOP_1 removed_item.vis_flags &= ~VIS_INHERIT_PLANE vis_contents -= removed_item - UnregisterSignal(removed_item, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(removed_item, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) // Resettt removed_item.pixel_x = removed_item.pixel_w removed_item.pixel_y = removed_item.pixel_z diff --git a/code/modules/hallucination/_hallucination.dm b/code/modules/hallucination/_hallucination.dm index 51042085bb8..9e23a656802 100644 --- a/code/modules/hallucination/_hallucination.dm +++ b/code/modules/hallucination/_hallucination.dm @@ -23,10 +23,10 @@ return src.hallucinator = hallucinator - RegisterSignal(hallucinator, COMSIG_PARENT_QDELETING, PROC_REF(target_deleting)) + RegisterSignal(hallucinator, COMSIG_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. +/// Signal proc for [COMSIG_QDELETING], if the mob hallucinating us is deletes, we should delete too. /datum/hallucination/proc/target_deleting() SIGNAL_HANDLER @@ -39,7 +39,7 @@ /datum/hallucination/Destroy() if(hallucinator) - UnregisterSignal(hallucinator, COMSIG_PARENT_QDELETING) + UnregisterSignal(hallucinator, COMSIG_QDELETING) hallucinator = null GLOB.all_ongoing_hallucinations -= src @@ -122,7 +122,7 @@ who_sees_us = list() for(var/mob/seer as anything in mobs_which_see_us) RegisterSignal(seer, COMSIG_MOB_LOGIN, PROC_REF(show_image_to)) - RegisterSignal(seer, COMSIG_PARENT_QDELETING, PROC_REF(remove_seer)) + RegisterSignal(seer, COMSIG_QDELETING, PROC_REF(remove_seer)) who_sees_us += seer show_image_to(seer) @@ -145,7 +145,7 @@ /obj/effect/client_image_holder/proc/remove_seer(mob/source) SIGNAL_HANDLER - UnregisterSignal(source, list(COMSIG_MOB_LOGIN, COMSIG_PARENT_QDELETING)) + UnregisterSignal(source, list(COMSIG_MOB_LOGIN, COMSIG_QDELETING)) hide_image_from(source) who_sees_us -= source @@ -218,15 +218,15 @@ stack_trace("[type] was created without a parent hallucination.") return INITIALIZE_HINT_QDEL - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(parent_deleting)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(parent_deleting)) src.parent = parent /obj/effect/client_image_holder/hallucination/Destroy(force) - UnregisterSignal(parent, COMSIG_PARENT_QDELETING) + UnregisterSignal(parent, COMSIG_QDELETING) parent = null return ..() -/// Signal proc for [COMSIG_PARENT_QDELETING], if our associated hallucination deletes, we should too +/// Signal proc for [COMSIG_QDELETING], if our associated hallucination deletes, we should too /obj/effect/client_image_holder/hallucination/proc/parent_deleting(datum/source) SIGNAL_HANDLER diff --git a/code/modules/hallucination/bolted_airlocks.dm b/code/modules/hallucination/bolted_airlocks.dm index d805a528a3d..9fb180dfcae 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_REF(on_airlock_deleted)) + RegisterSignal(airlock, COMSIG_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]" @@ -91,7 +91,7 @@ return ..() /obj/effect/client_image_holder/hallucination/fake_door_lock/Destroy(force) - UnregisterSignal(airlock, COMSIG_PARENT_QDELETING) + UnregisterSignal(airlock, COMSIG_QDELETING) airlock = null return ..() diff --git a/code/modules/hallucination/inhand_fake_item.dm b/code/modules/hallucination/inhand_fake_item.dm index 9d71d51b815..8f1a720cf0d 100644 --- a/code/modules/hallucination/inhand_fake_item.dm +++ b/code/modules/hallucination/inhand_fake_item.dm @@ -129,17 +129,17 @@ stack_trace("[type] was created without a parent hallucination.") return INITIALIZE_HINT_QDEL - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(parent_deleting)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(parent_deleting)) src.parent = parent ADD_TRAIT(src, TRAIT_NODROP, INNATE_TRAIT) /obj/item/hallucinated/Destroy(force) - UnregisterSignal(parent, COMSIG_PARENT_QDELETING) + UnregisterSignal(parent, COMSIG_QDELETING) parent = null return ..() -/// Signal proc for [COMSIG_PARENT_QDELETING], if our associated hallucination deletes, we should too +/// Signal proc for [COMSIG_QDELETING], if our associated hallucination deletes, we should too /obj/item/hallucinated/proc/parent_deleting(datum/source) SIGNAL_HANDLER diff --git a/code/modules/hallucination/screwy_health_doll.dm b/code/modules/hallucination/screwy_health_doll.dm index 6ddfec87aff..b2efb0a69eb 100644 --- a/code/modules/hallucination/screwy_health_doll.dm +++ b/code/modules/hallucination/screwy_health_doll.dm @@ -51,7 +51,7 @@ var/obj/item/bodypart/picked = specific_limb || pick(human_mob.bodyparts) if(!(picked in bodyparts)) - RegisterSignals(picked, list(COMSIG_PARENT_QDELETING, COMSIG_BODYPART_REMOVED), PROC_REF(remove_bodypart)) + RegisterSignals(picked, list(COMSIG_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)) @@ -62,7 +62,7 @@ /datum/hallucination/fake_health_doll/proc/remove_bodypart(obj/item/bodypart/source) SIGNAL_HANDLER - UnregisterSignal(source, list(COMSIG_PARENT_QDELETING, COMSIG_BODYPART_REMOVED, COMSIG_BODYPART_UPDATING_HEALTH_HUD, COMSIG_BODYPART_CHECKED_FOR_INJURY)) + UnregisterSignal(source, list(COMSIG_QDELETING, COMSIG_BODYPART_REMOVED, COMSIG_BODYPART_UPDATING_HEALTH_HUD, COMSIG_BODYPART_CHECKED_FOR_INJURY)) bodyparts -= source /// Whenever a bodypart we're tracking has their health hud updated, override it with our fake overlay diff --git a/code/modules/hallucination/stray_bullet.dm b/code/modules/hallucination/stray_bullet.dm index 5d084895cb2..b7fe2814713 100644 --- a/code/modules/hallucination/stray_bullet.dm +++ b/code/modules/hallucination/stray_bullet.dm @@ -57,7 +57,7 @@ return INITIALIZE_HINT_QDEL src.parent = parent - RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(parent_deleting)) + RegisterSignal(parent, COMSIG_QDELETING, PROC_REF(parent_deleting)) /obj/projectile/hallucination/Destroy() @@ -65,11 +65,11 @@ parent.hallucinator.client?.images -= fake_bullet fake_bullet = null - UnregisterSignal(parent, COMSIG_PARENT_QDELETING) + UnregisterSignal(parent, COMSIG_QDELETING) parent = null return ..() -/// Signal proc for [COMSIG_PARENT_QDELETING], if our associated hallucination deletes, we need to clean up +/// Signal proc for [COMSIG_QDELETING], if our associated hallucination deletes, we need to clean up /obj/projectile/hallucination/proc/parent_deleting(datum/source) SIGNAL_HANDLER diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index da7e44c64dc..9103ad3ebc7 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf spawned -= holo_atom continue - RegisterSignal(holo_atom, COMSIG_PARENT_QDELETING, PROC_REF(remove_from_holo_lists)) + RegisterSignal(holo_atom, COMSIG_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 @@ -280,10 +280,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_REF(remove_from_holo_lists)) + RegisterSignal(holo_effect_product, COMSIG_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_REF(remove_from_holo_lists)) + RegisterSignal(atom_product, COMSIG_QDELETING, PROC_REF(remove_from_holo_lists)) continue if(isobj(holo_atom)) @@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf spawned -= holo_atom if(!holo_atom) return - UnregisterSignal(holo_atom, COMSIG_PARENT_QDELETING) + UnregisterSignal(holo_atom, COMSIG_QDELETING) var/turf/target_turf = get_turf(holo_atom) for(var/atom/movable/atom_contents as anything in holo_atom) //make sure that things inside of a holoitem are moved outside before destroying it atom_contents.forceMove(target_turf) @@ -329,7 +329,7 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf /obj/machinery/computer/holodeck/proc/remove_from_holo_lists(datum/to_remove, _forced) SIGNAL_HANDLER spawned -= to_remove - UnregisterSignal(to_remove, COMSIG_PARENT_QDELETING) + UnregisterSignal(to_remove, COMSIG_QDELETING) /obj/machinery/computer/holodeck/process(seconds_per_tick) if(damaged && SPT_PROB(5, seconds_per_tick)) diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index f97a7f2a139..ba8522e93c9 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_REF(handle_mob_delete)) + RegisterSignal(our_mob, COMSIG_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 597d99bfd10..aca2324fc8f 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_REF(handle_card_delete)) + RegisterSignal(src, COMSIG_QDELETING, PROC_REF(handle_card_delete)) . = ..() /obj/item/toy/cards/deck/syndicate/holographic/proc/handle_card_delete(datum/source) diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 695420b4f23..604dc7c12c7 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -67,12 +67,12 @@ . = ..() RegisterSignals(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)) + RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del)) /// Handles the seeds' reagents datum getting deleted. /obj/item/seeds/replicapod/proc/on_reagents_del(datum/reagents/reagents) SIGNAL_HANDLER - UnregisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_PARENT_QDELETING)) + UnregisterSignal(reagents, list(COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_QDELETING)) return NONE /// Handles reagents getting added to this seed. diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index fa81a51b1ad..7ad18759f6e 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -178,7 +178,7 @@ // Add on any bonus lines on examine if(description) - RegisterSignal(our_plant, COMSIG_PARENT_EXAMINE, PROC_REF(examine)) + RegisterSignal(our_plant, COMSIG_ATOM_EXAMINE, PROC_REF(examine)) return TRUE /// Add on any unique examine text to the plant's examine text. @@ -540,7 +540,7 @@ our_plant.flags_1 |= HAS_CONTEXTUAL_SCREENTIPS_1 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)) + RegisterSignal(our_plant, COMSIG_ATOM_ATTACKBY, PROC_REF(make_battery)) /* * Signal proc for [COMSIG_ATOM_REQUESTING_CONTEXT_FROM_ITEM] to add context to plant batteries. diff --git a/code/modules/hydroponics/unique_plant_genes.dm b/code/modules/hydroponics/unique_plant_genes.dm index c47a3298a4c..8a08ee2a931 100644 --- a/code/modules/hydroponics/unique_plant_genes.dm +++ b/code/modules/hydroponics/unique_plant_genes.dm @@ -267,7 +267,7 @@ return our_chili = WEAKREF(our_plant) - RegisterSignals(our_plant, list(COMSIG_PARENT_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(stop_backfire_effect)) + RegisterSignals(our_plant, list(COMSIG_QDELETING, COMSIG_ITEM_DROPPED), PROC_REF(stop_backfire_effect)) /* * Begin processing the trait on backfire. @@ -630,11 +630,11 @@ /datum/plant_gene/trait/gas_production/on_new_seed(obj/item/seeds/new_seed) 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)) + RegisterSignal(new_seed, COMSIG_QDELETING, PROC_REF(stop_gas)) stinky_seed = WEAKREF(new_seed) /datum/plant_gene/trait/gas_production/on_removed(obj/item/seeds/old_seed) - UnregisterSignal(old_seed, list(COMSIG_PARENT_QDELETING, COMSIG_SEED_ON_PLANTED, COMSIG_SEED_ON_GROW)) + UnregisterSignal(old_seed, list(COMSIG_QDELETING, COMSIG_SEED_ON_PLANTED, COMSIG_SEED_ON_GROW)) stop_gas() /* diff --git a/code/modules/industrial_lift/elevator/elevator_music_zone.dm b/code/modules/industrial_lift/elevator/elevator_music_zone.dm index 9e1b524d545..00d55751a5c 100644 --- a/code/modules/industrial_lift/elevator/elevator_music_zone.dm +++ b/code/modules/industrial_lift/elevator/elevator_music_zone.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_EMPTY(elevator_music) /obj/effect/abstract/elevator_music_zone/proc/link_to_panel(atom/elevator_panel) RegisterSignal(elevator_panel, COMSIG_MACHINERY_POWER_RESTORED, PROC_REF(on_panel_powered)) RegisterSignal(elevator_panel, COMSIG_MACHINERY_POWER_LOST, PROC_REF(on_panel_depowered)) - RegisterSignal(elevator_panel, COMSIG_PARENT_QDELETING, PROC_REF(on_panel_destroyed)) + RegisterSignal(elevator_panel, COMSIG_QDELETING, PROC_REF(on_panel_destroyed)) /// Start sound loops when power is restored /obj/effect/abstract/elevator_music_zone/proc/on_panel_powered() @@ -78,7 +78,7 @@ GLOBAL_LIST_EMPTY(elevator_music) tracked_mobs[entered] = new soundloop_type(_parent = entered, _direct = TRUE, start_immediately = enabled) else tracked_mobs[entered] = null // Still add it to the list so we don't keep making this check - RegisterSignal(entered, COMSIG_PARENT_QDELETING, PROC_REF(mob_destroyed)) + RegisterSignal(entered, COMSIG_QDELETING, PROC_REF(mob_destroyed)) /datum/proximity_monitor/advanced/elevator_music_area/field_turf_uncrossed(mob/exited, turf/location) if (!(exited in tracked_mobs)) @@ -87,7 +87,7 @@ GLOBAL_LIST_EMPTY(elevator_music) return qdel(tracked_mobs[exited]) tracked_mobs -= exited - UnregisterSignal(exited, COMSIG_PARENT_QDELETING) + UnregisterSignal(exited, COMSIG_QDELETING) /// Remove references on mob deletion /datum/proximity_monitor/advanced/elevator_music_area/proc/mob_destroyed(mob/former_mob) diff --git a/code/modules/industrial_lift/industrial_lift.dm b/code/modules/industrial_lift/industrial_lift.dm index ab884b15f9b..e5ac79af233 100644 --- a/code/modules/industrial_lift/industrial_lift.dm +++ b/code/modules/industrial_lift/industrial_lift.dm @@ -126,7 +126,7 @@ GLOBAL_LIST_EMPTY(lifts) lift_load -= potential_rider changed_gliders -= potential_rider - UnregisterSignal(potential_rider, list(COMSIG_PARENT_QDELETING, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE)) + UnregisterSignal(potential_rider, list(COMSIG_QDELETING, COMSIG_MOVABLE_UPDATE_GLIDE_SIZE)) /obj/structure/industrial_lift/proc/AddItemOnLift(datum/source, atom/movable/new_lift_contents) SIGNAL_HANDLER @@ -140,7 +140,7 @@ GLOBAL_LIST_EMPTY(lifts) ADD_TRAIT(new_lift_contents, TRAIT_CANNOT_BE_UNBUCKLED, BUCKLED_TRAIT) lift_load += new_lift_contents - RegisterSignal(new_lift_contents, COMSIG_PARENT_QDELETING, PROC_REF(RemoveItemFromLift)) + RegisterSignal(new_lift_contents, COMSIG_QDELETING, PROC_REF(RemoveItemFromLift)) return TRUE diff --git a/code/modules/industrial_lift/lift_master.dm b/code/modules/industrial_lift/lift_master.dm index 5b8b97a604e..207e8b7fd74 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_REF(remove_lift_platforms)) + RegisterSignal(new_lift_platform, COMSIG_QDELETING, PROC_REF(remove_lift_platforms)) check_for_landmarks(new_lift_platform) @@ -83,7 +83,7 @@ GLOBAL_LIST_EMPTY(active_lifts_by_type) old_lift_platform.lift_master_datum = null LAZYREMOVE(lift_platforms, old_lift_platform) - UnregisterSignal(old_lift_platform, COMSIG_PARENT_QDELETING) + UnregisterSignal(old_lift_platform, COMSIG_QDELETING) if(!length(lift_platforms)) qdel(src) diff --git a/code/modules/mapping/space_management/space_reservation.dm b/code/modules/mapping/space_management/space_reservation.dm index fff31893d0e..403ac52d6e5 100644 --- a/code/modules/mapping/space_management/space_reservation.dm +++ b/code/modules/mapping/space_management/space_reservation.dm @@ -79,7 +79,7 @@ SHOULD_CALL_PARENT(TRUE) //Okay so hear me out. If we place a special turf IN the reserved area, it will be overwritten, so we can't do that //But signals are preserved even between turf changes, so even if we register a signal now it will stay even if that turf is overriden by the template - RegisterSignals(pre_cordon_turf, list(COMSIG_PARENT_QDELETING, COMSIG_TURF_RESERVATION_RELEASED), PROC_REF(on_stop_repel)) + RegisterSignals(pre_cordon_turf, list(COMSIG_QDELETING, COMSIG_TURF_RESERVATION_RELEASED), PROC_REF(on_stop_repel)) /datum/turf_reservation/proc/on_stop_repel(turf/pre_cordon_turf) SHOULD_CALL_PARENT(TRUE) @@ -89,7 +89,7 @@ ///Unregister all the signals we added in RegisterRepelSignals /datum/turf_reservation/proc/stop_repel(turf/pre_cordon_turf) - UnregisterSignal(pre_cordon_turf, list(COMSIG_PARENT_QDELETING, COMSIG_TURF_RESERVATION_RELEASED)) + UnregisterSignal(pre_cordon_turf, list(COMSIG_QDELETING, COMSIG_TURF_RESERVATION_RELEASED)) /datum/turf_reservation/transit/make_repel(turf/pre_cordon_turf) ..() diff --git a/code/modules/meteors/meteor_types.dm b/code/modules/meteors/meteor_types.dm index 5c2aa99c38c..9f598f9809e 100644 --- a/code/modules/meteors/meteor_types.dm +++ b/code/modules/meteors/meteor_types.dm @@ -80,7 +80,7 @@ if(!new_loop) return - RegisterSignal(new_loop, COMSIG_PARENT_QDELETING, PROC_REF(handle_stopping)) + RegisterSignal(new_loop, COMSIG_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/mob/living/basic/space_fauna/meteor_heart/chasing_spikes.dm b/code/modules/mob/living/basic/space_fauna/meteor_heart/chasing_spikes.dm index 70309716e43..061553c8733 100644 --- a/code/modules/mob/living/basic/space_fauna/meteor_heart/chasing_spikes.dm +++ b/code/modules/mob/living/basic/space_fauna/meteor_heart/chasing_spikes.dm @@ -14,7 +14,7 @@ playsound(owner, 'sound/magic/demon_attack1.ogg', vol = 100, vary = TRUE, pressure_affected = FALSE) var/obj/effect/temp_visual/spike_chaser/chaser = new(get_turf(owner), target) LAZYADD(active_chasers, WEAKREF(chaser)) - RegisterSignal(chaser, COMSIG_PARENT_QDELETING, PROC_REF(on_chaser_destroyed)) + RegisterSignal(chaser, COMSIG_QDELETING, PROC_REF(on_chaser_destroyed)) /// Remove a spike trail from our list of active trails /datum/action/cooldown/chasing_spikes/proc/on_chaser_destroyed(atom/chaser) @@ -51,7 +51,7 @@ src.target = WEAKREF(target) movement = SSmove_manager.move_towards(src, chasing = target, delay = move_speed, home = TRUE, timeout = duration, flags = MOVEMENT_LOOP_START_FAST) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(on_target_invalid)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(on_target_invalid)) if (isliving(target)) RegisterSignal(target, COMSIG_LIVING_DEATH, PROC_REF(on_target_invalid)) diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 27c69224d62..00c8a617c64 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -205,7 +205,7 @@ /obj/item/organ/internal/stomach/alien/proc/consume_thing(atom/movable/thing) RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(content_moved)) - RegisterSignal(thing, COMSIG_PARENT_QDELETING, PROC_REF(content_deleted)) + RegisterSignal(thing, COMSIG_QDELETING, PROC_REF(content_deleted)) if(isliving(thing)) var/mob/living/lad = thing RegisterSignal(thing, COMSIG_LIVING_DEATH, PROC_REF(content_died)) @@ -228,7 +228,7 @@ if(source.loc == src || source.loc == owner) // not in us? out da list then return stomach_contents -= source - UnregisterSignal(source, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_DEATH, COMSIG_PARENT_QDELETING)) + UnregisterSignal(source, list(COMSIG_MOVABLE_MOVED, COMSIG_LIVING_DEATH, COMSIG_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_REF(something_moved)) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 2949b7b0ac3..2d77af7e67c 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -993,13 +993,13 @@ if(hand_index > hand_bodyparts.len) hand_bodyparts.len = hand_index hand_bodyparts[hand_index] = new_hand - RegisterSignals(new_hand, list(COMSIG_PARENT_QDELETING, COMSIG_BODYPART_REMOVED), PROC_REF(on_lost_hand)) + RegisterSignals(new_hand, list(COMSIG_QDELETING, COMSIG_BODYPART_REMOVED), PROC_REF(on_lost_hand)) /// Cleans up references to an arm when it is dismembered or deleted /mob/living/carbon/proc/on_lost_hand(obj/item/bodypart/arm/lost_hand) SIGNAL_HANDLER hand_bodyparts[lost_hand.held_index] = null - UnregisterSignal(lost_hand, list(COMSIG_PARENT_QDELETING, COMSIG_BODYPART_REMOVED)) + UnregisterSignal(lost_hand, list(COMSIG_QDELETING, COMSIG_BODYPART_REMOVED)) ///Proc to hook behavior on bodypart additions. Do not directly call. You're looking for [/obj/item/bodypart/proc/try_attach_limb()]. /mob/living/carbon/proc/add_bodypart(obj/item/bodypart/new_bodypart) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 1466be41b97..9a75d5ef17c 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -728,9 +728,9 @@ /obj/item/hand_item/self_grasp/Destroy() if(user) to_chat(user, span_warning("You stop holding onto your[grasped_part ? " [grasped_part.name]" : "self"].")) - UnregisterSignal(user, COMSIG_PARENT_QDELETING) + UnregisterSignal(user, COMSIG_QDELETING) if(grasped_part) - UnregisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING)) + UnregisterSignal(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_QDELETING)) grasped_part.grasped_by = null grasped_part.refresh_bleed_rate() grasped_part = null @@ -753,8 +753,8 @@ grasped_part = grasping_part grasped_part.grasped_by = src grasped_part.refresh_bleed_rate() - RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(qdel_void)) - RegisterSignals(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_PARENT_QDELETING), PROC_REF(qdel_void)) + RegisterSignal(user, COMSIG_QDELETING, PROC_REF(qdel_void)) + RegisterSignals(grasped_part, list(COMSIG_CARBON_REMOVE_LIMB, COMSIG_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/examine.dm b/code/modules/mob/living/carbon/examine.dm index e40493d89ed..5e1ebeaf8d0 100644 --- a/code/modules/mob/living/carbon/examine.dm +++ b/code/modules/mob/living/carbon/examine.dm @@ -149,7 +149,7 @@ . += "[t_He] look[p_s()] ecstatic." . += "" - SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) + SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE, user, .) /mob/living/carbon/examine_more(mob/user) . = ..() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 942f26f80ec..6b4df5b3697 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -410,7 +410,7 @@ . += span_info("Traits: [get_quirk_string(FALSE, CAT_QUIRK_ALL)]") . += "" - SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .) + SEND_SIGNAL(src, COMSIG_ATOM_EXAMINE, user, .) /** * Shows any and all examine text related to any status effects the user has. diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index fc4fd18980b..d2aafa50802 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -798,7 +798,7 @@ upgrades += new_upgrade new_upgrade.forceMove(src) RegisterSignal(new_upgrade, COMSIG_MOVABLE_MOVED, PROC_REF(remove_from_upgrades)) - RegisterSignal(new_upgrade, COMSIG_PARENT_QDELETING, PROC_REF(on_upgrade_deleted)) + RegisterSignal(new_upgrade, COMSIG_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. @@ -808,7 +808,7 @@ return old_upgrade.deactivate(src) upgrades -= old_upgrade - UnregisterSignal(old_upgrade, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(old_upgrade, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) ///Called when an applied upgrade is deleted. /mob/living/silicon/robot/proc/on_upgrade_deleted(obj/item/borg/upgrade/old_upgrade) @@ -816,7 +816,7 @@ if(!QDELETED(src)) old_upgrade.deactivate(src) upgrades -= old_upgrade - UnregisterSignal(old_upgrade, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(old_upgrade, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING)) /** * make_shell: Makes an AI shell out of a cyborg unit diff --git a/code/modules/mob/living/silicon/robot/robot_model.dm b/code/modules/mob/living/silicon/robot/robot_model.dm index 32749ade7b0..d1c2a1da80f 100644 --- a/code/modules/mob/living/silicon/robot/robot_model.dm +++ b/code/modules/mob/living/silicon/robot/robot_model.dm @@ -958,7 +958,7 @@ if(model) model.storages |= src RegisterSignal(model.robot, COMSIG_MOB_GET_STATUS_TAB_ITEMS, PROC_REF(get_status_tab_item)) - RegisterSignal(model, COMSIG_PARENT_QDELETING, PROC_REF(unregister_from_model)) + RegisterSignal(model, COMSIG_QDELETING, PROC_REF(unregister_from_model)) /datum/robot_energy_storage/proc/unregister_from_model(obj/item/robot_model/model) SIGNAL_HANDLER diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index c88d21ab55a..ba9ba705fa0 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -125,7 +125,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians copy_languages(to_who, LANGUAGE_MASTER) // make sure holoparasites speak same language as master update_atom_languages() RegisterSignal(to_who, COMSIG_MOVABLE_MOVED, PROC_REF(check_distance)) - RegisterSignal(to_who, COMSIG_PARENT_QDELETING, PROC_REF(on_summoner_deletion)) + RegisterSignal(to_who, COMSIG_QDELETING, PROC_REF(on_summoner_deletion)) RegisterSignal(to_who, COMSIG_LIVING_DEATH, PROC_REF(on_summoner_death)) RegisterSignal(to_who, COMSIG_LIVING_HEALTH_UPDATE, PROC_REF(on_summoner_health_update)) RegisterSignal(to_who, COMSIG_LIVING_ON_WABBAJACKED, PROC_REF(on_summoner_wabbajacked)) @@ -139,7 +139,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians if(is_deployed()) recall_effects() forceMove(get_turf(src)) - UnregisterSignal(summoner, list(COMSIG_MOVABLE_MOVED, COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH, COMSIG_LIVING_HEALTH_UPDATE, COMSIG_LIVING_ON_WABBAJACKED, COMSIG_LIVING_SHAPESHIFTED, COMSIG_LIVING_UNSHAPESHIFTED)) + UnregisterSignal(summoner, list(COMSIG_MOVABLE_MOVED, COMSIG_QDELETING, COMSIG_LIVING_DEATH, COMSIG_LIVING_HEALTH_UPDATE, COMSIG_LIVING_ON_WABBAJACKED, COMSIG_LIVING_SHAPESHIFTED, COMSIG_LIVING_UNSHAPESHIFTED)) if(different_person) summoner.faction -= "[REF(src)]" faction -= summoner.faction 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 53f330fe6cb..6fbc61ee458 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm @@ -1,7 +1,7 @@ #define UNREGISTER_BOMB_SIGNALS(A) \ do { \ UnregisterSignal(A, boom_signals); \ - UnregisterSignal(A, COMSIG_PARENT_EXAMINE); \ + UnregisterSignal(A, COMSIG_ATOM_EXAMINE); \ } while (0) //Explosive @@ -19,7 +19,7 @@ creator_desc = "High damage resist and medium power attack. Can turn any object, including objects too large to pick up, into a bomb, dealing explosive damage to the next person to touch it. The object will return to normal after the trap is triggered or after a delay." creator_icon = "explosive" /// Static list of signals that activate the boom. - var/static/list/boom_signals = list(COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND) + var/static/list/boom_signals = list(COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_BUMPED, COMSIG_ATOM_ATTACK_HAND) /// After this amount of time passses, boom deactivates. var/decay_time = 1 MINUTES /// Time between bombs. @@ -44,7 +44,7 @@ return to_chat(src, span_bolddanger("Success! Bomb armed!")) COOLDOWN_START(src, bomb_cooldown, bomb_cooldown_time) - RegisterSignal(planting_on, COMSIG_PARENT_EXAMINE, PROC_REF(display_examine)) + RegisterSignal(planting_on, COMSIG_ATOM_EXAMINE, PROC_REF(display_examine)) RegisterSignals(planting_on, boom_signals, PROC_REF(kaboom)) addtimer(CALLBACK(src, PROC_REF(disable), planting_on), decay_time, TIMER_UNIQUE|TIMER_OVERRIDE) 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 7e5acd66531..15b439b425f 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -71,14 +71,14 @@ 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))) - RegisterSignals(chosen_minion, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(lost_minion)) + RegisterSignals(chosen_minion, list(COMSIG_QDELETING, COMSIG_LIVING_DEATH), PROC_REF(lost_minion)) summoned_minions++ /// Called when a minion is qdeleted or dies, removes it from our minion list /datum/action/boss/wizard_summon_minions/proc/lost_minion(mob/source) SIGNAL_HANDLER - UnregisterSignal(source, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH)) + UnregisterSignal(source, list(COMSIG_QDELETING, COMSIG_LIVING_DEATH)) summoned_minions-- //Mimic Ability diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index f7ca9d5e987..d0276cc2d2e 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -661,16 +661,16 @@ /mob/living/simple_animal/hostile/proc/handle_target_del(datum/source) SIGNAL_HANDLER - UnregisterSignal(target, COMSIG_PARENT_QDELETING) + UnregisterSignal(target, COMSIG_QDELETING) target = null LoseTarget() /mob/living/simple_animal/hostile/proc/add_target(new_target) if(target) - UnregisterSignal(target, COMSIG_PARENT_QDELETING) + UnregisterSignal(target, COMSIG_QDELETING) target = new_target if(target) - RegisterSignal(target, COMSIG_PARENT_QDELETING, PROC_REF(handle_target_del)) + RegisterSignal(target, COMSIG_QDELETING, PROC_REF(handle_target_del)) /mob/living/simple_animal/hostile/befriend(mob/living/new_friend) . = ..() 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 955bf1d6863..c4ab1f1c417 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 @@ -52,7 +52,7 @@ 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)) + RegisterSignal(our_loop, COMSIG_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 7c4669fb6b4..578c76bee1b 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 @@ -216,7 +216,7 @@ 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_REF(onEliteLoss)) + RegisterSignal(mychild, COMSIG_QDELETING, PROC_REF(onEliteLoss)) INVOKE_ASYNC(src, PROC_REF(arena_checks)) /obj/structure/elite_tumor/proc/return_elite() @@ -246,7 +246,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_REF(clear_activator)) + RegisterSignal(user, COMSIG_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) @@ -255,7 +255,7 @@ While using this makes the system rely on OnFire, it still gives options for tim return activator = null REMOVE_TRAIT(source, TRAIT_ELITE_CHALLENGER, REF(src)) - UnregisterSignal(source, COMSIG_PARENT_QDELETING) + UnregisterSignal(source, COMSIG_QDELETING) /obj/structure/elite_tumor/process(seconds_per_tick) if(!isturf(loc)) diff --git a/code/modules/mob/living/simple_animal/hostile/ooze.dm b/code/modules/mob/living/simple_animal/hostile/ooze.dm index adf5c5399d8..7c15cfcbd96 100644 --- a/code/modules/mob/living/simple_animal/hostile/ooze.dm +++ b/code/modules/mob/living/simple_animal/hostile/ooze.dm @@ -203,7 +203,7 @@ /datum/action/consume/New(Target) . = ..() RegisterSignal(owner, COMSIG_LIVING_DEATH, PROC_REF(on_owner_death)) - RegisterSignal(owner, COMSIG_PARENT_QDELETING, PROC_REF(handle_mob_deletion)) + RegisterSignal(owner, COMSIG_QDELETING, PROC_REF(handle_mob_deletion)) /datum/action/consume/proc/handle_mob_deletion() SIGNAL_HANDLER @@ -235,7 +235,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_REF(handle_mob_deletion)) + RegisterSignal(vored_mob, COMSIG_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) @@ -246,7 +246,7 @@ vored_mob.forceMove(get_turf(owner)) playsound(get_turf(owner), 'sound/effects/splat.ogg', 50, TRUE) owner.visible_message(span_warning("[owner] pukes out [vored_mob]!"), span_notice("You puke out [vored_mob].")) - UnregisterSignal(vored_mob, COMSIG_PARENT_QDELETING) + UnregisterSignal(vored_mob, COMSIG_QDELETING) vored_mob = null ///Gain health for the consumption and dump some clone loss on the target. 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 0417b1eb17f..941a7bf4d52 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 @@ -203,7 +203,7 @@ return var/datum/beam/newVine = Beam(the_target, icon_state = "vine", maxdistance = vine_grab_distance, beam_type=/obj/effect/ebeam/vine, emissive = FALSE) - RegisterSignal(newVine, COMSIG_PARENT_QDELETING, PROC_REF(remove_vine), newVine) + RegisterSignal(newVine, COMSIG_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/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index 82f22d5d470..99c7586c7d7 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -148,12 +148,12 @@ /mob/living/simple_animal/slime/create_reagents(max_vol, flags) . = ..() RegisterSignals(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)) + RegisterSignal(reagents, COMSIG_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) SIGNAL_HANDLER - UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_PARENT_QDELETING)) + UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_QDELETING)) return NONE /mob/living/simple_animal/slime/proc/set_colour(new_colour) @@ -540,34 +540,34 @@ var/old_target = Target Target = new_target if(old_target && !SLIME_CARES_ABOUT(old_target)) - UnregisterSignal(old_target, COMSIG_PARENT_QDELETING) + UnregisterSignal(old_target, COMSIG_QDELETING) if(Target) - RegisterSignal(Target, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) + RegisterSignal(Target, COMSIG_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/set_leader(new_leader) var/old_leader = Leader Leader = new_leader if(old_leader && !SLIME_CARES_ABOUT(old_leader)) - UnregisterSignal(old_leader, COMSIG_PARENT_QDELETING) + UnregisterSignal(old_leader, COMSIG_QDELETING) if(Leader) - RegisterSignal(Leader, COMSIG_PARENT_QDELETING, PROC_REF(clear_memories_of), override = TRUE) + RegisterSignal(Leader, COMSIG_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_REF(clear_memories_of), override = TRUE) + RegisterSignal(new_friend, COMSIG_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_REF(clear_memories_of), override = TRUE) + RegisterSignal(new_friend, COMSIG_QDELETING, PROC_REF(clear_memories_of), override = TRUE) /mob/living/simple_animal/slime/proc/remove_friend(friend) Friends -= friend if(friend && !SLIME_CARES_ABOUT(friend)) - UnregisterSignal(friend, COMSIG_PARENT_QDELETING) + UnregisterSignal(friend, COMSIG_QDELETING) /mob/living/simple_animal/slime/proc/set_friends(new_buds) clear_friends() diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 3b604420db4..ea3b3ef5f3d 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -132,7 +132,7 @@ part.siemens_coefficient = theme.siemens_coefficient for(var/obj/item/part as anything in mod_parts) RegisterSignal(part, COMSIG_ATOM_DESTRUCTION, PROC_REF(on_part_destruction)) - RegisterSignal(part, COMSIG_PARENT_QDELETING, PROC_REF(on_part_deletion)) + RegisterSignal(part, COMSIG_QDELETING, PROC_REF(on_part_deletion)) set_mod_skin(new_skin || theme.default_skin) update_speed() RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) diff --git a/code/modules/mod/mod_core.dm b/code/modules/mod/mod_core.dm index 81e1dd08b30..7b05db45175 100644 --- a/code/modules/mod/mod_core.dm +++ b/code/modules/mod/mod_core.dm @@ -88,9 +88,9 @@ . = ..() if(cell) install_cell(cell) - RegisterSignal(mod, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(mod, COMSIG_ATOM_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_ATOM_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) @@ -98,7 +98,7 @@ /obj/item/mod/core/standard/uninstall() if(!QDELETED(cell)) cell.forceMove(drop_location()) - UnregisterSignal(mod, list(COMSIG_PARENT_EXAMINE, COMSIG_ATOM_ATTACK_HAND, COMSIG_PARENT_ATTACKBY, COMSIG_MOD_WEARER_SET)) + UnregisterSignal(mod, list(COMSIG_ATOM_EXAMINE, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACKBY, COMSIG_MOD_WEARER_SET)) if(mod.wearer) on_wearer_unset(mod, mod.wearer) return ..() @@ -293,10 +293,10 @@ /obj/item/mod/core/plasma/install(obj/item/mod/control/mod_unit) . = ..() - RegisterSignal(mod, COMSIG_PARENT_ATTACKBY, PROC_REF(on_attackby)) + RegisterSignal(mod, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) /obj/item/mod/core/plasma/uninstall() - UnregisterSignal(mod, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(mod, COMSIG_ATOM_ATTACKBY) return ..() /obj/item/mod/core/plasma/attackby(obj/item/attacking_item, mob/user, params) diff --git a/code/modules/mod/modules/_module.dm b/code/modules/mod/modules/_module.dm index c8fe571330c..36f0f84d201 100644 --- a/code/modules/mod/modules/_module.dm +++ b/code/modules/mod/modules/_module.dm @@ -53,13 +53,13 @@ if(ispath(device)) device = new device(src) ADD_TRAIT(device, TRAIT_NODROP, MOD_TRAIT) - RegisterSignal(device, COMSIG_PARENT_QDELETING, PROC_REF(on_device_deletion)) + RegisterSignal(device, COMSIG_QDELETING, PROC_REF(on_device_deletion)) RegisterSignal(src, COMSIG_ATOM_EXITED, PROC_REF(on_exit)) /obj/item/mod/module/Destroy() mod?.uninstall(src) if(device) - UnregisterSignal(device, COMSIG_PARENT_QDELETING) + UnregisterSignal(device, COMSIG_QDELETING) QDEL_NULL(device) return ..() diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 0a96cee059a..65f7eb7c191 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -524,8 +524,8 @@ )) /obj/item/mod/module/hat_stabilizer/on_suit_activation() - 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_EXAMINE, PROC_REF(add_examine)) + RegisterSignal(mod.helmet, COMSIG_ATOM_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) @@ -533,8 +533,8 @@ return if(attached_hat) //knock off the helmet if its on their head. Or, technically, auto-rightclick it for them; that way it saves us code, AND gives them the bubble remove_hat(src, mod.wearer) - UnregisterSignal(mod.helmet, COMSIG_PARENT_EXAMINE) - UnregisterSignal(mod.helmet, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(mod.helmet, COMSIG_ATOM_EXAMINE) + UnregisterSignal(mod.helmet, COMSIG_ATOM_ATTACKBY) UnregisterSignal(mod.helmet, COMSIG_ATOM_ATTACK_HAND_SECONDARY) /obj/item/mod/module/hat_stabilizer/proc/add_examine(datum/source, mob/user, list/base_examine) diff --git a/code/modules/mod/modules/modules_ninja.dm b/code/modules/mod/modules/modules_ninja.dm index e24fc726715..0987c777764 100644 --- a/code/modules/mod/modules/modules_ninja.dm +++ b/code/modules/mod/modules/modules_ninja.dm @@ -26,7 +26,7 @@ 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)) - RegisterSignals(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)) + RegisterSignals(mod.wearer, list(COMSIG_MOB_ITEM_ATTACK, COMSIG_ATOM_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) @@ -36,7 +36,7 @@ return if(bumpoff) UnregisterSignal(mod.wearer, COMSIG_LIVING_MOB_BUMP) - UnregisterSignal(mod.wearer, list(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ITEM_ATTACK, COMSIG_PARENT_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED)) + UnregisterSignal(mod.wearer, list(COMSIG_HUMAN_MELEE_UNARMED_ATTACK, COMSIG_MOB_ITEM_ATTACK, COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_HITBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_PAW, COMSIG_CARBON_CUFF_ATTEMPTED)) animate(mod.wearer, alpha = 255, time = 1.5 SECONDS) /obj/item/mod/module/stealth/proc/unstealth(datum/source) @@ -207,7 +207,7 @@ /obj/item/mod/module/weapon_recall/proc/set_weapon(obj/item/weapon) linked_weapon = weapon RegisterSignal(linked_weapon, COMSIG_MOVABLE_IMPACT, PROC_REF(catch_weapon)) - RegisterSignal(linked_weapon, COMSIG_PARENT_QDELETING, PROC_REF(deleted_weapon)) + RegisterSignal(linked_weapon, COMSIG_QDELETING, PROC_REF(deleted_weapon)) /obj/item/mod/module/weapon_recall/proc/recall_weapon(caught = FALSE) linked_weapon.forceMove(get_turf(src)) @@ -414,10 +414,10 @@ 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_REF(on_attackby)) + RegisterSignal(mod, COMSIG_ATOM_ATTACKBY, PROC_REF(on_attackby)) /obj/item/mod/module/adrenaline_boost/on_uninstall(deleting) - UnregisterSignal(mod, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(mod, COMSIG_ATOM_ATTACKBY) /obj/item/mod/module/adrenaline_boost/attackby(obj/item/attacking_item, mob/user, params) if(charge_boost(attacking_item, user)) diff --git a/code/modules/mod/modules/modules_timeline.dm b/code/modules/mod/modules/modules_timeline.dm index 4fa348659da..4a71ce44d21 100644 --- a/code/modules/mod/modules/modules_timeline.dm +++ b/code/modules/mod/modules/modules_timeline.dm @@ -123,14 +123,14 @@ for(var/obj/item/mod/module/module as anything in mod.modules) 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_REF(unblock_suit_activation)) + RegisterSignal(timestop, COMSIG_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) SIGNAL_HANDLER for(var/obj/item/mod/module/module as anything in mod.modules) UnregisterSignal(module, COMSIG_MODULE_TRIGGERED) - UnregisterSignal(source, COMSIG_PARENT_QDELETING) + UnregisterSignal(source, COMSIG_QDELETING) UnregisterSignal(mod, COMSIG_MOD_ACTIVATE) timestop = null diff --git a/code/modules/modular_computers/file_system/programs/maintenance/modsuit.dm b/code/modules/modular_computers/file_system/programs/maintenance/modsuit.dm index 02ee0dd69ef..9f8971fb7fa 100644 --- a/code/modules/modular_computers/file_system/programs/maintenance/modsuit.dm +++ b/code/modules/modular_computers/file_system/programs/maintenance/modsuit.dm @@ -23,12 +23,12 @@ if(controlled_suit) unsync_modsuit() controlled_suit = attacking_item - RegisterSignal(controlled_suit, COMSIG_PARENT_QDELETING, PROC_REF(unsync_modsuit)) + RegisterSignal(controlled_suit, COMSIG_QDELETING, PROC_REF(unsync_modsuit)) user.balloon_alert(user, "suit updated") return TRUE /datum/computer_file/program/maintenance/modsuit_control/proc/unsync_modsuit(atom/source) - UnregisterSignal(controlled_suit, COMSIG_PARENT_QDELETING) + UnregisterSignal(controlled_suit, COMSIG_QDELETING) controlled_suit = null /datum/computer_file/program/maintenance/modsuit_control/ui_data(mob/user) 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 517f402922c..814ae748e12 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_REF(clear_supermatter)) + RegisterSignal(sm, COMSIG_QDELETING, PROC_REF(clear_supermatter)) /datum/computer_file/program/supermatter_monitor/ui_static_data(mob/user) var/list/data = list() @@ -82,7 +82,7 @@ supermatters -= sm if(focused_supermatter == sm) unfocus_supermatter() - UnregisterSignal(sm, COMSIG_PARENT_QDELETING) + UnregisterSignal(sm, COMSIG_QDELETING) /datum/computer_file/program/supermatter_monitor/proc/focus_supermatter(obj/machinery/power/supermatter_crystal/sm) if(sm == focused_supermatter) diff --git a/code/modules/plumbing/plumbers/plumbing_buffer.dm b/code/modules/plumbing/plumbers/plumbing_buffer.dm index 2cb5dab2b8a..dd9b63e34f6 100644 --- a/code/modules/plumbing/plumbers/plumbing_buffer.dm +++ b/code/modules/plumbing/plumbers/plumbing_buffer.dm @@ -23,12 +23,12 @@ /obj/machinery/plumbing/buffer/create_reagents(max_vol, flags) . = ..() RegisterSignals(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)) + RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/machinery/plumbing/buffer/proc/on_reagents_del(datum/reagents/reagents) SIGNAL_HANDLER - UnregisterSignal(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, COMSIG_PARENT_QDELETING)) + UnregisterSignal(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, COMSIG_QDELETING)) return NONE /obj/machinery/plumbing/buffer/proc/on_reagent_change() diff --git a/code/modules/plumbing/plumbers/reaction_chamber.dm b/code/modules/plumbing/plumbers/reaction_chamber.dm index 582d670e94d..5b5985c5334 100644 --- a/code/modules/plumbing/plumbers/reaction_chamber.dm +++ b/code/modules/plumbing/plumbers/reaction_chamber.dm @@ -32,12 +32,12 @@ /obj/machinery/plumbing/reaction_chamber/create_reagents(max_vol, flags) . = ..() RegisterSignals(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)) + RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/machinery/plumbing/reaction_chamber/proc/on_reagents_del(datum/reagents/reagents) SIGNAL_HANDLER - UnregisterSignal(reagents, list(COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED, COMSIG_PARENT_QDELETING)) + UnregisterSignal(reagents, list(COMSIG_REAGENTS_REM_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_CLEAR_REAGENTS, COMSIG_REAGENTS_REACTED, COMSIG_QDELETING)) return NONE /// Handles stopping the emptying process when the chamber empties. diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 5d2bbd9192d..4fca4c745b8 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -105,12 +105,12 @@ /obj/item/stock_parts/cell/create_reagents(max_vol, flags) . = ..() RegisterSignals(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)) + RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/item/stock_parts/cell/proc/on_reagents_del(datum/reagents/reagents) SIGNAL_HANDLER - UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_PARENT_QDELETING)) + UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_QDELETING)) return NONE /obj/item/stock_parts/cell/update_overlays() diff --git a/code/modules/power/supermatter/supermatter_delamination/cascade_delam.dm b/code/modules/power/supermatter/supermatter_delamination/cascade_delam.dm index 490a5d91fa5..106bc727bbd 100644 --- a/code/modules/power/supermatter/supermatter_delamination/cascade_delam.dm +++ b/code/modules/power/supermatter/supermatter_delamination/cascade_delam.dm @@ -64,7 +64,7 @@ effect_strand_shuttle() sleep(5 SECONDS) var/obj/cascade_portal/rift = effect_evac_rift_start() - RegisterSignal(rift, COMSIG_PARENT_QDELETING, PROC_REF(end_round_holder)) + RegisterSignal(rift, COMSIG_QDELETING, PROC_REF(end_round_holder)) SSsupermatter_cascade.can_fire = TRUE SSsupermatter_cascade.cascade_initiated = TRUE effect_crystal_mass(sm, rift) diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index eea60afd8cf..f388073237d 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -288,7 +288,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_REF(on_portal_destroy)) + RegisterSignal(P, COMSIG_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/special/medbeam.dm b/code/modules/projectiles/guns/special/medbeam.dm index 92977ffb22c..d3ee77ef3b3 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_REF(beam_died))//this is a WAY better rangecheck than what was done before (process check) + RegisterSignal(current_beam, COMSIG_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/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index 73a6d14e16a..28ec3545880 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -222,11 +222,11 @@ */ /obj/machinery/chem_heater/proc/add_ui_client_list(new_ui) LAZYADD(ui_client_list, new_ui) - RegisterSignal(new_ui, COMSIG_PARENT_QDELETING, PROC_REF(on_ui_deletion)) + RegisterSignal(new_ui, COMSIG_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) - UnregisterSignal(old_ui, COMSIG_PARENT_QDELETING) + UnregisterSignal(old_ui, COMSIG_QDELETING) LAZYREMOVE(ui_client_list, old_ui) ///This catches a signal and uses it to delete the ui instance from the list diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index dcb91024cc0..5c8a740fd6d 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -803,10 +803,10 @@ /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_REF(on_living_holder_deletion)) + RegisterSignal(living_holder, COMSIG_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) + UnregisterSignal(living_holder, COMSIG_QDELETING) var/obj/effect/dummy/lighting_obj/moblight/mob_light_obj = LAZYACCESS(mobs_affected, living_holder) LAZYREMOVE(mobs_affected, living_holder) if(mob_light_obj) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index ffb927556fe..09f595b93d2 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -60,7 +60,7 @@ /obj/item/reagent_containers/create_reagents(max_vol, flags) . = ..() RegisterSignals(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)) + RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del)) /obj/item/reagent_containers/attack(mob/living/target_mob, mob/living/user, params) if (!user.combat_mode) @@ -69,7 +69,7 @@ /obj/item/reagent_containers/proc/on_reagents_del(datum/reagents/reagents) SIGNAL_HANDLER - UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_PARENT_QDELETING)) + UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_QDELETING)) return NONE /obj/item/reagent_containers/proc/add_initial_reagents() diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index c761cee263c..93e5255f85e 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -89,7 +89,7 @@ reagent_puff.sprayer = src reagent_puff.lifetime = puff_reagent_left reagent_puff.stream = stream_mode - reagent_puff.RegisterSignal(our_loop, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/obj/effect/decal/chempuff, loop_ended)) + reagent_puff.RegisterSignal(our_loop, COMSIG_QDELETING, TYPE_PROC_REF(/obj/effect/decal/chempuff, loop_ended)) reagent_puff.RegisterSignal(our_loop, COMSIG_MOVELOOP_POSTPROCESS, TYPE_PROC_REF(/obj/effect/decal/chempuff, check_move)) /obj/item/reagent_containers/spray/attack_self(mob/user) diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index 480588b2cbd..ff8c6abd2fd 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -132,9 +132,9 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) neighbors["[direction]"] = TRUE valid.neighbors["[DIRFLIP(direction)]"] = 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) + RegisterSignal(valid, COMSIG_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) + valid.RegisterSignal(src, COMSIG_QDELETING, PROC_REF(nearby_belt_changed), override=TRUE) /obj/machinery/conveyor/proc/nearby_belt_changed(datum/source) SIGNAL_HANDLER diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index 088abe0a09b..69b7ca823c9 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -82,7 +82,7 @@ if(our_loop) 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)) + RegisterSignal(our_loop, COMSIG_QDELETING, PROC_REF(movement_stop)) current_pipe = loc /// Handles the preprocess check signal, sets the current pipe as the last pipe diff --git a/code/modules/religion/honorbound/honorbound_trauma.dm b/code/modules/religion/honorbound/honorbound_trauma.dm index 734854d2364..350e02c29f6 100644 --- a/code/modules/religion/honorbound/honorbound_trauma.dm +++ b/code/modules/religion/honorbound/honorbound_trauma.dm @@ -16,7 +16,7 @@ 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_REF(attackby_guilt)) + RegisterSignal(owner, COMSIG_ATOM_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)) @@ -32,7 +32,7 @@ /datum/brain_trauma/special/honorbound/on_lose(silent) owner.clear_mood_event("honorbound") UnregisterSignal(owner, list( - COMSIG_PARENT_ATTACKBY, + COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW, @@ -234,13 +234,13 @@ if(QDELETED(honorbound)) return FALSE - RegisterSignal(honorbound, COMSIG_PARENT_QDELETING, PROC_REF(on_honor_trauma_lost)) + RegisterSignal(honorbound, COMSIG_QDELETING, PROC_REF(on_honor_trauma_lost)) honor_trauma = honorbound return ..() /datum/action/cooldown/spell/pointed/declare_evil/Remove(mob/living/remove_from) . = ..() - UnregisterSignal(honor_trauma, COMSIG_PARENT_QDELETING) + UnregisterSignal(honor_trauma, COMSIG_QDELETING) honor_trauma = null /// If we lose our honor trauma somehow, self-delete (and clear references) diff --git a/code/modules/religion/sparring/sparring_datum.dm b/code/modules/religion/sparring/sparring_datum.dm index 172c4bb1869..5d4853b378e 100644 --- a/code/modules/religion/sparring/sparring_datum.dm +++ b/code/modules/religion/sparring/sparring_datum.dm @@ -36,7 +36,7 @@ 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_REF(melee_violation)) + RegisterSignal(sparring, COMSIG_ATOM_ATTACKBY, PROC_REF(melee_violation)) //arena conditions RegisterSignal(sparring, COMSIG_MOVABLE_MOVED, PROC_REF(arena_violation)) //severe violations (insta violation win for other party) conditions @@ -44,7 +44,7 @@ //win conditions RegisterSignal(sparring, COMSIG_MOB_STATCHANGE, PROC_REF(check_for_victory)) //flub conditions - RegisterSignal(sparring, COMSIG_PARENT_ATTACKBY, PROC_REF(outsider_interference), override = TRUE) + RegisterSignal(sparring, COMSIG_ATOM_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) @@ -52,7 +52,7 @@ 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_REF(death_flub)) - RegisterSignal(sparring, COMSIG_PARENT_QDELETING, PROC_REF(deletion_flub)) + RegisterSignal(sparring, COMSIG_QDELETING, PROC_REF(deletion_flub)) /datum/sparring_match/proc/unhook_signals(mob/living/carbon/human/sparring) if(!sparring) @@ -64,14 +64,14 @@ COMSIG_MOVABLE_MOVED, COMSIG_MOVABLE_POST_TELEPORT, COMSIG_MOB_STATCHANGE, - COMSIG_PARENT_ATTACKBY, + COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_HULK_ATTACK, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_PAW, COMSIG_ATOM_HITBY, COMSIG_ATOM_BULLET_ACT, COMSIG_LIVING_DEATH, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, )) ///someone is changing health state, end the fight in crit diff --git a/code/modules/research/ordnance/tank_compressor.dm b/code/modules/research/ordnance/tank_compressor.dm index 958770a1d1a..44d1505b086 100644 --- a/code/modules/research/ordnance/tank_compressor.dm +++ b/code/modules/research/ordnance/tank_compressor.dm @@ -58,7 +58,7 @@ return ..() inserted_tank = tank_item last_recorded_pressure = 0 - RegisterSignal(inserted_tank, COMSIG_PARENT_QDELETING, PROC_REF(tank_destruction)) + RegisterSignal(inserted_tank, COMSIG_QDELETING, PROC_REF(tank_destruction)) update_appearance() return if(istype(item, /obj/item/computer_disk)) @@ -236,7 +236,7 @@ if(gone == inserted_disk) inserted_disk = null if(gone == inserted_tank) - UnregisterSignal(inserted_tank, COMSIG_PARENT_QDELETING) + UnregisterSignal(inserted_tank, COMSIG_QDELETING) inserted_tank = null update_appearance() return ..() diff --git a/code/modules/research/xenobiology/vatgrowing/vatgrower.dm b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm index 204658fd447..fecb437d233 100644 --- a/code/modules/research/xenobiology/vatgrowing/vatgrower.dm +++ b/code/modules/research/xenobiology/vatgrowing/vatgrower.dm @@ -21,12 +21,12 @@ /obj/machinery/plumbing/growing_vat/create_reagents(max_vol, flags) . = ..() RegisterSignals(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)) + RegisterSignal(reagents, COMSIG_QDELETING, PROC_REF(on_reagents_del)) /// Handles properly detaching signal hooks. /obj/machinery/plumbing/growing_vat/proc/on_reagents_del(datum/reagents/reagents) SIGNAL_HANDLER - UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_PARENT_QDELETING)) + UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_QDELETING)) return NONE ///When we process, we make use of our reagents to try and feed the samples we have. diff --git a/code/modules/spells/spell_types/jaunt/bloodcrawl.dm b/code/modules/spells/spell_types/jaunt/bloodcrawl.dm index ce514b004a5..8b82595a1f0 100644 --- a/code/modules/spells/spell_types/jaunt/bloodcrawl.dm +++ b/code/modules/spells/spell_types/jaunt/bloodcrawl.dm @@ -275,10 +275,10 @@ to_chat(jaunter, span_clown("[victim] joins your party! Your health is fully restored.")) consumed_mobs += victim RegisterSignal(victim, COMSIG_MOB_STATCHANGE, PROC_REF(on_victim_statchange)) - RegisterSignal(victim, COMSIG_PARENT_QDELETING, PROC_REF(on_victim_deleted)) + RegisterSignal(victim, COMSIG_QDELETING, PROC_REF(on_victim_deleted)) /** - * Signal proc for COMSIG_LIVING_DEATH and COMSIG_PARENT_QDELETING + * Signal proc for COMSIG_LIVING_DEATH and COMSIG_QDELETING * * If our demon is deleted or destroyed, expel all of our consumed mobs */ @@ -289,7 +289,7 @@ for(var/mob/living/friend as anything in consumed_mobs) // Unregister the signals first - UnregisterSignal(friend, list(COMSIG_MOB_STATCHANGE, COMSIG_PARENT_QDELETING)) + UnregisterSignal(friend, list(COMSIG_MOB_STATCHANGE, COMSIG_QDELETING)) friend.forceMove(release_turf) // Heals them back to state one diff --git a/code/modules/spells/spell_types/self/summonitem.dm b/code/modules/spells/spell_types/self/summonitem.dm index 2e5b50bd2e4..bf01204ce57 100644 --- a/code/modules/spells/spell_types/self/summonitem.dm +++ b/code/modules/spells/spell_types/self/summonitem.dm @@ -22,15 +22,15 @@ /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_REF(on_marked_item_deleted)) + RegisterSignal(marked_item, COMSIG_QDELETING, PROC_REF(on_marked_item_deleted)) /// Unset our current marked item /datum/action/cooldown/spell/summonitem/proc/unmark_item() name = initial(name) - UnregisterSignal(marked_item, COMSIG_PARENT_QDELETING) + UnregisterSignal(marked_item, COMSIG_QDELETING) marked_item = null -/// Signal proc for COMSIG_PARENT_QDELETING on our marked item, unmarks our item if it's deleted +/// Signal proc for COMSIG_QDELETING on our marked item, unmarks our item if it's deleted /datum/action/cooldown/spell/summonitem/proc/on_marked_item_deleted(datum/source) SIGNAL_HANDLER diff --git a/code/modules/spells/spell_types/shapeshift/_shape_status.dm b/code/modules/spells/spell_types/shapeshift/_shape_status.dm index 620a91bf58d..b0e8941600b 100644 --- a/code/modules/spells/spell_types/shapeshift/_shape_status.dm +++ b/code/modules/spells/spell_types/shapeshift/_shape_status.dm @@ -38,7 +38,7 @@ 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)) + RegisterSignal(caster_mob, COMSIG_QDELETING, PROC_REF(on_caster_deleted)) SEND_SIGNAL(caster_mob, COMSIG_LIVING_SHAPESHIFTED, owner) return TRUE @@ -74,7 +74,7 @@ already_restored = TRUE UnregisterSignal(owner, list(COMSIG_LIVING_PRE_WABBAJACKED, COMSIG_LIVING_DEATH)) - UnregisterSignal(caster_mob, list(COMSIG_PARENT_QDELETING, COMSIG_LIVING_DEATH)) + UnregisterSignal(caster_mob, list(COMSIG_QDELETING, COMSIG_LIVING_DEATH)) caster_mob.forceMove(owner.loc) caster_mob.notransform = FALSE @@ -121,7 +121,7 @@ else owner.death() -/// Signal proc for [COMSIG_PARENT_QDELETING] from our caster, delete us / our owner if we get deleted +/// Signal proc for [COMSIG_QDELETING] from our caster, delete us / our owner if we get deleted /datum/status_effect/shapechange_mob/proc/on_caster_deleted(datum/source) SIGNAL_HANDLER diff --git a/code/modules/spells/spell_types/touch/_touch.dm b/code/modules/spells/spell_types/touch/_touch.dm index 50150312fcc..df3aa0d7cf5 100644 --- a/code/modules/spells/spell_types/touch/_touch.dm +++ b/code/modules/spells/spell_types/touch/_touch.dm @@ -130,7 +130,7 @@ 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_ITEM_DROPPED, PROC_REF(on_hand_dropped)) - RegisterSignal(attached_hand, COMSIG_PARENT_QDELETING, PROC_REF(on_hand_deleted)) + RegisterSignal(attached_hand, COMSIG_QDELETING, PROC_REF(on_hand_deleted)) // We can high five with our touch hand. It casts the spell on people. Radical attached_hand.AddElement(/datum/element/high_fiver) @@ -144,7 +144,7 @@ COMSIG_ITEM_AFTERATTACK, COMSIG_ITEM_AFTERATTACK_SECONDARY, COMSIG_ITEM_DROPPED, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, COMSIG_ITEM_OFFER_TAKEN, )) @@ -273,7 +273,7 @@ return SECONDARY_ATTACK_CALL_NORMAL /** - * Signal proc for [COMSIG_PARENT_QDELETING] from our attached hand. + * Signal proc for [COMSIG_QDELETING] from our attached hand. * * If our hand is deleted for a reason unrelated to our spell, * unlink it (clear refs) and revert the cooldown diff --git a/code/modules/surgery/bodyparts/worn_feature_offset.dm b/code/modules/surgery/bodyparts/worn_feature_offset.dm index 3e2a9c7c2d7..ec2b7ddefdd 100644 --- a/code/modules/surgery/bodyparts/worn_feature_offset.dm +++ b/code/modules/surgery/bodyparts/worn_feature_offset.dm @@ -54,7 +54,7 @@ UnregisterSignal(old_owner, COMSIG_ATOM_POST_DIR_CHANGE) if (!isnull(new_owner)) RegisterSignal(new_owner, COMSIG_ATOM_POST_DIR_CHANGE, PROC_REF(on_dir_change)) - RegisterSignal(new_owner, COMSIG_PARENT_QDELETING, PROC_REF(on_owner_deleted)) + RegisterSignal(new_owner, COMSIG_QDELETING, PROC_REF(on_owner_deleted)) /// If the owner is deleted, stop updating /datum/worn_feature_offset/proc/on_owner_deleted(mob/living/host) diff --git a/code/modules/surgery/organs/_organ.dm b/code/modules/surgery/organs/_organ.dm index 72af231e56e..6c68ed3d0d5 100644 --- a/code/modules/surgery/organs/_organ.dm +++ b/code/modules/surgery/organs/_organ.dm @@ -108,7 +108,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) for(var/datum/status_effect/effect as anything in organ_effects) organ_owner.apply_status_effect(effect, type) - RegisterSignal(owner, COMSIG_PARENT_EXAMINE, PROC_REF(on_owner_examine)) + RegisterSignal(owner, COMSIG_ATOM_EXAMINE, PROC_REF(on_owner_examine)) SEND_SIGNAL(src, COMSIG_ORGAN_IMPLANTED, organ_owner) SEND_SIGNAL(organ_owner, COMSIG_CARBON_GAIN_ORGAN, src, special) @@ -147,7 +147,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ) for(var/datum/status_effect/effect as anything in organ_effects) organ_owner.remove_status_effect(effect, type) - UnregisterSignal(organ_owner, COMSIG_PARENT_EXAMINE) + UnregisterSignal(organ_owner, COMSIG_ATOM_EXAMINE) SEND_SIGNAL(src, COMSIG_ORGAN_REMOVED, organ_owner) SEND_SIGNAL(organ_owner, COMSIG_CARBON_LOSE_ORGAN, src, special) diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index 5faa98b24d0..9e80dc060a5 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -303,10 +303,10 @@ return RegisterSignal(heart_owner, COMSIG_MOB_STATCHANGE, PROC_REF(on_stat_change)) RegisterSignal(heart_owner, COMSIG_LIVING_POST_FULLY_HEAL, PROC_REF(on_owner_fully_heal)) - RegisterSignal(heart_owner, COMSIG_PARENT_QDELETING, PROC_REF(owner_deleted)) + RegisterSignal(heart_owner, COMSIG_QDELETING, PROC_REF(owner_deleted)) /obj/item/organ/internal/heart/ethereal/Remove(mob/living/carbon/heart_owner, special = FALSE) - UnregisterSignal(heart_owner, list(COMSIG_MOB_STATCHANGE, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_PARENT_QDELETING)) + UnregisterSignal(heart_owner, list(COMSIG_MOB_STATCHANGE, COMSIG_LIVING_POST_FULLY_HEAL, COMSIG_QDELETING)) REMOVE_TRAIT(heart_owner, TRAIT_CORPSELOCKED, SPECIES_TRAIT) stop_crystalization_process(heart_owner) QDEL_NULL(current_crystal) @@ -366,7 +366,7 @@ crystalize_timer_id = addtimer(CALLBACK(src, PROC_REF(crystalize), victim), CRYSTALIZE_PRE_WAIT_TIME, TIMER_STOPPABLE) RegisterSignal(victim, COMSIG_HUMAN_DISARM_HIT, PROC_REF(reset_crystalizing)) - RegisterSignal(victim, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine), override = TRUE) + RegisterSignal(victim, COMSIG_ATOM_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 @@ -399,7 +399,7 @@ ///Stop the crystalization process, unregistering any signals and resetting any variables. /obj/item/organ/internal/heart/ethereal/proc/stop_crystalization_process(mob/living/ethereal, succesful = FALSE) UnregisterSignal(ethereal, COMSIG_HUMAN_DISARM_HIT) - UnregisterSignal(ethereal, COMSIG_PARENT_EXAMINE) + UnregisterSignal(ethereal, COMSIG_ATOM_EXAMINE) UnregisterSignal(ethereal, COMSIG_MOB_APPLY_DAMAGE) crystalization_process_damage = 0 //Reset damage taken during crystalization diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 12e52cdee8e..05f12f50fb0 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -157,10 +157,10 @@ /datum/action/item_action/organ_action/statue/New(Target) . = ..() statue = new - RegisterSignal(statue, COMSIG_PARENT_QDELETING, PROC_REF(statue_destroyed)) + RegisterSignal(statue, COMSIG_QDELETING, PROC_REF(statue_destroyed)) /datum/action/item_action/organ_action/statue/Destroy() - UnregisterSignal(statue, COMSIG_PARENT_QDELETING) + UnregisterSignal(statue, COMSIG_QDELETING) QDEL_NULL(statue) . = ..() diff --git a/code/modules/tooltip/tooltip.dm b/code/modules/tooltip/tooltip.dm index a2fbd42ec84..49539920920 100644 --- a/code/modules/tooltip/tooltip.dm +++ b/code/modules/tooltip/tooltip.dm @@ -41,9 +41,9 @@ Notes: return FALSE if (!isnull(last_target)) - UnregisterSignal(last_target, COMSIG_PARENT_QDELETING) + UnregisterSignal(last_target, COMSIG_QDELETING) - RegisterSignal(thing, COMSIG_PARENT_QDELETING, PROC_REF(on_target_qdel)) + RegisterSignal(thing, COMSIG_QDELETING, PROC_REF(on_target_qdel)) last_target = thing diff --git a/code/modules/tutorials/_tutorial.dm b/code/modules/tutorials/_tutorial.dm index 69f63738955..810960f9fa7 100644 --- a/code/modules/tutorials/_tutorial.dm +++ b/code/modules/tutorials/_tutorial.dm @@ -13,8 +13,8 @@ /datum/tutorial/New(mob/user) src.user = user - RegisterSignal(user, COMSIG_PARENT_QDELETING, PROC_REF(destroy_self)) - RegisterSignal(user.client, COMSIG_PARENT_QDELETING, PROC_REF(destroy_self)) + RegisterSignal(user, COMSIG_QDELETING, PROC_REF(destroy_self)) + RegisterSignal(user.client, COMSIG_QDELETING, PROC_REF(destroy_self)) /datum/tutorial/Destroy(force, ...) user.client?.screen -= instruction_screen diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index ff40da7e8c7..03554ac081d 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -175,12 +175,12 @@ /// 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_REF(remove_trailer)) + RegisterSignal(trailer, COMSIG_QDELETING, PROC_REF(remove_trailer)) /// To remove a trailer from the vehicle in a manner that allows safe qdels /obj/vehicle/proc/remove_trailer() SIGNAL_HANDLER - UnregisterSignal(trailer, COMSIG_PARENT_QDELETING) + UnregisterSignal(trailer, COMSIG_QDELETING) trailer = null /obj/vehicle/Move(newloc, dir) diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm index c550e0cbeda..8364a9b32ba 100644 --- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm @@ -276,12 +276,12 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/create_reagents(max_vol, flags) . = ..() RegisterSignals(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)) + RegisterSignal(reagents, COMSIG_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) SIGNAL_HANDLER - UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_PARENT_QDELETING)) + UnregisterSignal(reagents, list(COMSIG_REAGENTS_NEW_REAGENT, COMSIG_REAGENTS_ADD_REAGENT, COMSIG_REAGENTS_DEL_REAGENT, COMSIG_REAGENTS_REM_REAGENT, COMSIG_QDELETING)) return NONE /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/detach() diff --git a/code/modules/vehicles/pimpin_ride.dm b/code/modules/vehicles/pimpin_ride.dm index b3f85242b50..c074626cbd2 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_REF(bag_deleted)) + RegisterSignal(trash_bag, COMSIG_QDELETING, PROC_REF(bag_deleted)) SEND_SIGNAL(src, COMSIG_VACUUM_BAG_ATTACH, I) update_appearance() else if(istype(I, /obj/item/janicart_upgrade)) @@ -105,7 +105,7 @@ if (remover) trash_bag.forceMove(get_turf(remover)) remover.put_in_hands(trash_bag) - UnregisterSignal(trash_bag, COMSIG_PARENT_QDELETING) + UnregisterSignal(trash_bag, COMSIG_QDELETING) trash_bag = null SEND_SIGNAL(src, COMSIG_VACUUM_BAG_DETACH) update_appearance() diff --git a/code/modules/visuals/render_steps.dm b/code/modules/visuals/render_steps.dm index 7779431a3ec..e29436596c6 100644 --- a/code/modules/visuals/render_steps.dm +++ b/code/modules/visuals/render_steps.dm @@ -21,7 +21,7 @@ render_source = source.render_target SET_PLANE_EXPLICIT(src, initial(plane), source) - RegisterSignal(source, COMSIG_PARENT_QDELETING, PROC_REF(on_source_deleting)) + RegisterSignal(source, COMSIG_QDELETING, PROC_REF(on_source_deleting)) /atom/movable/render_step/ex_act(severity) return FALSE diff --git a/code/modules/wiremod/components/abstract/variable.dm b/code/modules/wiremod/components/abstract/variable.dm index 3042a7e0686..0837024c128 100644 --- a/code/modules/wiremod/components/abstract/variable.dm +++ b/code/modules/wiremod/components/abstract/variable.dm @@ -50,7 +50,7 @@ if(current_variable) if(should_listen) current_variable.remove_listener(src) - UnregisterSignal(current_variable, COMSIG_PARENT_QDELETING) + UnregisterSignal(current_variable, COMSIG_QDELETING) current_variable = null /obj/item/circuit_component/variable/proc/set_current_variable(datum/circuit_variable/variable) @@ -61,4 +61,4 @@ current_variable = variable if(should_listen) current_variable.add_listener(src) - RegisterSignal(current_variable, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_variable)) + RegisterSignal(current_variable, COMSIG_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 aad190db2b1..ddb29e190d5 100644 --- a/code/modules/wiremod/components/action/mmi.dm +++ b/code/modules/wiremod/components/action/mmi.dm @@ -78,10 +78,10 @@ /obj/item/circuit_component/mmi/register_shell(atom/movable/shell) . = ..() - RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_attack_by)) + RegisterSignal(shell, COMSIG_ATOM_ATTACKBY, PROC_REF(handle_attack_by)) /obj/item/circuit_component/mmi/unregister_shell(atom/movable/shell) - UnregisterSignal(shell, COMSIG_PARENT_ATTACKBY) + UnregisterSignal(shell, COMSIG_ATOM_ATTACKBY) remove_current_brain() return ..() @@ -101,7 +101,7 @@ if(to_add.brainmob) update_mmi_mob(to_add, null, to_add.brainmob) brain = to_add - RegisterSignal(to_add, COMSIG_PARENT_QDELETING, PROC_REF(remove_current_brain)) + RegisterSignal(to_add, COMSIG_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) @@ -118,7 +118,7 @@ if(brain.brainmob) update_mmi_mob(brain, brain.brainmob) UnregisterSignal(brain, list( - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, COMSIG_MOVABLE_MOVED )) if(brain.loc == src) diff --git a/code/modules/wiremod/components/admin/signal_handler/signal_list.dm b/code/modules/wiremod/components/admin/signal_handler/signal_list.dm index e675698c067..8fbff3dcfaa 100644 --- a/code/modules/wiremod/components/admin/signal_handler/signal_list.dm +++ b/code/modules/wiremod/components/admin/signal_handler/signal_list.dm @@ -26,10 +26,10 @@ GLOBAL_LIST_INIT(integrated_circuit_signal_ids, generate_circuit_signal_list()) var/entity = circuit_signal_param("Entity", PORT_TYPE_ATOM) return list( - COMSIG_PARENT_QDELETING = list(), - COMSIG_PARENT_ATTACKBY = list(circuit_signal_response("Cancel Attack", COMPONENT_NO_AFTERATTACK), item, user), - COMSIG_PARENT_ATTACKBY_SECONDARY = list(circuit_signal_response("Cancel Attack", COMPONENT_NO_AFTERATTACK), item, user), - COMSIG_PARENT_EXAMINE = list(user), + COMSIG_QDELETING = list(), + COMSIG_ATOM_ATTACKBY = list(circuit_signal_response("Cancel Attack", COMPONENT_NO_AFTERATTACK), item, user), + COMSIG_ATOM_ATTACKBY_SECONDARY = list(circuit_signal_response("Cancel Attack", COMPONENT_NO_AFTERATTACK), item, user), + COMSIG_ATOM_EXAMINE = list(user), COMSIG_ATOM_ATTACK_HAND = list(cancel_attack, user), COMSIG_ATOM_ATTACK_GHOST = list(cancel_attack, user), diff --git a/code/modules/wiremod/core/integrated_circuit.dm b/code/modules/wiremod/core/integrated_circuit.dm index 94ab49cd0f0..c754abaaae3 100644 --- a/code/modules/wiremod/core/integrated_circuit.dm +++ b/code/modules/wiremod/core/integrated_circuit.dm @@ -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_REF(remove_current_shell)) + RegisterSignal(shell, COMSIG_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 @@ -201,7 +201,7 @@ GLOBAL_LIST_EMPTY_TYPED(integrated_circuits, /obj/item/integrated_circuit) shell.name = initial(shell.name) for(var/obj/item/circuit_component/attached_component as anything in attached_components) attached_component.unregister_shell(shell) - UnregisterSignal(shell, COMSIG_PARENT_QDELETING) + UnregisterSignal(shell, COMSIG_QDELETING) shell = null set_on(FALSE) SEND_SIGNAL(src, COMSIG_CIRCUIT_SHELL_REMOVED) diff --git a/code/modules/wiremod/core/marker.dm b/code/modules/wiremod/core/marker.dm index 193699dd082..ecd68be413c 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_REF(cleanup_marked_atom)) + RegisterSignal(marked_atom, COMSIG_QDELETING, PROC_REF(cleanup_marked_atom)) update_icon() flick("multitool_circuit_flick", src) playsound(src.loc, 'sound/misc/compiler-stage2.ogg', 30, TRUE) @@ -50,7 +50,7 @@ /obj/item/multitool/circuit/proc/clear_marked_atom() if(!marked_atom) return - UnregisterSignal(marked_atom, COMSIG_PARENT_QDELETING) + UnregisterSignal(marked_atom, COMSIG_QDELETING) marked_atom = null update_icon() diff --git a/code/modules/wiremod/core/port.dm b/code/modules/wiremod/core/port.dm index 7418a4501f2..0771506076b 100644 --- a/code/modules/wiremod/core/port.dm +++ b/code/modules/wiremod/core/port.dm @@ -52,13 +52,13 @@ if(src.value != value || force) if(isdatum(src.value)) - UnregisterSignal(src.value, COMSIG_PARENT_QDELETING) + UnregisterSignal(src.value, COMSIG_QDELETING) if(datatype_handler.is_extensive) src.value = datatype_handler.convert_value_extensive(src, value, force) else src.value = datatype_handler.convert_value(src, value, force) if(isdatum(value)) - RegisterSignal(value, COMSIG_PARENT_QDELETING, PROC_REF(null_value)) + RegisterSignal(value, COMSIG_QDELETING, PROC_REF(null_value)) SEND_SIGNAL(src, COMSIG_PORT_SET_VALUE, value) /** @@ -152,7 +152,7 @@ if(value == source) value = null else - stack_trace("Impossible? [src] should only receive COMSIG_PARENT_QDELETING from an atom currently in the port, not [source].") + stack_trace("Impossible? [src] should only receive COMSIG_QDELETING from an atom currently in the port, not [source].") /** * # Input Port diff --git a/code/modules/wiremod/core/usb_cable.dm b/code/modules/wiremod/core/usb_cable.dm index 339b2643f00..5c317c85d61 100644 --- a/code/modules/wiremod/core/usb_cable.dm +++ b/code/modules/wiremod/core/usb_cable.dm @@ -88,13 +88,13 @@ /obj/item/usb_cable/proc/register_circuit_signals() RegisterSignal(attached_circuit, COMSIG_MOVABLE_MOVED, PROC_REF(on_moved)) - RegisterSignal(attached_circuit, COMSIG_PARENT_QDELETING, PROC_REF(on_circuit_qdeling)) + RegisterSignal(attached_circuit, COMSIG_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( COMSIG_MOVABLE_MOVED, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, )) UnregisterSignal(attached_circuit.shell, COMSIG_MOVABLE_MOVED) diff --git a/code/modules/wiremod/core/variable.dm b/code/modules/wiremod/core/variable.dm index b39e8161ee7..b5822b0e324 100644 --- a/code/modules/wiremod/core/variable.dm +++ b/code/modules/wiremod/core/variable.dm @@ -45,9 +45,9 @@ /// 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_REF(on_listener_qdel)) + RegisterSignal(to_add, COMSIG_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) - UnregisterSignal(to_remove, COMSIG_PARENT_QDELETING) + UnregisterSignal(to_remove, COMSIG_QDELETING) listeners -= to_remove diff --git a/code/modules/wiremod/shell/brain_computer_interface.dm b/code/modules/wiremod/shell/brain_computer_interface.dm index 8b9a825ba48..99a2661e004 100644 --- a/code/modules/wiremod/shell/brain_computer_interface.dm +++ b/code/modules/wiremod/shell/brain_computer_interface.dm @@ -183,7 +183,7 @@ user_port.set_output(owner) user = WEAKREF(owner) - RegisterSignal(owner, COMSIG_PARENT_EXAMINE, PROC_REF(on_examine)) + RegisterSignal(owner, COMSIG_ATOM_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)) @@ -194,7 +194,7 @@ user = null UnregisterSignal(owner, list( - COMSIG_PARENT_EXAMINE, + COMSIG_ATOM_EXAMINE, COMSIG_PROCESS_BORGCHARGER_OCCUPANT, COMSIG_LIVING_ELECTROCUTE_ACT, )) diff --git a/code/modules/wiremod/shell/dispenser.dm b/code/modules/wiremod/shell/dispenser.dm index 89bb59f1897..6b196e29a5b 100644 --- a/code/modules/wiremod/shell/dispenser.dm +++ b/code/modules/wiremod/shell/dispenser.dm @@ -33,7 +33,7 @@ stored_items += to_add to_add.forceMove(src) RegisterSignal(to_add, COMSIG_MOVABLE_MOVED, PROC_REF(handle_stored_item_moved)) - RegisterSignal(to_add, COMSIG_PARENT_QDELETING, PROC_REF(handle_stored_item_deleted)) + RegisterSignal(to_add, COMSIG_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) @@ -48,7 +48,7 @@ /obj/structure/dispenser_bot/proc/remove_item(obj/item/to_remove) UnregisterSignal(to_remove, list( COMSIG_MOVABLE_MOVED, - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, )) to_remove.forceMove(drop_location()) stored_items -= to_remove @@ -148,7 +148,7 @@ /obj/item/circuit_component/dispenser_bot/proc/remove_vendor_component(obj/item/circuit_component/vendor_component/vendor_component) SIGNAL_HANDLER UnregisterSignal(vendor_component, list( - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, COMSIG_CIRCUIT_COMPONENT_REMOVED, )) if(!QDELING(vendor_component)) @@ -165,7 +165,7 @@ parent.add_component(vendor_component, user) vendor_components += vendor_component RegisterSignals(vendor_component, list( - COMSIG_PARENT_QDELETING, + COMSIG_QDELETING, COMSIG_CIRCUIT_COMPONENT_REMOVED, ), PROC_REF(remove_vendor_component)) diff --git a/code/modules/wiremod/shell/moneybot.dm b/code/modules/wiremod/shell/moneybot.dm index c3a4443b5e4..0b406eb66c5 100644 --- a/code/modules/wiremod/shell/moneybot.dm +++ b/code/modules/wiremod/shell/moneybot.dm @@ -103,14 +103,14 @@ if(istype(shell, /obj/structure/money_bot)) attached_bot = shell total_money.set_output(attached_bot.stored_money) - RegisterSignal(shell, COMSIG_PARENT_ATTACKBY, PROC_REF(handle_money_insert)) + RegisterSignal(shell, COMSIG_ATOM_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) UnregisterSignal(shell, list( - COMSIG_PARENT_ATTACKBY, + COMSIG_ATOM_ATTACKBY, COMSIG_MONEYBOT_ADD_MONEY, )) total_money.set_output(null) diff --git a/tgstation.dme b/tgstation.dme index 504f7cfe6cf..a7ec95e3069 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -689,6 +689,7 @@ #include "code\datums\ruins.dm" #include "code\datums\saymode.dm" #include "code\datums\shuttles.dm" +#include "code\datums\signals.dm" #include "code\datums\spawners_menu.dm" #include "code\datums\station_alert.dm" #include "code\datums\station_integrity.dm"