mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Removes felinid language (#17825)
* Removes felinid language from silicons * Removes multilingual (felinid) trait * Removes felinid from being granted upon using cat ears * Redd moment * removes felinid from tongue's possible language base. * removes felinid from telecomms * removes felinid from language holders * removes the felinid language as it provides a material benefit to donors * gives felinids the english language holder * removes felinid language icon
This commit is contained in:
@@ -430,13 +430,6 @@
|
||||
gain_text = span_notice("You have learned to understand Draconic.")
|
||||
lose_text = span_notice("You have forgotten how to understand Draconic.")
|
||||
|
||||
/datum/quirk/multilingual/felinid
|
||||
name = "Multilingual (Felinid)"
|
||||
desc = "You spent a portion of your life learning to understand Felinid. You may or may not be able to speak it based on your anatomy."
|
||||
specific = /datum/language/felinid
|
||||
gain_text = span_notice("You have learned to understand Felinid.")
|
||||
lose_text = span_notice("You have forgotten how to understand Felinid.")
|
||||
|
||||
/datum/quirk/multilingual/sylvan
|
||||
name = "Multilingual (Sylvan)"
|
||||
desc = "You spent a portion of your life learning to understand Sylvan. You may or may not be able to speak it based on your anatomy."
|
||||
|
||||
@@ -174,7 +174,6 @@
|
||||
/datum/language/draconic,
|
||||
/datum/language/english,
|
||||
/datum/language/etherean,
|
||||
/datum/language/felinid,
|
||||
/datum/language/mothian,
|
||||
/datum/language/polysmorph,
|
||||
/datum/language/sylvan
|
||||
@@ -188,7 +187,6 @@
|
||||
/datum/language/draconic,
|
||||
/datum/language/english,
|
||||
/datum/language/etherean,
|
||||
/datum/language/felinid,
|
||||
/datum/language/mothian,
|
||||
/datum/language/polysmorph,
|
||||
/datum/language/sylvan,
|
||||
|
||||
@@ -136,18 +136,7 @@
|
||||
if(ishuman(user) && slot == SLOT_HEAD)
|
||||
update_icon(user)
|
||||
user.update_inv_head() //Color might have been changed by update_icon.
|
||||
var/datum/language_holder/LH = user.get_language_holder()
|
||||
if(!LH.has_language(/datum/language/felinid) || !LH.can_speak_language(/datum/language/felinid))
|
||||
to_chat(user, "Your mind is filled with the knowledge of huntspeak... Well thats what felinids want you to believe anyway.")
|
||||
LH.grant_language(/datum/language/felinid,TRUE,TRUE,LANGUAGE_CATEARS)
|
||||
..()
|
||||
|
||||
/obj/item/clothing/head/kitty/dropped(mob/user)
|
||||
..()
|
||||
var/datum/language_holder/LH = user.get_language_holder()
|
||||
if(LH.has_language(/datum/language/felinid) || LH.can_speak_language(/datum/language/felinid)) //sanity
|
||||
to_chat(user, "You lose the keenness in your ears.")
|
||||
LH.remove_language(/datum/language/felinid,TRUE,TRUE,LANGUAGE_CATEARS)
|
||||
|
||||
|
||||
/obj/item/clothing/head/kitty/update_icon(mob/living/carbon/human/user)
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
/datum/language/felinid
|
||||
name = "Felinid"
|
||||
desc = "A language devised by felinids to collaborate and hunt more efficiently... well thats what it sounds like in their minds anyway."
|
||||
exclaim_verb = "miaows"
|
||||
key = "f"
|
||||
flags = TONGUELESS_SPEECH
|
||||
space_chance = 90
|
||||
syllables = list(
|
||||
"mhm", "mew", "mia","meow","miaow","mmrrrr"
|
||||
)
|
||||
icon_state = "felinid"
|
||||
default_priority = 90
|
||||
sing_verb = "mews"
|
||||
@@ -361,16 +361,8 @@ Key procs
|
||||
/datum/language/ratvar = list(LANGUAGE_ATOM),)
|
||||
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
|
||||
/datum/language/ratvar = list(LANGUAGE_ATOM),)
|
||||
|
||||
/datum/language_holder/felinid
|
||||
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
|
||||
/datum/language/felinid = list(LANGUAGE_ATOM))
|
||||
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
|
||||
/datum/language/felinid = list(LANGUAGE_ATOM))
|
||||
|
||||
/datum/language_holder/spiderbot
|
||||
understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
|
||||
/datum/language/felinid = list(LANGUAGE_ATOM), ///Spiderbots, I am sorry for making you understand this shit
|
||||
/datum/language/english = list(LANGUAGE_ATOM),
|
||||
/datum/language/mothian = list(LANGUAGE_ATOM),
|
||||
/datum/language/polysmorph = list(LANGUAGE_ATOM),
|
||||
@@ -380,7 +372,6 @@ Key procs
|
||||
/datum/language/draconic = list(LANGUAGE_ATOM),
|
||||
/datum/language/machine = list(LANGUAGE_ATOM))
|
||||
spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
|
||||
/datum/language/felinid = list(LANGUAGE_ATOM),
|
||||
/datum/language/english = list(LANGUAGE_ATOM),
|
||||
/datum/language/mothian = list(LANGUAGE_ATOM),
|
||||
/datum/language/polysmorph = list(LANGUAGE_ATOM),
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
mutanttail = /obj/item/organ/tail/cat
|
||||
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
|
||||
swimming_component = /datum/component/swimming/felinid
|
||||
species_language_holder = /datum/language_holder/felinid
|
||||
species_language_holder = /datum/language_holder/english
|
||||
|
||||
screamsound = list('sound/voice/feline/scream1.ogg', 'sound/voice/feline/scream2.ogg', 'sound/voice/feline/scream3.ogg')
|
||||
|
||||
|
||||
@@ -30,7 +30,6 @@
|
||||
/datum/language/machine, //yogs
|
||||
/datum/language/darkspawn, //also yogs
|
||||
/datum/language/encrypted,
|
||||
/datum/language/felinid,
|
||||
/datum/language/english,
|
||||
/datum/language/french
|
||||
))
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 6.1 KiB |
@@ -2347,7 +2347,6 @@
|
||||
#include "code\modules\language\encrypted.dm"
|
||||
#include "code\modules\language\english.dm"
|
||||
#include "code\modules\language\etherean.dm"
|
||||
#include "code\modules\language\felinid.dm"
|
||||
#include "code\modules\language\french.dm"
|
||||
#include "code\modules\language\language.dm"
|
||||
#include "code\modules\language\language_holder.dm"
|
||||
|
||||
@@ -14,8 +14,7 @@
|
||||
#define ETHEREAN 128
|
||||
#define BONE 256
|
||||
#define MOTH 512
|
||||
#define CAT 1024
|
||||
#define ENGLISH 2048
|
||||
#define ENGLISH 1024
|
||||
|
||||
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
|
||||
@@ -173,8 +172,6 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag
|
||||
oldlangbits = BONE
|
||||
else if(oldlang == /datum/language/mothian)
|
||||
oldlangbits = MOTH
|
||||
else if(oldlang == /datum/language/felinid)
|
||||
oldlangbits = CAT
|
||||
else if(oldlang == /datum/language/english)
|
||||
oldlangbits = ENGLISH
|
||||
// Signal data
|
||||
@@ -313,8 +310,6 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag
|
||||
return /datum/language/bonespeak
|
||||
if(MOTH)
|
||||
return /datum/language/mothian
|
||||
if(CAT)
|
||||
return /datum/language/felinid
|
||||
if(ENGLISH)
|
||||
return /datum/language/english
|
||||
|
||||
@@ -490,5 +485,4 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag
|
||||
#undef ETHEREAN
|
||||
#undef BONE
|
||||
#undef MOTH
|
||||
#undef CAT
|
||||
#undef ENGLISH
|
||||
|
||||
Reference in New Issue
Block a user