cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-22 05:25:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes two incorrectly named COMSIG defines. (#1510)

Browse Source 
* Fixes two incorrectly named COMSIG defines (#54660)

* Fixes two incorrectly named COMSIG defines.

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
This commit is contained in:
SkyratBot
2020-10-30 03:33:27 +01:00
committed by GitHub
parent be770def91
commit b01d3f3efe
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/dcs/signals.dm
+2 -2
View File
@@ -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"
code/game/atoms_movable.dm
+2 -2
View File
@@ -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
code/game/objects/items/tcg/tcg.dm
+4 -4
View File
@@ -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])