From 495ba78f1124ff7e8e41e62a2f388ea15b87cfb0 Mon Sep 17 00:00:00 2001 From: Nerevar <12636964+Nerev4r@users.noreply.github.com> Date: Tue, 28 Jun 2022 19:18:08 -0600 Subject: [PATCH] [Half-Modular] Ashtongue for Ashwalkers (#14574) * uwah * thanks goofball! * thx zonespace * i'm screaming * wew Co-authored-by: Snakebittenn <12636964+Snakebittenn@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- code/modules/language/language_holder.dm | 8 +++++ code/modules/surgery/organs/tongue.dm | 5 +-- .../antagonists/ashwalker/ashwalker.dm | 8 +++++ .../master_files/icons/misc/language.dmi | Bin 2838 -> 3172 bytes .../modules/language/ashtongue.dm | 29 ++++++++++++++++++ .../mob/living/carbon/human/species/lizard.dm | 3 +- .../modules/modular_items/code/necklace.dm | 10 +++--- tgstation.dme | 2 ++ 8 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 modular_skyrat/master_files/code/modules/antagonists/ashwalker/ashwalker.dm create mode 100644 modular_skyrat/modules/customization/modules/language/ashtongue.dm diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm index d6610e920bc..c4d02333396 100644 --- a/code/modules/language/language_holder.dm +++ b/code/modules/language/language_holder.dm @@ -285,8 +285,16 @@ Key procs spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/draconic = list(LANGUAGE_ATOM)) +/datum/language_holder/lizard/ash //SKYRAT EDIT BEGIN: Ashtongue for Ashwalkers + understood_languages = list(/datum/language/ashtongue = list(LANGUAGE_ATOM)) + spoken_languages = list(/datum/language/ashtongue = list(LANGUAGE_ATOM)) + selected_language = /datum/language/ashtongue + //SKYRAT EDIT END + +/* ORIGINAL /datum/language_holder/lizard/ash selected_language = /datum/language/draconic +*/ /datum/language_holder/lizard/silver understood_languages = list(/datum/language/uncommon = list(LANGUAGE_ATOM), diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 7e6f9129f39..6850fdf4ced 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -43,7 +43,8 @@ /datum/language/zolmach, // SKYRAT EDIT - customization - extra languages /datum/language/xenoknockoff, // SKYRAT EDIT - customization - extra languages /datum/language/yangyu, // SKYRAT EDIT - customization - extra languages - /datum/language/schechi // SKYRAT EDIT - customization - extra languages + /datum/language/schechi, // SKYRAT EDIT - customization - extra languages + /datum/language/ashtongue, // SKYRAT EDIT - customization - extra languages )) /obj/item/organ/internal/tongue/Initialize(mapload) @@ -96,7 +97,7 @@ say_mod = "hisses" taste_sensitivity = 10 // combined nose + tongue, extra sensitive modifies_speech = TRUE - languages_native = list(/datum/language/draconic) + languages_native = list(/datum/language/draconic, /datum/language/ashtongue) //SKYRAT EDIT: Ashtongue for Ashwalkers /obj/item/organ/internal/tongue/lizard/modify_speech(datum/source, list/speech_args) var/static/regex/lizard_hiss = new("s+", "g") diff --git a/modular_skyrat/master_files/code/modules/antagonists/ashwalker/ashwalker.dm b/modular_skyrat/master_files/code/modules/antagonists/ashwalker/ashwalker.dm new file mode 100644 index 00000000000..344494ec97e --- /dev/null +++ b/modular_skyrat/master_files/code/modules/antagonists/ashwalker/ashwalker.dm @@ -0,0 +1,8 @@ +/datum/antagonist/ashwalker/apply_innate_effects(mob/living/mob_override) + . = ..() + var/mob/living/owner_mob = mob_override || owner.current + var/datum/language_holder/holder = owner_mob.get_language_holder() + holder.remove_language(/datum/language/common, TRUE, TRUE, LANGUAGE_ALL) + holder.remove_language(/datum/language/draconic, TRUE, TRUE, LANGUAGE_ALL) + holder.grant_language(/datum/language/ashtongue, TRUE, TRUE, LANGUAGE_ALL) + holder.selected_language = /datum/language/ashtongue diff --git a/modular_skyrat/master_files/icons/misc/language.dmi b/modular_skyrat/master_files/icons/misc/language.dmi index a02691fb7f8c5a72038faeee2d954c8fe25ad4a0..e6d82d86a0541ab5843cf029cee820d1b2c4a4e8 100644 GIT binary patch delta 3133 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