From 98aeff161f96e36abc2405c11d42f040c33dddf6 Mon Sep 17 00:00:00 2001 From: Dekserrrrrr <92396228+Dekserrrrrr@users.noreply.github.com> Date: Sat, 6 Nov 2021 15:08:19 +0400 Subject: [PATCH] Adds Deksers custom augment (#12615) --- code/__defines/mobs.dm | 1 + code/modules/customitems/item_defines.dm | 4 ++++ code/modules/mob/living/carbon/human/human.dm | 4 ++++ code/modules/organs/subtypes/augment.dm | 5 +++++ 4 files changed, 14 insertions(+) diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index b55d3be735f..03d7c8129f5 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -168,6 +168,7 @@ #define BP_AUG_SIGHTLIGHTS "ocular installed sightlights" #define BP_AUG_CORRECTIVE_LENS "corrective lenses" #define BP_AUG_GLARE_DAMPENER "glare dampeners" +#define BP_AUG_ACC_CORDS "modified synthetic vocal cords" //Organ defines #define PROCESS_ACCURACY 10 diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 1a852969070..ae338b99bfa 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -2317,3 +2317,7 @@ All custom items with worn sprites must follow the contained sprite system: http item_state = "ulzka_skull" canremove = FALSE contained_sprite = TRUE + +/obj/item/organ/internal/augment/synthetic_cords/voice/fluff/marc //Old Synthetic Vocal Cords - Marc Hardy - Dekser + name = "old synthetic vocal cords" + desc = "A set of Old Age Synthetic Vocal Cords. They look barely functional." \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index aa824d9b807..210c67d46cb 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -2012,6 +2012,10 @@ if(rig.speech && rig.speech.voice_holder && rig.speech.voice_holder.active && rig.speech.voice_holder.current_accent) used_accent = rig.speech.voice_holder.current_accent + var/obj/item/organ/internal/augment/synthetic_cords/voice/aug = internal_organs_by_name[BP_AUG_ACC_CORDS] //checks for augments, thanks grey + if(aug) + used_accent = aug.accent + for(var/obj/item/gear in list(wear_mask,wear_suit,head)) //checks for voice changers masks now if(gear) var/obj/item/voice_changer/changer = locate() in gear diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm index a1f28e8be75..6ea0a5ff99e 100644 --- a/code/modules/organs/subtypes/augment.dm +++ b/code/modules/organs/subtypes/augment.dm @@ -445,6 +445,11 @@ organ_tag = BP_AUG_CORDS parent_organ = BP_HEAD +/obj/item/organ/internal/augment/synthetic_cords/voice + desc = "An array of vocal cords. These appears to have been modified with a specific accent." + organ_tag = BP_AUG_ACC_CORDS + var/accent = ACCENT_TTS + /obj/item/organ/internal/augment/synthetic_cords/replaced(var/mob/living/carbon/human/target, obj/item/organ/external/affected) . = ..() target.sdisabilities &= ~MUTE