From 41c137832016fe8bfae3b38d164cbbe16a75872c Mon Sep 17 00:00:00 2001 From: TiviPlus <57223640+TiviPlus@users.noreply.github.com> Date: Fri, 1 Apr 2022 01:44:03 +0200 Subject: [PATCH] COMSIG_ATOM_CREATED -> COMSIG_ATOM_INITIALIZED_ON (#65809) Co-authored-by: TiviPlus <572233640+TiviPlus@users.noreply.com> --- .../__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm | 4 ++-- code/game/atoms.dm | 2 +- code/game/objects/structures/industrial_lift.dm | 2 +- code/game/turfs/open/openspace.dm | 4 ++-- code/modules/mining/machine_processing.dm | 6 +++--- code/modules/recycling/conveyor.dm | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) 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 2295d095571..e81529fd70f 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm @@ -3,8 +3,8 @@ // All signals send the source datum of the signal as the first argument // /atom signals -///from base of atom/proc/Initialize(): sent any time a new atom is created -#define COMSIG_ATOM_CREATED "atom_created" +///from base of atom/proc/Initialize(): sent any time a new atom is created in this atom +#define COMSIG_ATOM_INITIALIZED_ON "atom_initialized_on" //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) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index b09edc26746..fbfd49acef6 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -227,7 +227,7 @@ flags_1 |= INITIALIZED_1 if(loc) - SEND_SIGNAL(loc, COMSIG_ATOM_CREATED, src) /// Sends a signal that the new atom `src`, has been created at `loc` + SEND_SIGNAL(loc, COMSIG_ATOM_INITIALIZED_ON, src) /// Sends a signal that the new atom `src`, has been created at `loc` if(greyscale_config && greyscale_colors) update_greyscale() diff --git a/code/game/objects/structures/industrial_lift.dm b/code/game/objects/structures/industrial_lift.dm index d4b90e913bd..9d8d3c14539 100644 --- a/code/game/objects/structures/industrial_lift.dm +++ b/code/game/objects/structures/industrial_lift.dm @@ -172,7 +172,7 @@ GLOBAL_LIST_EMPTY(lifts) var/static/list/loc_connections = list( COMSIG_ATOM_EXITED =.proc/UncrossedRemoveItemFromLift, COMSIG_ATOM_ENTERED = .proc/AddItemOnLift, - COMSIG_ATOM_CREATED = .proc/AddItemOnLift, + COMSIG_ATOM_INITIALIZED_ON = .proc/AddItemOnLift, ) AddElement(/datum/element/connect_loc, loc_connections) RegisterSignal(src, COMSIG_MOVABLE_BUMP, .proc/GracefullyBreak) diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index 6ec7f49ecc5..031820c9d70 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -31,7 +31,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr /turf/open/openspace/Initialize(mapload) // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker . = ..() overlays += GLOB.openspace_backdrop_one_for_all //Special grey square for projecting backdrop darkness filter on it. - RegisterSignal(src, COMSIG_ATOM_CREATED, .proc/on_atom_created) + RegisterSignal(src, COMSIG_ATOM_INITIALIZED_ON, .proc/on_atom_created) return INITIALIZE_HINT_LATELOAD /turf/open/openspace/LateInitialize() @@ -39,7 +39,7 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdr AddElement(/datum/element/turf_z_transparency, is_openspace = TRUE) /turf/open/openspace/ChangeTurf(path, list/new_baseturfs, flags) - UnregisterSignal(src, COMSIG_ATOM_CREATED) + UnregisterSignal(src, COMSIG_ATOM_INITIALIZED_ON) return ..() /** diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index d533c730e2f..c569f8ecb6a 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -24,12 +24,12 @@ /obj/machinery/mineral/proc/register_input_turf() input_turf = get_step(src, input_dir) if(input_turf) // make sure there is actually a turf - RegisterSignal(input_turf, list(COMSIG_ATOM_CREATED, COMSIG_ATOM_ENTERED), .proc/pickup_item) + RegisterSignal(input_turf, list(COMSIG_ATOM_INITIALIZED_ON, COMSIG_ATOM_ENTERED), .proc/pickup_item) /// Unregisters signals that are registered the machine's input turf, if it has one. /obj/machinery/mineral/proc/unregister_input_turf() if(input_turf) - UnregisterSignal(input_turf, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_CREATED)) + UnregisterSignal(input_turf, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_INITIALIZED_ON)) /obj/machinery/mineral/Moved() . = ..() @@ -41,7 +41,7 @@ /** Base proc for all `/mineral` subtype machines to use. Place your item pickup behavior in this proc when you override it for your specific machine. - Called when the COMSIG_ATOM_ENTERED and COMSIG_ATOM_CREATED signals are sent. + Called when the COMSIG_ATOM_ENTERED and COMSIG_ATOM_INITIALIZED_ON signals are sent. Arguments: * source - the turf that is listening for the signals. diff --git a/code/modules/recycling/conveyor.dm b/code/modules/recycling/conveyor.dm index 049ead54580..0ac5996b32c 100644 --- a/code/modules/recycling/conveyor.dm +++ b/code/modules/recycling/conveyor.dm @@ -84,7 +84,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) var/static/list/loc_connections = list( COMSIG_ATOM_EXITED = .proc/conveyable_exit, COMSIG_ATOM_ENTERED = .proc/conveyable_enter, - COMSIG_ATOM_CREATED = .proc/conveyable_enter + COMSIG_ATOM_INITIALIZED_ON = .proc/conveyable_enter ) AddElement(/datum/element/connect_loc, loc_connections) update_move_direction()