From fff23fd13541d76906f7fcba1cda1cecfc814e3b Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Sun, 29 Dec 2024 15:44:03 -0700 Subject: [PATCH] [MIRROR] fix pakkun and simple mob language (#9725) Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com> --- code/modules/mob/living/default_language.dm | 30 +++++++++++-------- .../living/simple_mob/subtypes/vore/pakkun.dm | 4 +-- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index 7ae3cf6f6c..41f9949b4e 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -6,30 +6,34 @@ set name = "Set Default Language" set category = "IC.Settings" - var/language = tgui_input_list(usr, "Select your default language", "Available languages", languages) + if(!LAZYLEN(languages)) + to_chat(src, span_warning("You can't speak any languages.")) + return + + var/language = tgui_input_list(src, "Select your default language", "Available languages", languages) + if(!language) + return apply_default_language(language) // Silicons can't neccessarily speak everything in their languages list /mob/living/silicon/set_default_language() - var/language = tgui_input_list(usr, "Select your default language", "Available languages", speech_synthesizer_langs) - // Silicons have no species language usually. So let's default them to GALCOM - if(!language) - to_chat(src, span_notice("You will now speak your standard default language, common, if you do not specify a language when speaking.")) - for(var/datum/language/lang in speech_synthesizer_langs) - if(lang.name == LANGUAGE_GALCOM) - default_language = lang - break + if(!LAZYLEN(speech_synthesizer_langs)) + to_chat(src, span_warning("You can't speak any languages.")) return + var/language = tgui_input_list(src, "Select your default language", "Available languages", speech_synthesizer_langs) + if(!language) + return + apply_default_language(language) /mob/living/proc/apply_default_language(var/language) - if (only_species_language && language != GLOB.all_languages[src.species_language]) - to_chat(src, span_notice("You can only speak your species language, [src.species_language].")) + if (only_species_language && language != GLOB.all_languages[species_language]) + to_chat(src, span_notice("You can only speak your species language, [species_language].")) return 0 - if(language == GLOB.all_languages[src.species_language]) - to_chat(src, span_notice("You will now speak your standard default language, [language ? language : "common"], if you do not specify a language when speaking.")) + if(language == GLOB.all_languages[species_language]) + to_chat(src, span_notice("You will now speak your standard default language, [language], if you do not specify a language when speaking.")) else if (language) if(language && !can_speak(language)) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm index 85403737f1..7ef15484c3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/pakkun.dm @@ -81,13 +81,13 @@ return if(resting) - if(isbelly(vore_selected)) //CHOMPEdit Start + if(isbelly(vore_selected)) vore_selected.digest_mode = DM_UNABSORB ai_holder.go_sleep() else if(isbelly(vore_selected)) - vore_selected.digest_mode = vore_default_mode //CHOMPEdit End + vore_selected.digest_mode = vore_default_mode ai_holder.go_wake() /mob/living/simple_mob/vore/pakkun/attack_hand(mob/user)