From 231adf89bfe2d3354e13d7a8cd5047904d9b758a Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 18 Mar 2024 01:27:15 +0300 Subject: [PATCH 1/4] Mail for everyone --- modular_ss220/jobs/_jobs.dme | 1 + modular_ss220/jobs/code/objects/mail.dm | 36 +++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 modular_ss220/jobs/code/objects/mail.dm diff --git a/modular_ss220/jobs/_jobs.dme b/modular_ss220/jobs/_jobs.dme index 2d7ba526a59c..52d6ceb3d615 100644 --- a/modular_ss220/jobs/_jobs.dme +++ b/modular_ss220/jobs/_jobs.dme @@ -23,6 +23,7 @@ #include "code/job/science_jobs.dm" #include "code/job/security_jobs.dm" #include "code/job/service_jobs.dm" +#include "code/objects/mail.dm" #include "code/objects/job_objects.dm" #include "code/objects/engineering_job_objects.dm" #include "code/objects/medical_job_objects.dm" diff --git a/modular_ss220/jobs/code/objects/mail.dm b/modular_ss220/jobs/code/objects/mail.dm new file mode 100644 index 000000000000..2b02909ef903 --- /dev/null +++ b/modular_ss220/jobs/code/objects/mail.dm @@ -0,0 +1,36 @@ +#define BREAD_SERVICE_JOBS_LIST list("Waiter", "Butler", "Maid") + +/obj/item/envelope/security/Initialize() + job_list |= GLOB.security_positions_ss220 + job_list |= GLOB.security_donor_jobs + return ..() + +/obj/item/envelope/science/Initialize() + job_list |= GLOB.science_positions_ss220 + return ..() + +/obj/item/envelope/supply/Initialize() + job_list |= GLOB.supply_donor_jobs + return ..() + +/obj/item/envelope/medical/Initialize(mapload) + job_list |= GLOB.medical_positions_ss220 + return ..() + +/obj/item/envelope/engineering/Initialize() + job_list |= GLOB.engineering_positions_ss220 + return ..() + +/obj/item/envelope/bread/Initialize() + job_list |= BREAD_SERVICE_JOBS_LIST + return ..() + +/obj/item/envelope/circuses/Initialize() + job_list |= GLOB.service_donor_jobs - BREAD_SERVICE_JOBS_LIST + return ..() + +/obj/item/envelope/misc/Initialize() + job_list |= GLOB.assistant_donor_jobs // amazing multitool for a prisoner + return ..() + +#undef BREAD_SERVICE_JOBS_LIST From d18a16759efee9b602ce2e463595988ca3be3044 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 18 Mar 2024 01:49:22 +0300 Subject: [PATCH 2/4] Polishing --- modular_ss220/jobs/code/objects/mail.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modular_ss220/jobs/code/objects/mail.dm b/modular_ss220/jobs/code/objects/mail.dm index 2b02909ef903..23992d8127e8 100644 --- a/modular_ss220/jobs/code/objects/mail.dm +++ b/modular_ss220/jobs/code/objects/mail.dm @@ -1,8 +1,7 @@ #define BREAD_SERVICE_JOBS_LIST list("Waiter", "Butler", "Maid") /obj/item/envelope/security/Initialize() - job_list |= GLOB.security_positions_ss220 - job_list |= GLOB.security_donor_jobs + job_list |= GLOB.security_positions_ss220 + GLOB.security_donor_jobs return ..() /obj/item/envelope/science/Initialize() From 414ba6373643d4992d806c49e374764c9f0d68bc Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 18 Mar 2024 02:40:16 +0300 Subject: [PATCH 3/4] QM tts acronym --- modular_ss220/text_to_speech/code/tts_subsystem.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_ss220/text_to_speech/code/tts_subsystem.dm b/modular_ss220/text_to_speech/code/tts_subsystem.dm index d098d8a075c5..d023ebe6abe4 100644 --- a/modular_ss220/text_to_speech/code/tts_subsystem.dm +++ b/modular_ss220/text_to_speech/code/tts_subsystem.dm @@ -58,6 +58,7 @@ SUBSYSTEM_DEF(tts220) "гп" = "Гэ Пэ", "рд" = "Эр Дэ", "гсб" = "Гэ Эс Бэ", + "км" = "Ка Эм", "срп" = "Эс Эр Пэ", "цк" = "Цэ Каа", "рнд" = "Эр Эн Дэ", From 5447c051a704a92f930f8e637b37f724d8ce0fc1 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Mon, 18 Mar 2024 13:58:16 +0300 Subject: [PATCH 4/4] Update modular_ss220/text_to_speech/code/tts_subsystem.dm Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com> --- modular_ss220/text_to_speech/code/tts_subsystem.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/text_to_speech/code/tts_subsystem.dm b/modular_ss220/text_to_speech/code/tts_subsystem.dm index d023ebe6abe4..bf0a7242ab89 100644 --- a/modular_ss220/text_to_speech/code/tts_subsystem.dm +++ b/modular_ss220/text_to_speech/code/tts_subsystem.dm @@ -58,7 +58,7 @@ SUBSYSTEM_DEF(tts220) "гп" = "Гэ Пэ", "рд" = "Эр Дэ", "гсб" = "Гэ Эс Бэ", - "км" = "Ка Эм", + "км" = "Кэ Эм", "срп" = "Эс Эр Пэ", "цк" = "Цэ Каа", "рнд" = "Эр Эн Дэ",