Revert "Removes felinid language (#17825)"

This reverts commit e75cb0a.
yogstation13 · Feb 9, 2023 · cbe74e7 · cbe74e7
1 parent d268cad
commit cbe74e7
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 2 deletions.
diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
@@ -430,6 +430,13 @@
 	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."

diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
@@ -174,6 +174,7 @@
 		/datum/language/draconic,
 		/datum/language/english,
 		/datum/language/etherean,
+		/datum/language/felinid,
 		/datum/language/mothian,
 		/datum/language/polysmorph,
 		/datum/language/sylvan
@@ -187,6 +188,7 @@
 		/datum/language/draconic,
 		/datum/language/english,
 		/datum/language/etherean,
+		/datum/language/felinid,
 		/datum/language/mothian,
 		/datum/language/polysmorph,
 		/datum/language/sylvan,

diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
@@ -136,7 +136,18 @@
 	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)

diff --git a/code/modules/language/felinid.dm b/code/modules/language/felinid.dm
@@ -0,0 +1,13 @@
+/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"
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
@@ -361,8 +361,16 @@ 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),
@@ -372,6 +380,7 @@ 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),

diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm
@@ -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/english
+	species_language_holder = /datum/language_holder/felinid
 
 	screamsound = list('sound/voice/feline/scream1.ogg', 'sound/voice/feline/scream2.ogg', 'sound/voice/feline/scream3.ogg')
 

diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
@@ -30,6 +30,7 @@
 		/datum/language/machine, //yogs
 		/datum/language/darkspawn, //also yogs
 		/datum/language/encrypted,
+		/datum/language/felinid,
 		/datum/language/english,
 		/datum/language/french
 	))

diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi
diff --git a/yogstation.dme b/yogstation.dme
@@ -2347,6 +2347,7 @@
 #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"

diff --git a/yogstation/code/modules/scripting/Implementations/Telecomms.dm b/yogstation/code/modules/scripting/Implementations/Telecomms.dm
@@ -14,7 +14,8 @@
 #define ETHEREAN 128
 #define BONE 256
 #define MOTH 512
-#define ENGLISH 1024
+#define CAT 1024
+#define ENGLISH 2048
 
 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
@@ -172,6 +173,8 @@ 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
@@ -310,6 +313,8 @@ 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
 
@@ -485,4 +490,5 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag
 #undef ETHEREAN
 #undef BONE
 #undef MOTH
+#undef CAT
 #undef ENGLISH