From 900bf184335f0f735342f36fadaca1edea29974c Mon Sep 17 00:00:00 2001 From: "C.L" Date: Fri, 12 Aug 2022 14:51:43 -0400 Subject: [PATCH] Condenses all the animal languages and deletes unused/unwanted languages. --- code/__defines/mobs.dm | 2 +- code/__defines/species_languages.dm | 3 - code/__defines/species_languages_vr.dm | 7 +- .../objects/items/robot/robot_upgrades.dm | 1 - .../objects/items/robot/robot_upgrades_vr.dm | 1 - .../items/weapons/implants/implant_vr.dm | 8 +- code/modules/blob2/overmind/overmind.dm | 2 +- code/modules/mob/language/monkey.dm | 69 ++-------------- code/modules/mob/language/outsider.dm | 37 --------- code/modules/mob/language/station.dm | 13 --- code/modules/mob/language/station_vr.dm | 40 +-------- .../mob/living/carbon/human/human_species.dm | 9 +- .../human/species/outsider/replicant.dm | 2 +- .../living/carbon/human/species/species.dm | 2 +- .../carbon/human/species/station/monkey.dm | 8 +- .../carbon/human/species/station/station.dm | 4 +- code/modules/mob/living/silicon/ai/ai.dm | 1 - .../living/silicon/pai/software_modules.dm | 24 +----- .../silicon/robot/robot_modules/station.dm | 1 - .../silicon/robot/robot_modules/syndicate.dm | 1 - .../subtypes/occult/constructs/_construct.dm | 2 +- .../living/simple_mob/subtypes/vore/c_pet.dm | 2 +- .../mob/new_player/sprite_accessories.dm | 82 +++++++++---------- code/modules/organs/subtypes/skrell.dm | 2 +- config/alienwhitelist.txt | 1 - 25 files changed, 70 insertions(+), 254 deletions(-) diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm index df7a90632cc..aab3af7978a 100644 --- a/code/__defines/mobs.dm +++ b/code/__defines/mobs.dm @@ -330,7 +330,7 @@ #define SPECIES_SHADOW "Shadow" #define SPECIES_SKELETON "Skeleton" #define SPECIES_GOLEM "Golem" -#define SPECIES_EVENT1 "X Occursus" +#define SPECIES_EVENT1 "X Anomalous" #define SPECIES_EVENT2 "X Anomalous" #define SPECIES_EVENT3 "X Unowas" diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm index f81e48b0446..b133acc9ec6 100644 --- a/code/__defines/species_languages.dm +++ b/code/__defines/species_languages.dm @@ -86,18 +86,15 @@ #define LANGUAGE_ROOTLOCAL "Local Rootspeak" #define LANGUAGE_ROOTGLOBAL "Global Rootspeak" #define LANGUAGE_CULT "Cult" -#define LANGUAGE_OCCULT "Occult" #define LANGUAGE_CHANGELING "Changeling" #define LANGUAGE_VOX "Vox-Pidgin" #define LANGUAGE_TERMINUS "Terminus" -#define LANGUAGE_SKRELLIANFAR "High Skrellian" #define LANGUAGE_MINBUS "Minbus" #define LANGUAGE_EVENT1 "Occursus" #define LANGUAGE_AKHANI "Akhani" #define LANGUAGE_ALAI "Alai" #define LANGUAGE_ZADDAT "Vedahq" #define LANGUAGE_PROMETHEAN "Promethean Biolinguistics" -#define LANGUAGE_BLOB "Chemosense Transmission" #define LANGUAGE_GIBBERISH "Babel" // Language flags. diff --git a/code/__defines/species_languages_vr.dm b/code/__defines/species_languages_vr.dm index 1a5fbdab4c5..e8cf9a88b9c 100644 --- a/code/__defines/species_languages_vr.dm +++ b/code/__defines/species_languages_vr.dm @@ -1,7 +1,6 @@ #define SPECIES_WHITELIST_SELECTABLE 0x20 // Can select and customize, but not join as #define LANGUAGE_DRUDAKAR "D'Rudak'Ar" -#define LANGUAGE_SLAVIC "Pan-Slavic" #define LANGUAGE_BIRDSONG "Birdsong" #define LANGUAGE_SAGARU "Sagaru" #define LANGUAGE_CANILUNZT "Canilunzt" @@ -10,13 +9,9 @@ #define LANGUAGE_ENOCHIAN "Enochian" #define LANGUAGE_VESPINAE "Vespinae" #define LANGUAGE_SPACER "Spacer" -#define LANGUAGE_CLOWNISH "Coulrian" #define LANGUAGE_TAVAN "Tavan" #define LANGUAGE_ECHOSONG "Echo Song" -#define LANGUAGE_CHIMPANZEE "Chimpanzee" -#define LANGUAGE_NEAERA "Neaera" -#define LANGUAGE_STOK "Stok" -#define LANGUAGE_FARWA "Farwa" +#define LANGUAGE_ANIMAL "Animal" #define LANGUAGE_SHADEKIN "Shadekin Empathy" diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 14758aa2f66..2a79c6aaac5 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -208,7 +208,6 @@ R.add_language(LANGUAGE_SIIK, 1) R.add_language(LANGUAGE_AKHANI, 1) R.add_language(LANGUAGE_SKRELLIAN, 1) - R.add_language(LANGUAGE_SKRELLIANFAR, 0) R.add_language(LANGUAGE_GUTTER, 1) R.add_language(LANGUAGE_SCHECHI, 1) R.add_language(LANGUAGE_ROOTLOCAL, 1) diff --git a/code/game/objects/items/robot/robot_upgrades_vr.dm b/code/game/objects/items/robot/robot_upgrades_vr.dm index 499d535a5cc..74c41433d9e 100644 --- a/code/game/objects/items/robot/robot_upgrades_vr.dm +++ b/code/game/objects/items/robot/robot_upgrades_vr.dm @@ -6,7 +6,6 @@ R.add_language(LANGUAGE_ECUREUILIAN, 1) R.add_language(LANGUAGE_DAEMON, 1) R.add_language(LANGUAGE_ENOCHIAN, 1) - R.add_language(LANGUAGE_SLAVIC, 1) R.add_language(LANGUAGE_DRUDAKAR, 1) R.add_language(LANGUAGE_TAVAN, 1) return 1 diff --git a/code/game/objects/items/weapons/implants/implant_vr.dm b/code/game/objects/items/weapons/implants/implant_vr.dm index 0702ac66970..a2f22438bdf 100644 --- a/code/game/objects/items/weapons/implants/implant_vr.dm +++ b/code/game/objects/items/weapons/implants/implant_vr.dm @@ -22,20 +22,16 @@ if (emote == "smile") src.uses-- to_chat(source,"You suddenly feel as if you can understand other languages!") - source.add_language(LANGUAGE_CHIMPANZEE) - source.add_language(LANGUAGE_NEAERA) - source.add_language(LANGUAGE_STOK) - source.add_language(LANGUAGE_FARWA) source.add_language(LANGUAGE_UNATHI) source.add_language(LANGUAGE_SIIK) source.add_language(LANGUAGE_SKRELLIAN) + source.add_language(LANGUAGE_ANIMAL) source.add_language(LANGUAGE_SCHECHI) source.add_language(LANGUAGE_BIRDSONG) source.add_language(LANGUAGE_SAGARU) source.add_language(LANGUAGE_CANILUNZT) - source.add_language(LANGUAGE_SLAVIC) source.add_language(LANGUAGE_SOL_COMMON) //In case they're giving a xenomorph an implant or something. - source.add_language(LANGUAGE_TAVAN) + source.add_language(LANGUAGE_TAVAN) /obj/item/weapon/implant/vrlanguage/post_implant(mob/source) source.mind.store_memory("A implant can be activated by using the smile emote, say *smile to attempt to activate.", 0, 0) diff --git a/code/modules/blob2/overmind/overmind.dm b/code/modules/blob2/overmind/overmind.dm index cdfe6d766aa..625dca158f4 100644 --- a/code/modules/blob2/overmind/overmind.dm +++ b/code/modules/blob2/overmind/overmind.dm @@ -25,7 +25,7 @@ var/list/overminds = list() universal_understand = TRUE - var/list/has_langs = list(LANGUAGE_BLOB) + var/list/has_langs = list(LANGUAGE_ANIMAL) var/datum/language/default_language = null /mob/observer/blob/get_default_language() diff --git a/code/modules/mob/language/monkey.dm b/code/modules/mob/language/monkey.dm index 0ceaf4a88fc..8224ca7aa88 100644 --- a/code/modules/mob/language/monkey.dm +++ b/code/modules/mob/language/monkey.dm @@ -1,58 +1,13 @@ -/datum/language/human/monkey - name = "Chimpanzee" +/datum/language/human/animal + name = LANGUAGE_ANIMAL desc = "A collection of ooking noises made by monkeys" - speech_verb = "chimpers" - ask_verb = "chimpers" - exclaim_verb = "screeches" + speech_verb = "says" + ask_verb = "inquires" + exclaim_verb = "yells" key = "C" - syllables = list("ook","eek") + syllables = list("chrp","tweet","squick","croak","hiss","gronk","meow","mew","bark", "woof", "bowwow", "yap", "arf") //This is a generalized animal language. If spoken by an animal, it comes out with the mob noises. This only occurs when spoken by a carbon (human). machine_understands = 0 -/datum/language/skrell/monkey - name = "Neaera" - desc = "A collection of squiking noises made by naera." - key = "8" - syllables = list("squick","croak") - machine_understands = 0 - -/datum/language/unathi/monkey - name = "Stok" - desc = "A collection of hissing noises made by stok." - key = "7" - syllables = list("hiss","gronk") - machine_understands = 0 - -/datum/language/tajaran/monkey - name = "Farwa" - desc = "A collection of meowing noises made by farwa." - key = "9" - syllables = list("meow","mew") - machine_understands = 0 - -/datum/language/corgi - name = "Dog" - desc = "A set of barks and woofs that only dogs can understand." - speech_verb = "barks" - ask_verb = "woofs" - exclaim_verb = "howls" - key = "n" - flags = RESTRICTED - machine_understands = 0 - space_chance = 100 - syllables = list("bark", "woof", "bowwow", "yap", "arf") - -/datum/language/cat - name = "Cat" - desc = "A set of meows and mrowls that only cats can understand." - speech_verb = "meows" - ask_verb = "mrowls" - exclaim_verb = "yowls" - key = "c" - flags = RESTRICTED - machine_understands = 0 - space_chance = 100 - syllables = list("meow", "mrowl", "purr", "meow", "meow", "meow") - /datum/language/mouse name = "Mouse" desc = "A set of squeaks that only mice can understand." @@ -65,18 +20,6 @@ space_chance = 100 syllables = list("squeak") // , "gripes", "oi", "meow") -/datum/language/bird - name = "Bird" - desc = "A set of chirps and squawks that only birds can understand." - speech_verb = "chirps" - ask_verb = "tweets" - exclaim_verb = "squawks" - key = "B" - flags = RESTRICTED - machine_understands = 0 - space_chance = 100 - syllables = list("chirp", "squawk", "tweet") - /datum/language/teppi name = "Teppi" desc = "A set of gyohs that only teppi can understand." diff --git a/code/modules/mob/language/outsider.dm b/code/modules/mob/language/outsider.dm index 1d73c4640c4..64d8caadb06 100644 --- a/code/modules/mob/language/outsider.dm +++ b/code/modules/mob/language/outsider.dm @@ -74,17 +74,6 @@ "gal'h'rfikk", "harfrandid", "mud'gib", "il", "fuu", "ma'jin", "dedo", "ol'btoh", "n'ath", "reth", "sh'yro", "eth", \ "d'rekkathnor", "khari'd", "gual'te", "nikka", "nikt'o", "barada", "kla'atu", "barhah", "hra" ,"zar'garis", "spiri", "malum") -/datum/language/cult - name = LANGUAGE_OCCULT - desc = "The initiated can share their thoughts by means defying all reason." - speech_verb = "intones" - ask_verb = "intones" - exclaim_verb = "chants" - colour = "cult" - key = "y" - machine_understands = 0 - flags = RESTRICTED | HIVEMIND - /datum/language/xenocommon name = "Xenomorph" colour = "alien" @@ -143,32 +132,6 @@ "danya","da","mied","zan","das","krem","myka","cyka","blyat","to","st","no","na","ni", "ko","ne","en","po","ra","li","on","byl","cto","eni","ost","ol","ego","ver","stv","pro") -//For your event purposes. -/datum/language/occursus - name = LANGUAGE_EVENT1 - desc = "The Powers That Be have seen it fit to grace you with a special language that sounds like... something. This description should be overridden by the time you see this." - speech_verb = "says" - ask_verb = "asks" - exclaim_verb = "shouts" - colour = "warning" - key = "]" - flags = RESTRICTED - syllables = list("chan","ange","thi","se") - -//Bloblang. -/datum/language/blob - name = LANGUAGE_BLOB - desc = "The massive processing power of the Blob's core gives the overmind finely tuned abilities to transmit messages to nearby life-forms through chemical signals." - speech_verb = "resonates" - ask_verb = "reverberates" - exclaim_verb = "shudders" - colour = "blob" - key = "}" - machine_understands = TRUE - flags = RESTRICTED - - syllables = list("^", "˅", "-", "°", "~") - /datum/language/corticalborer/broadcast(var/mob/living/speaker,var/message,var/speaker_mask) var/mob/living/simple_mob/animal/borer/B diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index cb759eabb58..22550a37daf 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -125,19 +125,6 @@ flags = WHITELISTED syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix") -/datum/language/skrellfar - name = LANGUAGE_SKRELLIANFAR - desc = "The most common language among the Skrellian Far Kingdoms. Has an even higher than usual concentration of inaudible phonemes. Native to Skrell." - speech_verb = "warbles" - ask_verb = "warbles" - exclaim_verb = "sings" - whisper_verb = "hums" - colour = "skrellfar" - key = "p" - space_chance = 30 - flags = WHITELISTED - syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix", "...", "oo", "q", "nq", "x", "xq", "ll", "...", "...", "...") //should sound like there's holes in it - /datum/language/skrell/get_random_name(var/gender) var/list/first_names = file2list('config/names/first_name_skrell.txt') var/list/last_names = file2list('config/names/last_name_skrell.txt') diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 97d094d85c0..78c3f9c0578 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -94,36 +94,6 @@ machine_understands = FALSE flags = WHITELISTED | HIVEMIND -/datum/language/slavic - name = LANGUAGE_SLAVIC - desc = "The official language of the Independent Colonial Confederation of Gilgamesh, originally established in 2122 by the short-lived United Slavic Confederation on Earth." - speech_verb = "govorit" // All Russian for "says" "asks" and "shouts". Mostly here as a joke. - ask_verb = "sprashivaet" - exclaim_verb = "krichit" - whisper_verb = "shepchet" - colour = "attack" // Red for slav! - key = "P" - syllables = list( - "rus", "zem", "ave", "blyat", "cyk", "groz", "ski", "ska", "ven", "konst", "pol", "lin", "svy", - "danya", "da", "mied", "kuz,", "zan", "das", "krem", "myka", "to", "st", "no", "na", "ni", - "ko", "ne", "en", "po", "tro", "ra", "li", "on", "byl", "cto", "eni", "ost", "ol", "ego", - "ver", "stv", "pro", "ski" - ) - -/datum/language/clownish - name = LANGUAGE_CLOWNISH - desc = "A special elective language course for those studying at the Clown Planet Institute." - speech_verb = "honks" - ask_verb = "seins" - exclaim_verb = "crenks" - whisper_verb = "squeaks" - colour = "#F785F2" // Pink for the clown. - key = "<" - flags = WHITELISTED | CLOWN - syllables = list( - "honk", "knock", "salt", "slip", "lube", "banana", "flower", "pie", "did you hear", "🅱️", "haha", "bully", "going up", - ) - /datum/language/drudakar name = LANGUAGE_DRUDAKAR desc = "The native language of the D'Rudak'Ar, a loosely tied together community of dragons and demi-dragons based in the Diul system. Features include many hard consonants and rolling 'r's." @@ -193,11 +163,5 @@ machine_understands = FALSE desc = "A dialect of Tradeband not uncommon amongst traders in the Free Trade Union. The language is often difficult to translate due to changing frequently and being highly colloquial." partial_understanding = list(LANGUAGE_TRADEBAND = 30, LANGUAGE_SOL_COMMON = 10) -/datum/language/human/monkey - flags = RESTRICTED -/datum/language/skrell/monkey - flags = RESTRICTED -/datum/language/unathi/monkey - flags = RESTRICTED -/datum/language/tajaran/monkey - flags = RESTRICTED +/datum/language/human/animal + flags = RESTRICTED \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human_species.dm b/code/modules/mob/living/carbon/human/human_species.dm index 43225a6d34a..7350d093e4d 100644 --- a/code/modules/mob/living/carbon/human/human_species.dm +++ b/code/modules/mob/living/carbon/human/human_species.dm @@ -30,8 +30,8 @@ icon = null icon_state = "" . = ..() - - dress_up() + + dress_up() turntable() /mob/living/carbon/human/dummy/mannequin/autoequip/proc/dress_up() @@ -42,7 +42,7 @@ var/obj/item/clothing/C = I C.species_restricted = null equip_to_appropriate_slot(I) - + if(istype(back, /obj/item/weapon/rig)) var/obj/item/weapon/rig/rig = back rig.toggle_seals(src) @@ -130,6 +130,3 @@ /mob/living/carbon/human/stok/Initialize(var/new_loc) return ..(new_loc, SPECIES_MONKEY_UNATHI) - -/mob/living/carbon/human/event1/Initialize(var/new_loc) - return ..(new_loc, SPECIES_EVENT1) diff --git a/code/modules/mob/living/carbon/human/species/outsider/replicant.dm b/code/modules/mob/living/carbon/human/species/outsider/replicant.dm index ec13e29908a..7e8bf25f6e3 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/replicant.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/replicant.dm @@ -72,7 +72,7 @@ blood_color = "#55ff55" species_language = LANGUAGE_SIGN - assisted_langs = list(LANGUAGE_ROOTGLOBAL, LANGUAGE_SOL_COMMON, LANGUAGE_SKRELLIANFAR) + assisted_langs = list(LANGUAGE_ROOTGLOBAL, LANGUAGE_SOL_COMMON) inherent_verbs = list( /mob/living/carbon/human/proc/shapeshifter_select_shape, diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index ff775a5063e..84c0a134aea 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -72,7 +72,7 @@ // The languages the species can't speak without an assisted organ. // This list is a guess at things that no one other than the parent species should be able to speak - var/list/assisted_langs = list(LANGUAGE_EAL, LANGUAGE_SKRELLIAN, LANGUAGE_SKRELLIANFAR, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) //VOREStation Edit + var/list/assisted_langs = list(LANGUAGE_EAL, LANGUAGE_SKRELLIAN, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) //VOREStation Edit //Soundy emotey things. var/scream_verb_1p = "scream" diff --git a/code/modules/mob/living/carbon/human/species/station/monkey.dm b/code/modules/mob/living/carbon/human/species/station/monkey.dm index 587f4d918d5..f90a61111cc 100644 --- a/code/modules/mob/living/carbon/human/species/station/monkey.dm +++ b/code/modules/mob/living/carbon/human/species/station/monkey.dm @@ -9,7 +9,7 @@ damage_mask = 'icons/mob/human_races/masks/dam_mask_monkey.dmi' blood_mask = 'icons/mob/human_races/masks/blood_monkey.dmi' language = null - default_language = "Chimpanzee" + default_language = LANGUAGE_ANIMAL greater_form = SPECIES_HUMAN mob_size = MOB_SMALL has_fine_manipulation = 0 @@ -75,7 +75,7 @@ deform = 'icons/mob/human_races/monkeys/r_farwa.dmi' greater_form = SPECIES_TAJ - default_language = "Farwa" + default_language = LANGUAGE_ANIMAL flesh_color = "#AFA59E" base_color = "#333333" tail = "farwatail" @@ -88,7 +88,7 @@ deform = 'icons/mob/human_races/monkeys/r_neaera.dmi' greater_form = SPECIES_SKRELL - default_language = "Neaera" + default_language = LANGUAGE_ANIMAL flesh_color = "#8CD7A3" blood_color = "#1D2CBF" reagent_tag = IS_SKRELL @@ -103,7 +103,7 @@ tail = "stoktail" greater_form = SPECIES_UNATHI - default_language = "Stok" + default_language = LANGUAGE_ANIMAL flesh_color = "#34AF10" base_color = "#066000" reagent_tag = IS_UNATHI diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 81f102899df..e41e465e959 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -13,7 +13,7 @@ species_language = LANGUAGE_SOL_COMMON secondary_langs = list(LANGUAGE_SOL_COMMON, LANGUAGE_TERMINUS) name_language = null // Use the first-name last-name generator rather than a language scrambler - assisted_langs = list(LANGUAGE_EAL, LANGUAGE_SKRELLIAN, LANGUAGE_SKRELLIANFAR, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) + assisted_langs = list(LANGUAGE_EAL, LANGUAGE_SKRELLIAN, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) min_age = 17 max_age = 130 @@ -389,7 +389,7 @@ taste_sensitivity = TASTE_SENSITIVE num_alternate_languages = 3 secondary_langs = list(LANGUAGE_ZADDAT, LANGUAGE_UNATHI) - assisted_langs = list(LANGUAGE_EAL, LANGUAGE_TERMINUS, LANGUAGE_SKRELLIANFAR, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_SOL_COMMON, LANGUAGE_AKHANI, LANGUAGE_SIIK, LANGUAGE_GUTTER) //limited vocal range; can talk Unathi and magical Galcom but not much else + assisted_langs = list(LANGUAGE_EAL, LANGUAGE_TERMINUS, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_SOL_COMMON, LANGUAGE_AKHANI, LANGUAGE_SIIK, LANGUAGE_GUTTER) //limited vocal range; can talk Unathi and magical Galcom but not much else name_language = LANGUAGE_ZADDAT species_language = LANGUAGE_ZADDAT health_hud_intensity = 2.5 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index ca5319313f8..a2ce47c2be8 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -161,7 +161,6 @@ var/list/ai_verbs_default = list( add_language(LANGUAGE_SIIK, 1) add_language(LANGUAGE_AKHANI, 1) add_language(LANGUAGE_SKRELLIAN, 1) - add_language(LANGUAGE_SKRELLIANFAR, 0) add_language(LANGUAGE_TRADEBAND, 1) add_language(LANGUAGE_GUTTER, 1) add_language(LANGUAGE_EAL, 1) diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 53fa801dd6b..139fc3831ce 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -404,7 +404,6 @@ user.add_language(LANGUAGE_ZADDAT) user.add_language(LANGUAGE_SCHECHI) user.add_language(LANGUAGE_DRUDAKAR) - user.add_language(LANGUAGE_SLAVIC) user.add_language(LANGUAGE_BIRDSONG) user.add_language(LANGUAGE_SAGARU) user.add_language(LANGUAGE_CANILUNZT) @@ -413,24 +412,15 @@ user.add_language(LANGUAGE_ENOCHIAN) user.add_language(LANGUAGE_VESPINAE) user.add_language(LANGUAGE_SPACER) - user.add_language(LANGUAGE_CLOWNISH) user.add_language(LANGUAGE_TAVAN) user.add_language(LANGUAGE_ECHOSONG) - user.add_language(LANGUAGE_CHIMPANZEE) - user.add_language(LANGUAGE_NEAERA) - user.add_language(LANGUAGE_STOK) - user.add_language(LANGUAGE_FARWA) user.add_language(LANGUAGE_ROOTLOCAL) user.add_language(LANGUAGE_VOX) - user.add_language(LANGUAGE_SKRELLIANFAR) user.add_language(LANGUAGE_MINBUS) user.add_language(LANGUAGE_ALAI) user.add_language(LANGUAGE_PROMETHEAN) user.add_language(LANGUAGE_GIBBERISH) - user.add_language("Mouse") - user.add_language("Cat") - user.add_language("Bird") - user.add_language("Dog") + user.add_language("Animal") user.add_language("Teppi") else user.remove_language(LANGUAGE_UNATHI) @@ -440,7 +430,6 @@ user.remove_language(LANGUAGE_ZADDAT) user.remove_language(LANGUAGE_SCHECHI) user.remove_language(LANGUAGE_DRUDAKAR) - user.remove_language(LANGUAGE_SLAVIC) user.remove_language(LANGUAGE_BIRDSONG) user.remove_language(LANGUAGE_SAGARU) user.remove_language(LANGUAGE_CANILUNZT) @@ -449,24 +438,15 @@ user.remove_language(LANGUAGE_ENOCHIAN) user.remove_language(LANGUAGE_VESPINAE) user.remove_language(LANGUAGE_SPACER) - user.remove_language(LANGUAGE_CLOWNISH) user.remove_language(LANGUAGE_TAVAN) user.remove_language(LANGUAGE_ECHOSONG) - user.remove_language(LANGUAGE_CHIMPANZEE) - user.remove_language(LANGUAGE_NEAERA) - user.remove_language(LANGUAGE_STOK) - user.remove_language(LANGUAGE_FARWA) user.remove_language(LANGUAGE_ROOTLOCAL) user.remove_language(LANGUAGE_VOX) - user.remove_language(LANGUAGE_SKRELLIANFAR) user.remove_language(LANGUAGE_MINBUS) user.remove_language(LANGUAGE_ALAI) user.remove_language(LANGUAGE_PROMETHEAN) user.remove_language(LANGUAGE_GIBBERISH) - user.remove_language("Mouse") - user.remove_language("Cat") - user.remove_language("Bird") - user.remove_language("Dog") + user.remove_language("Animal") user.remove_language("Teppi") /datum/pai_software/translator/is_active(mob/living/silicon/pai/user) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 4031c3b4802..f27e44cae5c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -597,7 +597,6 @@ var/global/list/robot_modules = list( LANGUAGE_SIIK = 1, LANGUAGE_AKHANI = 1, LANGUAGE_SKRELLIAN = 1, - LANGUAGE_SKRELLIANFAR = 0, LANGUAGE_ROOTLOCAL = 0, LANGUAGE_TRADEBAND = 1, LANGUAGE_GUTTER = 1, diff --git a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm index d8f7aa8a3ad..324e4afabc3 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm @@ -10,7 +10,6 @@ LANGUAGE_SIIK = 0, LANGUAGE_AKHANI = 0, LANGUAGE_SKRELLIAN = 0, - LANGUAGE_SKRELLIANFAR = 0, LANGUAGE_ROOTLOCAL = 0, LANGUAGE_GUTTER = 1, LANGUAGE_SCHECHI = 0, diff --git a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm index 33d24948843..83910850e3d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm +++ b/code/modules/mob/living/simple_mob/subtypes/occult/constructs/_construct.dm @@ -25,7 +25,7 @@ softfall = TRUE //Beings made of Hellmarble and powered by the tears of the damned are not concerned with mortal things such as 'gravity'. parachuting = TRUE - has_langs = list(LANGUAGE_GALCOM, LANGUAGE_CULT, LANGUAGE_OCCULT) + has_langs = list(LANGUAGE_GALCOM, LANGUAGE_CULT) has_eye_glow = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm b/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm index e4e58f75dc6..4b36fb7b1e5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm @@ -39,7 +39,7 @@ "rad" = 0 ) - has_langs = list("Coulrian") + has_langs = list("Animal") /mob/living/simple_mob/animal/passive/honkpet/attack_hand(mob/living/user as mob) if(user.a_intent == I_DISARM) diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index bb55c54a8dd..92f24933a57 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -1205,49 +1205,49 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "soghun_hood" - species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/hair/una_doublehorns name = "Double Unathi Horns" icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "soghun_dubhorns" - species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/hair/sergal_plain name = "Sergal Plain" icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "serg_plain" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/hair/sergal_medicore name = "Sergal Medicore" icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "serg_medicore" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/hair/sergal_tapered name = "Sergal Tapered" icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "serg_tapered" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/hair/sergal_fairytail name = "Sergal Fairytail" icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "serg_fairytail" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) // Vulpa stuffs /datum/sprite_accessory/hair/vulp_hair_none name = "None" icon_state = "bald" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_kajam @@ -1255,7 +1255,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "kajam" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_keid @@ -1263,7 +1263,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "keid" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_adhara @@ -1271,7 +1271,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "adhara" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_kleeia @@ -1279,7 +1279,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "kleeia" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_mizar @@ -1287,7 +1287,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "mizar" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_apollo @@ -1295,7 +1295,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "apollo" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_belle @@ -1303,7 +1303,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "belle" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_bun @@ -1311,7 +1311,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "bun" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_jagged @@ -1319,7 +1319,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "jagged" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_curl @@ -1327,7 +1327,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "curl" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_hawk @@ -1335,7 +1335,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "hawk" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_anita @@ -1343,7 +1343,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "anita" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_short @@ -1351,7 +1351,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "short" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/vulp_hair_spike @@ -1359,7 +1359,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "spike" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER //xeno stuffs @@ -1368,7 +1368,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "cxeno_drone" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER // figure this one out for better coloring /datum/sprite_accessory/hair/xeno_head_sentinel_color @@ -1376,7 +1376,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "cxeno_sentinel" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/xeno_head_queen_color @@ -1384,7 +1384,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "cxeno_queen" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/xeno_head_hunter_color @@ -1392,7 +1392,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "cxeno_hunter" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/xeno_head_praetorian_color @@ -1400,7 +1400,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "cxeno_praetorian" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER // Shadekin stuffs @@ -1410,7 +1410,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "shadekin_short" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/shadekin_hair_poofy @@ -1418,7 +1418,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "shadekin_poofy" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /datum/sprite_accessory/hair/shadekin_hair_long @@ -1426,7 +1426,7 @@ icon = 'icons/mob/human_face_alt.dmi' icon_add = 'icons/mob/human_face_alt_add.dmi' icon_state = "shadekin_long" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER /* @@ -1434,21 +1434,21 @@ shaved name = "Shaved" icon_state = "bald" gender = NEUTER - species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_HUMAN, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_EVENT2, SPECIES_EVENT3) */ /datum/sprite_accessory/facial_hair/neck_fluff name = "Neck Fluff" icon = 'icons/mob/human_face_or_alt.dmi' icon_state = "facial_neckfluff" gender = NEUTER - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_TAJ, SPECIES_EVENT2, SPECIES_EVENT3) color_blend_mode = ICON_MULTIPLY /datum/sprite_accessory/facial_hair/vulp_none name = "None" icon = 'icons/mob/human_face_alt.dmi' icon_state = "none" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER color_blend_mode = ICON_MULTIPLY @@ -1456,7 +1456,7 @@ shaved name = "Blaze" icon = 'icons/mob/human_face_alt.dmi' icon_state = "vulp_facial_blaze" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER color_blend_mode = ICON_MULTIPLY @@ -1464,7 +1464,7 @@ shaved name = "Vulpine" icon = 'icons/mob/human_face_alt.dmi' icon_state = "vulp_facial_vulpine" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER color_blend_mode = ICON_MULTIPLY @@ -1472,7 +1472,7 @@ shaved name = "Earfluff" icon = 'icons/mob/human_face_alt.dmi' icon_state = "vulp_facial_earfluff" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER color_blend_mode = ICON_MULTIPLY @@ -1480,7 +1480,7 @@ shaved name = "Mask" icon = 'icons/mob/human_face_alt.dmi' icon_state = "vulp_facial_mask" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER color_blend_mode = ICON_MULTIPLY @@ -1488,7 +1488,7 @@ shaved name = "Patch" icon = 'icons/mob/human_face_alt.dmi' icon_state = "vulp_facial_patch" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER color_blend_mode = ICON_MULTIPLY @@ -1496,7 +1496,7 @@ shaved name = "Ruff" icon = 'icons/mob/human_face_alt.dmi' icon_state = "vulp_facial_ruff" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER color_blend_mode = ICON_MULTIPLY @@ -1504,7 +1504,7 @@ shaved name = "Kita" icon = 'icons/mob/human_face_alt.dmi' icon_state = "vulp_facial_kita" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER color_blend_mode = ICON_MULTIPLY @@ -1512,7 +1512,7 @@ shaved name = "Swift" icon = 'icons/mob/human_face_alt.dmi' icon_state = "vulp_facial_swift" - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_EVENT2, SPECIES_EVENT3) gender = NEUTER color_blend_mode = ICON_MULTIPLY @@ -1710,7 +1710,7 @@ shaved /datum/sprite_accessory/hair/skr name = "Skrell Average Tentacles" icon_state = "skrell_hair_average" - species_allowed = list(SPECIES_SKRELL, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + species_allowed = list(SPECIES_SKRELL, SPECIES_EVENT2, SPECIES_EVENT3) /datum/sprite_accessory/hair/skr/tentacle_veryshort name = "Skrell Short Tentacles" diff --git a/code/modules/organs/subtypes/skrell.dm b/code/modules/organs/subtypes/skrell.dm index 3ac237c2b50..5f2d494105c 100644 --- a/code/modules/organs/subtypes/skrell.dm +++ b/code/modules/organs/subtypes/skrell.dm @@ -25,7 +25,7 @@ /obj/item/organ/internal/voicebox/skrell icon_state = "skrell_larynx" - will_assist_languages = list(LANGUAGE_SKRELLIAN, LANGUAGE_SKRELLIANFAR) + will_assist_languages = list(LANGUAGE_SKRELLIAN) /obj/item/organ/internal/appendix/skrell icon_state = "skrell_appendix" diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 59b1592cfa8..6755866dac1 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -124,7 +124,6 @@ tastypred - Black-Eyed Shadekin tastypred - Protean tastypred - Xenochimera terrestris - Common Skrellian -terrestris - High Skrellian terrestris - Vox thedavestdave - Protean timidvi - Diona