From b01d3f3efe425294c3850287c86448be1df0db9e Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 30 Oct 2020 03:33:27 +0100 Subject: [PATCH] [MIRROR] Fixes two incorrectly named COMSIG defines. (#1510) * Fixes two incorrectly named COMSIG defines (#54660) * Fixes two incorrectly named COMSIG defines. Co-authored-by: Timberpoes --- code/__DEFINES/dcs/signals.dm | 4 ++-- code/game/atoms_movable.dm | 4 ++-- code/game/objects/items/tcg/tcg.dm | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index a818bca682a..b66f06bc10e 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -153,9 +153,9 @@ #define COMSIG_ATOM_SET_OPACITY "atom_set_opacity" //from base of atom/movable/on_enter_storage(): (datum/component/storage/concrete/master_storage) -#define COMISG_STORAGE_ENTERED "storage_entered" +#define COMSIG_STORAGE_ENTERED "storage_entered" //from base of atom/movable/on_exit_storage(): (datum/component/storage/concrete/master_storage) -#define CONSIG_STORAGE_EXITED "storage_exited" +#define COMSIG_STORAGE_EXITED "storage_exited" ///from base of atom/expose_reagents(): (/list, /datum/reagents, methods, volume_modifier, show_message) #define COMSIG_ATOM_EXPOSE_REAGENTS "atom_expose_reagents" diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index a1a446ad694..575481f5f4e 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -791,11 +791,11 @@ /// called when this atom is removed from a storage item, which is passed on as S. The loc variable is already set to the new destination before this is called. /atom/movable/proc/on_exit_storage(datum/component/storage/concrete/master_storage) - SEND_SIGNAL(src, CONSIG_STORAGE_EXITED, master_storage) + SEND_SIGNAL(src, COMSIG_STORAGE_EXITED, master_storage) /// called when this atom is added into a storage item, which is passed on as S. The loc variable is already set to the storage item. /atom/movable/proc/on_enter_storage(datum/component/storage/concrete/master_storage) - SEND_SIGNAL(src, COMISG_STORAGE_ENTERED, master_storage) + SEND_SIGNAL(src, COMSIG_STORAGE_ENTERED, master_storage) /atom/movable/proc/get_spacemove_backup() var/atom/movable/dense_object_backup diff --git a/code/game/objects/items/tcg/tcg.dm b/code/game/objects/items/tcg/tcg.dm index 80bffc48afc..6fe397b30c7 100644 --- a/code/game/objects/items/tcg/tcg.dm +++ b/code/game/objects/items/tcg/tcg.dm @@ -27,8 +27,8 @@ GLOBAL_LIST_EMPTY(cached_cards) /obj/item/tcgcard/Initialize(mapload, datum_series, datum_id) . = ..() zoom_out() - RegisterSignal(src, COMISG_STORAGE_ENTERED, .proc/zoom_in) - RegisterSignal(src, CONSIG_STORAGE_EXITED, .proc/zoom_out) + RegisterSignal(src, COMSIG_STORAGE_ENTERED, .proc/zoom_in) + RegisterSignal(src, COMSIG_STORAGE_EXITED, .proc/zoom_out) //If they are passed as null let's replace them with the vars on the card. this also means we can allow for map loaded ccards if(!datum_series) datum_series = series @@ -350,8 +350,8 @@ GLOBAL_LIST_EMPTY(tcgcard_radial_choices) /obj/item/cardpack/Initialize() . = ..() zoom_out() - RegisterSignal(src, COMISG_STORAGE_ENTERED, .proc/zoom_in) - RegisterSignal(src, CONSIG_STORAGE_EXITED, .proc/zoom_out) + RegisterSignal(src, COMSIG_STORAGE_ENTERED, .proc/zoom_in) + RegisterSignal(src, COMSIG_STORAGE_EXITED, .proc/zoom_out) //Pass by refrance moment //This lets us only have one rarity table per pack, badmins beware if(GLOB.cached_rarity_table[type])