diff --git a/code/_compile_options.dm b/code/_compile_options.dm index 4f96217abd2c..154b7e7e05f0 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -44,7 +44,7 @@ //#define UNIT_TESTS //Enables unit tests via TEST_RUN_PARAMETER #ifndef PRELOAD_RSC //set to: -#define PRELOAD_RSC 2 // 0 to allow using external resources or on-demand behaviour; +#define PRELOAD_RSC 0 // 0 to allow using external resources or on-demand behaviour; #endif // 1 to use the default behaviour; // 2 for preloading absolutely everything; diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 225a074b1477..ed173c9fa3de 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -223,10 +223,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) SSredbot.send_discord_message("admin", "Ticket #[id] created by [usr.ckey] ([usr.real_name]): [name]", "ticket") //send it to TGS if nobody is on and tell us how many were on - var/admin_number_present = send2tgs_adminless_only(initiator_ckey, "Ticket #[id]: [msg]") + var/admin_number_present = send2tgs_adminless_only(initiator_ckey, "<@&1172909270442971207>, был создан новый Ticket #[id]: [msg]") log_admin_private("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.") if(admin_number_present <= 0) - to_chat(C, "No active admins are online, your adminhelp was sent through TGS to admins who are available. This may use IRC or Discord.", confidential = TRUE) + to_chat(C, "В данный момент активные администраторы отсутствуют. Ваш тикет был передан администрации в Discord.", confidential = TRUE) heard_by_no_admins = TRUE GLOB.ahelp_tickets.active_tickets += src diff --git a/code/modules/overmap/helm.dm b/code/modules/overmap/helm.dm index 59fdee827907..5c08931593d2 100644 --- a/code/modules/overmap/helm.dm +++ b/code/modules/overmap/helm.dm @@ -45,7 +45,7 @@ deconpath = /obj/structure/frame/computer/solgov /datum/config_entry/number/bluespace_jump_wait - default = 30 MINUTES + default = 1 MINUTES /obj/machinery/computer/helm/Initialize(mapload, obj/item/circuitboard/C) . = ..()