From 717525c082fee59d8bcca3590b1ca27a42898a3d Mon Sep 17 00:00:00 2001 From: tattax <71668564+tattax@users.noreply.github.com> Date: Wed, 25 Aug 2021 22:31:22 -0300 Subject: [PATCH] Revert "Adds a racial language for every xeno who doesn't have one (#12082)" This reverts commit 5a33e9a8ba506133e14d951cfa1c84a3f67865d0. --- code/datums/traits/negative.dm | 2 +- code/modules/language/bonespeak.dm | 15 ----------- code/modules/language/etherean.dm | 15 ----------- code/modules/language/language_holder.dm | 17 ------------ code/modules/language/mothian.dm | 15 ----------- code/modules/language/sylvan.dm | 2 +- .../carbon/human/species_types/ethereal.dm | 1 - .../carbon/human/species_types/mothmen.dm | 1 - .../carbon/human/species_types/plasmamen.dm | 1 - code/modules/surgery/organs/tongue.dm | 3 --- icons/misc/language.dmi | Bin 5512 -> 5107 bytes yogstation.dme | 3 --- .../scripting/Implementations/Telecomms.dm | 25 ++---------------- 13 files changed, 4 insertions(+), 96 deletions(-) delete mode 100644 code/modules/language/bonespeak.dm delete mode 100644 code/modules/language/etherean.dm delete mode 100644 code/modules/language/mothian.dm diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 7344e3013950..0d169bce1488 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -607,7 +607,7 @@ /datum/quirk/sheltered/on_spawn() var/mob/living/carbon/human/H = quirk_holder H.remove_language(/datum/language/common, FALSE, TRUE) - if(!H.get_selected_language()) + if(!H.can_speak_language(/datum/language/draconic) && !H.can_speak_language(/datum/language/machine) && !H.can_speak_language(/datum/language/sylvan)) H.grant_language(/datum/language/japanese) /datum/quirk/allergic diff --git a/code/modules/language/bonespeak.dm b/code/modules/language/bonespeak.dm deleted file mode 100644 index 1226a3c7eaeb..000000000000 --- a/code/modules/language/bonespeak.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/language/bonespeak - name = "Bonespeak" - desc = "The rhythmic rattling Plasma People use to communicate." - speech_verb = "rattles" - ask_verb = "clicks" - exclaim_verb = "clatters" - key = "b" - flags = TONGUELESS_SPEECH - space_chance = 80 - syllables = list( - "tktk", "creak", "krt", "clack", "rattle", "krr" - ) - icon_state = "plasmaman" - default_priority = 90 - sing_verb = "crackles" diff --git a/code/modules/language/etherean.dm b/code/modules/language/etherean.dm deleted file mode 100644 index 97f5d1cbc7d8..000000000000 --- a/code/modules/language/etherean.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/language/etherean - name = "Etherean" - desc = "The native language of the Ethereals." - speech_verb = "crackles" - ask_verb = "pops" - exclaim_verb = "jolts" - key = "3" - flags = TONGUELESS_SPEECH - space_chance = 70 - syllables = list( - "zap", "pop", "zzzz", "bzzzz", "tzzt", "hmmmm", "mmmm", "dzzzt", "ohmm", "zpp" - ) - icon_state = "ethereal" - default_priority = 90 - sing_verb = "hums" diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm index 059e07f3ddde..f6287a0e349c 100644 --- a/code/modules/language/language_holder.dm +++ b/code/modules/language/language_holder.dm @@ -319,12 +319,6 @@ Key procs spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/sylvan = list(LANGUAGE_ATOM)) -/datum/language_holder/plasmaman - understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), - /datum/language/bonespeak = list(LANGUAGE_ATOM)) - spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), - /datum/language/bonespeak = list(LANGUAGE_ATOM)) - /datum/language_holder/pod understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/sylvan = list(LANGUAGE_ATOM)) @@ -343,17 +337,6 @@ Key procs spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), /datum/language/polysmorph = list(LANGUAGE_ATOM)) -/datum/language_holder/mothmen - understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), - /datum/language/mothian = list(LANGUAGE_ATOM)) - spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), - /datum/language/mothian = list(LANGUAGE_ATOM)) - -/datum/language_holder/ethereal - understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), - /datum/language/etherean = list(LANGUAGE_ATOM)) - spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM), - /datum/language/etherean = list(LANGUAGE_ATOM)) /datum/language_holder/clockwork understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), diff --git a/code/modules/language/mothian.dm b/code/modules/language/mothian.dm deleted file mode 100644 index 9d72a19840c3..000000000000 --- a/code/modules/language/mothian.dm +++ /dev/null @@ -1,15 +0,0 @@ -/datum/language/mothian - name = "Mothian" - desc = "The native language of the Moth people." - speech_verb = "flutters" - ask_verb = "chirps" - exclaim_verb = "buzzes loudly" - key = "2" - flags = TONGUELESS_SPEECH - space_chance = 100 - syllables = list( - "bzz", "zzzt", "zzt", "zt", "clck", "tzip", "dzt", "dzzzt" - ) - icon_state = "moth" - default_priority = 90 - sing_verb = "trills" diff --git a/code/modules/language/sylvan.dm b/code/modules/language/sylvan.dm index 70829431e821..24b9a6d66ddd 100644 --- a/code/modules/language/sylvan.dm +++ b/code/modules/language/sylvan.dm @@ -15,5 +15,5 @@ "incas", "int", "elc", "ent", "aws", "qip", "nas", "vil", "jens", "dila", "fa", "la", "re", "do", "ji", "ae", "so", "qe", "ce", "na", "mo", "ha", "yu" ) - icon_state = "sylvan" + icon_state = "plant" default_priority = 90 diff --git a/code/modules/mob/living/carbon/human/species_types/ethereal.dm b/code/modules/mob/living/carbon/human/species_types/ethereal.dm index 758587911d3f..3b2e9553d622 100644 --- a/code/modules/mob/living/carbon/human/species_types/ethereal.dm +++ b/code/modules/mob/living/carbon/human/species_types/ethereal.dm @@ -17,7 +17,6 @@ species_traits = list(DYNCOLORS, AGENDER, NO_UNDERWEAR) changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT inherent_traits = list(TRAIT_NOHUNGER) - species_language_holder = /datum/language_holder/ethereal sexes = FALSE //no fetish content allowed toxic_food = NONE inert_mutation = SHOCKTOUCH diff --git a/code/modules/mob/living/carbon/human/species_types/mothmen.dm b/code/modules/mob/living/carbon/human/species_types/mothmen.dm index 388643b9d913..c7e688a216ed 100644 --- a/code/modules/mob/living/carbon/human/species_types/mothmen.dm +++ b/code/modules/mob/living/carbon/human/species_types/mothmen.dm @@ -17,7 +17,6 @@ toxic_food = MEAT | RAW mutanteyes = /obj/item/organ/eyes/moth changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT - species_language_holder = /datum/language_holder/mothmen /datum/species/moth/regenerate_organs(mob/living/carbon/C,datum/species/old_species,replace_current=TRUE) . = ..() diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm index e06881942337..dbe2d0b2a20e 100644 --- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm +++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm @@ -21,7 +21,6 @@ disliked_food = FRUIT liked_food = VEGETABLES | GRILLED changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC - species_language_holder = /datum/language_holder/plasmaman /datum/species/plasmaman/spec_life(mob/living/carbon/human/H) var/datum/gas_mixture/environment = H.loc.return_air() diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index d8ec42a9b330..7db67721b0f7 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -20,9 +20,6 @@ /datum/language/aphasia, /datum/language/piratespeak, /datum/language/sylvan, - /datum/language/bonespeak, - /datum/language/mothian, - /datum/language/etherean, /datum/language/japanese, /datum/language/machine, //yogs /datum/language/darkspawn, //also yogs diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi index b05b6cab7c2daa4ea8f58df9300cd23d9a184543..14c76124aed8155f1188080bfa4256da3c4db802 100644 GIT binary patch literal 5107 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 KMNUMnLSTYNGs%Mh diff --git a/yogstation.dme b/yogstation.dme index b1428e39271c..aab6062c7c55 100644 --- a/yogstation.dme +++ b/yogstation.dme @@ -2050,20 +2050,17 @@ #include "code\modules\keybindings\setup.dm" #include "code\modules\language\aphasia.dm" #include "code\modules\language\beachbum.dm" -#include "code\modules\language\bonespeak.dm" #include "code\modules\language\codespeak.dm" #include "code\modules\language\common.dm" #include "code\modules\language\draconic.dm" #include "code\modules\language\drone.dm" #include "code\modules\language\egg.dm" #include "code\modules\language\encrypted.dm" -#include "code\modules\language\etherean.dm" #include "code\modules\language\language.dm" #include "code\modules\language\language_holder.dm" #include "code\modules\language\language_menu.dm" #include "code\modules\language\machine.dm" #include "code\modules\language\monkey.dm" -#include "code\modules\language\mothian.dm" #include "code\modules\language\mouse.dm" #include "code\modules\language\mushroom.dm" #include "code\modules\language\narsian.dm" diff --git a/yogstation/code/modules/scripting/Implementations/Telecomms.dm b/yogstation/code/modules/scripting/Implementations/Telecomms.dm index 26ff7dbc6b0f..f8d922a24faa 100644 --- a/yogstation/code/modules/scripting/Implementations/Telecomms.dm +++ b/yogstation/code/modules/scripting/Implementations/Telecomms.dm @@ -11,10 +11,6 @@ #define DRACONIC 16 #define BEACHTONGUE 32 #define SYLVAN 64 -#define ETHEREAN 128 -#define BONE 256 -#define MOTH 512 - GLOBAL_LIST_INIT(allowed_custom_spans,list(SPAN_ROBOT,SPAN_YELL,SPAN_ITALICS,SPAN_SANS,SPAN_COMMAND,SPAN_CLOWN))//Span classes that players are allowed to set in a radio transmission. //this is fucking broken GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/language/machine,/datum/language/draconic))// language datums that players are allowed to translate to in a radio transmission. @@ -121,10 +117,7 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag "polysmorph" = POLYSMORPH, "draconic" = DRACONIC, "beachtounge" = BEACHTONGUE, - "sylvan" = SYLVAN, - "etherean" = ETHEREAN, - "bonespeak" = BONE, - "mothian" = MOTH + "sylvan" = SYLVAN ))) interpreter.Run() // run the thing @@ -164,12 +157,7 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag oldlang = BEACHTONGUE else if(oldlang == /datum/language/sylvan) oldlang = SYLVAN - else if(oldlang == /datum/language/etherean) - oldlang = ETHEREAN - else if(oldlang == /datum/language/bonespeak) - oldlang = BONE - else if(oldlang == /datum/language/mothian) - oldlang = MOTH + // Signal data var/datum/n_struct/signal/script_signal = new(list( @@ -300,12 +288,6 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag return /datum/language/beachbum if(SYLVAN) return /datum/language/sylvan - if(ETHEREAN) - return /datum/language/etherean - if(BONE) - return /datum/language/bonespeak - if(MOTH) - return /datum/language/mothian /datum/n_function/default/mem name = "mem" @@ -476,6 +458,3 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag #undef DRACONIC #undef BEACHTONGUE #undef SYLVAN -#undef ETHEREAN -#undef BONE -#undef MOTH