From 43fe05c267bd1d4b9d50dbe5208bb3ce6293a957 Mon Sep 17 00:00:00 2001 From: Lime-7 <142225267+Lime-7@users.noreply.github.com> Date: Tue, 3 Oct 2023 17:02:11 +0700 Subject: [PATCH 01/10] Update tts_seed.dm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Добавление vocal_cords_surgery. --- modular_ss220/text_to_speech/code/tts_seed.dm | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 9118207d2776..038b1bbb562f 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -60,3 +60,78 @@ set desc = "Express yourself!" set category = "Subsystems" change_voice() + +/** +* Surgery to change the voice of TTS. +* Below are the operations for organics and IPC. +*/ + +//Surgery for organics +/datum/surgery/vocal_cords_surgery + name = "Vocal Cords Tuning Surgery" + steps = list( + /datum/surgery_step/generic/cut_open, + /datum/surgery_step/generic/retract_skin, + /datum/surgery_step/tune_vocal_cords, + /datum/surgery_step/generic/cauterize + ) + possible_locs = list(BODY_ZONE_PRECISE_MOUTH) + + +/datum/surgery/vocal_cords_surgery/can_start(mob/user, mob/living/carbon/target) + if(ishuman(target)) + var/mob/living/carbon/human/H = target + if(!H.check_has_mouth()) + return FALSE + return TRUE + +/datum/surgery_step/tune_vocal_cords + name = "tune vocal cords" + allowed_tools = list(/obj/item/scalpel = 100, /obj/item/kitchen/knife = 50, /obj/item/wirecutters = 35) + time = 64 + var/target_vocal = "vocal cords" + +/datum/surgery_step/tune_vocal_cords/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) + user.visible_message("[user] begins to tune [target]'s vocals.", "You begin to tune [target]'s vocals...") + ..() + +/datum/surgery_step/tune_vocal_cords/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) + target.change_voice(user, TRUE) + user.visible_message("[user] tunes [target]'s vocals completely!", "You tune [target]'s vocals completely.") + return TRUE + +/datum/surgery_step/tune_vocal_cords/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) + var/obj/item/organ/external/head/head = target.get_organ(target_zone) + user.visible_message(" [user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!", \ + " Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!") + target.tts_seed = SStts.get_random_seed(target) + target.apply_damage(10, BRUTE, head, sharp = TRUE) + return FALSE + +//Surgery for IPC +/datum/surgery/vocal_cords_surgery/ipc + name = "Microphone Setup Operation" + steps = list( + /datum/surgery_step/robotics/external/unscrew_hatch, + /datum/surgery_step/robotics/external/open_hatch, + /datum/surgery_step/tune_vocal_cords/ipc, + /datum/surgery_step/robotics/external/close_hatch + ) + requires_organic_bodypart = FALSE + +/datum/surgery/vocal_cords_surgery/ipc/can_start(mob/user, mob/living/carbon/target) + if(!ishuman(target)) + return FALSE + + var/mob/living/carbon/human/H = target + var/obj/item/organ/external/head/affected = H.get_organ(user.zone_selected) + if(!affected) + return FALSE + if(!affected.is_robotic()) + return FALSE + return TRUE + +/datum/surgery_step/tune_vocal_cords/ipc + name = "microphone setup" + allowed_tools = list(/obj/item/multitool = 100, /obj/item/screwdriver = 55, /obj/item/kitchen/knife = 20, /obj/item/scalpel = 25) + target_vocal = "microphone" From 95e1d89a5b86f9629680310f352e8d0f897b1b4c Mon Sep 17 00:00:00 2001 From: Lime-7 <142225267+Lime-7@users.noreply.github.com> Date: Tue, 3 Oct 2023 17:45:54 +0700 Subject: [PATCH 02/10] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=9F=D0=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Обновляет ПР --- modular_ss220/text_to_speech/code/tts_seed.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 038b1bbb562f..65161b69e789 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -66,7 +66,7 @@ * Below are the operations for organics and IPC. */ -//Surgery for organics +// Surgery for organics /datum/surgery/vocal_cords_surgery name = "Vocal Cords Tuning Surgery" steps = list( @@ -92,7 +92,7 @@ var/target_vocal = "vocal cords" /datum/surgery_step/tune_vocal_cords/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] begins to tune [target]'s vocals.", "You begin to tune [target]'s vocals...") + user.visible_message("[user] begins to tune [target]'s vocals.", span_notice("You begin to tune [target]'s vocals...")) ..() /datum/surgery_step/tune_vocal_cords/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -108,7 +108,7 @@ target.apply_damage(10, BRUTE, head, sharp = TRUE) return FALSE -//Surgery for IPC +// Surgery for IPC /datum/surgery/vocal_cords_surgery/ipc name = "Microphone Setup Operation" steps = list( @@ -133,5 +133,5 @@ /datum/surgery_step/tune_vocal_cords/ipc name = "microphone setup" - allowed_tools = list(/obj/item/multitool = 100, /obj/item/screwdriver = 55, /obj/item/kitchen/knife = 20, /obj/item/scalpel = 25) + allowed_tools = list(/obj/item/multitool = 100, /obj/item/screwdriver = 55, /obj/item/scalpel = 25, /obj/item/kitchen/knife = 20) target_vocal = "microphone" From 0f79481d529e6dd32068529e6dca112c1907b055 Mon Sep 17 00:00:00 2001 From: Lime-7 <142225267+Lime-7@users.noreply.github.com> Date: Tue, 3 Oct 2023 23:52:41 +0700 Subject: [PATCH 03/10] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ̶Д̶у̶м̶а̶й̶т̶е̶ ̶с̶а̶м̶и̶ сделал поправки на которые указал фурриор --- modular_ss220/text_to_speech/code/tts_seed.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 65161b69e789..3478aafa8ca4 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -97,13 +97,13 @@ /datum/surgery_step/tune_vocal_cords/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) target.change_voice(user, TRUE) - user.visible_message("[user] tunes [target]'s vocals completely!", "You tune [target]'s vocals completely.") + user.visible_message("[user] tunes [target]'s vocals completely!", span_notice("You tune [target]'s vocals completely.")) return TRUE /datum/surgery_step/tune_vocal_cords/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/external/head/head = target.get_organ(target_zone) - user.visible_message(" [user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!", \ - " Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!") + user.visible_message("span_warning(" [user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!"), \ + "span_warning(" Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!")) target.tts_seed = SStts.get_random_seed(target) target.apply_damage(10, BRUTE, head, sharp = TRUE) return FALSE From 93bf7431dde1d27f8a9978fe91bcd72d4c414b5a Mon Sep 17 00:00:00 2001 From: Lime-7 <142225267+Lime-7@users.noreply.github.com> Date: Wed, 4 Oct 2023 14:01:21 +0700 Subject: [PATCH 04/10] - space MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Убрал лишний пробел --- modular_ss220/text_to_speech/code/tts_seed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 3478aafa8ca4..1ee71d2b9a0c 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -92,7 +92,7 @@ var/target_vocal = "vocal cords" /datum/surgery_step/tune_vocal_cords/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] begins to tune [target]'s vocals.", span_notice("You begin to tune [target]'s vocals...")) + user.visible_message("[user] begins to tune [target]'s vocals.", span_notice("You begin to tune [target]'s vocals...")) ..() /datum/surgery_step/tune_vocal_cords/end_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) From 1b75c8c09655568ffc7e2ae98b788525c985f0ec Mon Sep 17 00:00:00 2001 From: Lime-7 <142225267+Lime-7@users.noreply.github.com> Date: Thu, 5 Oct 2023 22:18:01 +0700 Subject: [PATCH 05/10] Update modular_ss220/text_to_speech/code/tts_seed.dm Co-authored-by: dj-34 --- modular_ss220/text_to_speech/code/tts_seed.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 1ee71d2b9a0c..19b85a60a08f 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -102,8 +102,8 @@ /datum/surgery_step/tune_vocal_cords/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/external/head/head = target.get_organ(target_zone) - user.visible_message("span_warning(" [user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!"), \ - "span_warning(" Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!")) + user.visible_message("span_warning("[user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!"), \ + "span_warning("Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!")) target.tts_seed = SStts.get_random_seed(target) target.apply_damage(10, BRUTE, head, sharp = TRUE) return FALSE From 45fdf0bc7b7c8a195d877c91439489141aa6344d Mon Sep 17 00:00:00 2001 From: Lime-7 <142225267+Lime-7@users.noreply.github.com> Date: Thu, 5 Oct 2023 22:24:16 +0700 Subject: [PATCH 06/10] Update modular_ss220/text_to_speech/code/tts_seed.dm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Я что пробел прое.. пропустил? ну да ладно, исправлено Co-authored-by: dj-34 --- modular_ss220/text_to_speech/code/tts_seed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 19b85a60a08f..99077705a9a2 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -103,7 +103,7 @@ /datum/surgery_step/tune_vocal_cords/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/external/head/head = target.get_organ(target_zone) user.visible_message("span_warning("[user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!"), \ - "span_warning("Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!")) + "span_warning("Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!")) target.tts_seed = SStts.get_random_seed(target) target.apply_damage(10, BRUTE, head, sharp = TRUE) return FALSE From 50801c099c98a3e79a5a0020babe48c4238df831 Mon Sep 17 00:00:00 2001 From: Lime-7 <142225267+Lime-7@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:36:59 +0700 Subject: [PATCH 07/10] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ЫЫЫ --- modular_ss220/text_to_speech/code/tts_seed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 99077705a9a2..ea3e664bc9db 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -103,7 +103,7 @@ /datum/surgery_step/tune_vocal_cords/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/external/head/head = target.get_organ(target_zone) user.visible_message("span_warning("[user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!"), \ - "span_warning("Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!")) + span_warning("Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!")) target.tts_seed = SStts.get_random_seed(target) target.apply_damage(10, BRUTE, head, sharp = TRUE) return FALSE From 47e218a149ce35738204966b71c65afa6a1e6add Mon Sep 17 00:00:00 2001 From: Lime-7 <142225267+Lime-7@users.noreply.github.com> Date: Sat, 14 Oct 2023 16:52:14 +0700 Subject: [PATCH 08/10] Update tts_seed.dm --- modular_ss220/text_to_speech/code/tts_seed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index ea3e664bc9db..96c14d601ae4 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -102,7 +102,7 @@ /datum/surgery_step/tune_vocal_cords/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery) var/obj/item/organ/external/head/head = target.get_organ(target_zone) - user.visible_message("span_warning("[user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!"), \ + user.visible_message(span_warning("[user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!"), \ span_warning("Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!")) target.tts_seed = SStts.get_random_seed(target) target.apply_damage(10, BRUTE, head, sharp = TRUE) From e2099f42020f40a88408c9fd4cafd538bbc1fc99 Mon Sep 17 00:00:00 2001 From: Lime-7 <142225267+Lime-7@users.noreply.github.com> Date: Sat, 14 Oct 2023 17:10:37 +0700 Subject: [PATCH 09/10] Update tts_seed.dm --- modular_ss220/text_to_speech/code/tts_seed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 96c14d601ae4..97dbadcfa453 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -104,7 +104,7 @@ var/obj/item/organ/external/head/head = target.get_organ(target_zone) user.visible_message(span_warning("[user]'s hand slips, tearing [target_vocal] in [target]'s throat with [tool]!"), \ span_warning("Your hand slips, tearing [target_vocal] in [target]'s throat with [tool]!")) - target.tts_seed = SStts.get_random_seed(target) + target.tts_seed = SStts220.get_random_seed(target) target.apply_damage(10, BRUTE, head, sharp = TRUE) return FALSE From 58962281555f487163a43b8387427de05b56b58a Mon Sep 17 00:00:00 2001 From: Furior <68264134+Furrior@users.noreply.github.com> Date: Sun, 15 Oct 2023 02:40:54 +0700 Subject: [PATCH 10/10] Update tts_seed.dm --- modular_ss220/text_to_speech/code/tts_seed.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_ss220/text_to_speech/code/tts_seed.dm b/modular_ss220/text_to_speech/code/tts_seed.dm index 97dbadcfa453..1110b2ea1b77 100644 --- a/modular_ss220/text_to_speech/code/tts_seed.dm +++ b/modular_ss220/text_to_speech/code/tts_seed.dm @@ -88,7 +88,7 @@ /datum/surgery_step/tune_vocal_cords name = "tune vocal cords" allowed_tools = list(/obj/item/scalpel = 100, /obj/item/kitchen/knife = 50, /obj/item/wirecutters = 35) - time = 64 + time = 6 SECONDS var/target_vocal = "vocal cords" /datum/surgery_step/tune_vocal_cords/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)