From ecc61a5f4cfe55d2946bb0de25f21ce805046c9b Mon Sep 17 00:00:00 2001 From: Heroman Date: Fri, 2 Dec 2022 10:36:48 +1000 Subject: [PATCH] Makes languages properly preview on species preview window --- .../carbon/human/species/station/alraune.dm | 1 + .../carbon/human/species/station/blank_vr.dm | 1 + .../station/protean_vr/protean_species.dm | 1 + .../species/station/station_special_vr.dm | 3 ++ .../human/species/station/station_vr.dm | 34 ++++++++++++------- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index 36b8a84a210..e4bfbc5b5e9 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -2,6 +2,7 @@ name = SPECIES_ALRAUNE name_plural = "Alraunes" unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite) + species_language = LANGUAGE_ENOCHIAN num_alternate_languages = 3 slowdown = 1 //slow, they're plants. Not as slow as full diona. total_health = 100 //standard diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index f852fb5882e..f1a261e26ea 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm @@ -21,6 +21,7 @@ max_age = 200 health_hud_intensity = 2 num_alternate_languages = 3 + species_language = null assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index 89155e94526..ec938c91ccc 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -20,6 +20,7 @@ spawn_flags = SPECIES_CAN_JOIN | SPECIES_IS_WHITELISTED | SPECIES_WHITELIST_SELECTABLE health_hud_intensity = 2 num_alternate_languages = 3 + species_language = LANGUAGE_EAL assisted_langs = list(LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) color_mult = TRUE diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index 6d0c125e4f4..f3db17672f3 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -18,6 +18,7 @@ selects_bodytype = SELECTS_BODYTYPE_CUSTOM num_alternate_languages = 3 + species_language = null secondary_langs = list("Sol Common") //color_mult = 1 //It seemed to work fine in testing, but I've been informed it's unneeded. tail = "tail" //Scree's tail. Can be disabled in the vore tab by choosing "hide species specific tail sprite" @@ -332,6 +333,7 @@ burn_mod = 1.15 //15% burn damage increase. They're spiders. Aerosol can+lighter = dead spiders. num_alternate_languages = 3 + species_language = LANGUAGE_VESPINAE secondary_langs = list(LANGUAGE_VESPINAE) color_mult = 1 tail = "tail" //Spider tail. @@ -416,6 +418,7 @@ num_alternate_languages = 3 secondary_langs = list(LANGUAGE_CANILUNZT) name_language = LANGUAGE_CANILUNZT + species_language = LANGUAGE_CANILUNZT primitive_form = "Wolpin" color_mult = 1 icon_height = 64 diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index ab594d70676..dac1f25d33e 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -14,6 +14,7 @@ num_alternate_languages = 3 secondary_langs = list(LANGUAGE_SAGARU) name_language = LANGUAGE_SAGARU + species_language = LANGUAGE_SAGARU color_mult = 1 inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair) @@ -77,8 +78,9 @@ //burn_mod = 1.15 //gluttonous = 1 num_alternate_languages = 3 - secondary_langs = list(LANGUAGE_SKRELLIAN) - name_language = LANGUAGE_SKRELLIAN + secondary_langs = list(LANGUAGE_SPACER) + name_language = LANGUAGE_SPACER + species_language = LANGUAGE_SPACER color_mult = 1 assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair, /mob/living/carbon/human/proc/water_stealth, /mob/living/carbon/human/proc/underwater_devour) @@ -128,6 +130,7 @@ num_alternate_languages = 3 secondary_langs = list(LANGUAGE_BIRDSONG) name_language = LANGUAGE_BIRDSONG + species_language = LANGUAGE_BIRDSONG color_mult = 1 inherent_verbs = list(/mob/living/proc/flying_toggle, /mob/living/proc/flying_vore_toggle, @@ -173,6 +176,7 @@ num_alternate_languages = 3 secondary_langs = list(LANGUAGE_TERMINUS) name_language = LANGUAGE_TERMINUS + species_language = LANGUAGE_TERMINUS inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds, /mob/living/proc/shred_limb, /mob/living/carbon/human/proc/tie_hair) @@ -221,6 +225,7 @@ // default_language = "Sol Common" secondary_langs = list(LANGUAGE_CANILUNZT) name_language = LANGUAGE_CANILUNZT + species_language = LANGUAGE_CANILUNZT primitive_form = "Wolpin" tail = "vulptail" tail_animation = 'icons/mob/species/vulpkanin/tail.dmi' // probably need more than just one of each, but w/e @@ -235,20 +240,20 @@ wikilink="https://wiki.vore-station.net/Backstory#Vulpkanin" catalogue_data = list(/datum/category_item/catalogue/fauna/vulpkanin) - + //Furry fox-like animals shouldn't start freezing at 5 degrees celsius. //Minor cold is resisted, but not severe frost. - cold_discomfort_level = 263 //Not as good at surviving the frost as tajara, but still better than humans. - + cold_discomfort_level = 263 //Not as good at surviving the frost as tajara, but still better than humans. + cold_level_1 = 243 //Default 260, other values remain at default. Starts taking damage at -30 celsius. Default tier 2 is -70 and tier 3 is -150 - - - breath_cold_level_1 = 220 // Default 240, lower is better. - + + + breath_cold_level_1 = 220 // Default 240, lower is better. + //While foxes can survive in deserts, that's handled by zorren. It's a good contrast that our vulp find heat a little uncomfortable. - + heat_discomfort_level = 295 //Just above standard 20 C to avoid heat message spam, same as Taj - + heat_level_1 = 345 //Default 360 heat_level_2 = 390 //Default 400 heat_level_3 = 900 //Default 1000 @@ -269,7 +274,7 @@ min_age = 18 max_age = 80 - + heat_discomfort_strings = list( "Your fur prickles in the heat.", "You feel uncomfortably warm.", @@ -384,7 +389,8 @@ icobase_tail = 1 unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/punch, /datum/unarmed_attack/bite) num_alternate_languages = 3 - secondary_langs = list(LANGUAGE_BIRDSONG) + secondary_langs = list(LANGUAGE_BIRDSONG, LANGUAGE_UNATHI) + species_language = LANGUAGE_UNATHI name_language = null color_mult = 1 genders = list(MALE, FEMALE, PLURAL, NEUTER) @@ -535,6 +541,7 @@ num_alternate_languages = 3 secondary_langs = list(LANGUAGE_TERMINUS) name_language = LANGUAGE_TERMINUS + species_language = LANGUAGE_TERMINUS inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds,/mob/living/proc/shred_limb,/mob/living/carbon/human/proc/tie_hair) min_age = 18 @@ -603,6 +610,7 @@ language = LANGUAGE_TAVAN num_alternate_languages = 3 secondary_langs = list(LANGUAGE_TAVAN) + species_language = LANGUAGE_TAVAN name_language = null color_mult = 1 inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair)