Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Adds felinid language for felinids (and people wearing the cat ears) #12384

Merged
SomeguyManperson merged 4 commits into from
Oct 8, 2021
Merged

Adds felinid language for felinids (and people wearing the cat ears) #12384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76272df
meow meow meow meow meow
ToasterBiome Sep 27, 2021
02dfa7a
tongues
ToasterBiome Sep 27, 2021
e34044c
putting on cat ears makes you more degenerate
ToasterBiome Sep 27, 2021
0346774
council bonks horny
ToasterBiome Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/language.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@
#define LANGUAGE_SOFTWARE "software"
#define LANGUAGE_STONER "stoner"
#define LANGUAGE_VOICECHANGE "voicechange"
#define LANGUAGE_CATEARS "cat"
11 changes: 11 additions & 0 deletions code/modules/clothing/head/misc_special.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,17 @@
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 floods with thoughts of hairballs.")
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 rid yourself of degeneracy.")
LH.remove_language(/datum/language/felinid,TRUE,TRUE,LANGUAGE_CATEARS)
..()

/obj/item/clothing/head/kitty/update_icon(mob/living/carbon/human/user)
Expand Down
13 changes: 13 additions & 0 deletions code/modules/language/felinid.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/datum/language/felinid
name = "Felinid"
desc = "A language devised by felinids to secretly plot against regular humans"
exclaim_verb = "nyas"
key = "f"
flags = TONGUELESS_SPEECH
space_chance = 90
syllables = list(
"meow", "nya", "nyam","mm","mrow","mmrrrr"
Copy link
Contributor

@patpol4 patpol4 Sep 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

incredible

Copy link
Contributor Author

@ToasterBiome ToasterBiome Sep 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a problem with this?

)
icon_state = "felinid"
default_priority = 90
sing_verb = "purrs"
6 changes: 6 additions & 0 deletions code/modules/language/language_holder.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,12 @@ Key procs
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/empty
understood_languages = list()
spoken_languages = list()
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/living/carbon/human/species_types/felinid.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
mutantears = /obj/item/organ/ears/cat
mutanttail = /obj/item/organ/tail/cat
changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | RACE_SWAP | ERT_SPAWN | SLIME_EXTRACT
species_language_holder = /datum/language_holder/felinid

/datum/species/human/felinid/qualifies_for_rank(rank, list/features)
return TRUE
Expand Down
3 changes: 2 additions & 1 deletion code/modules/surgery/organs/tongue.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
/datum/language/japanese,
/datum/language/machine, //yogs
/datum/language/darkspawn, //also yogs
/datum/language/encrypted
/datum/language/encrypted,
/datum/language/felinid
))

/obj/item/organ/tongue/Initialize(mapload)
Expand Down
Binary file modified icons/misc/language.dmi
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions yogstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2072,6 +2072,7 @@
#include "code\modules\language\egg.dm"
#include "code\modules\language\encrypted.dm"
#include "code\modules\language\etherean.dm"
#include "code\modules\language\felinid.dm"
#include "code\modules\language\language.dm"
#include "code\modules\language\language_holder.dm"
#include "code\modules\language\language_menu.dm"
Expand Down
6 changes: 6 additions & 0 deletions yogstation/code/modules/scripting/Implementations/Telecomms.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#define ETHEREAN 128
#define BONE 256
#define MOTH 512
#define CAT 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
Expand Down Expand Up @@ -170,6 +171,8 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag
oldlang = BONE
else if(oldlang == /datum/language/mothian)
oldlang = MOTH
else if(oldlang == /datum/language/felinid)
oldlang = CAT
// Signal data

var/datum/n_struct/signal/script_signal = new(list(
Expand Down Expand Up @@ -306,6 +309,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

/datum/n_function/default/mem
name = "mem"
Expand Down Expand Up @@ -479,3 +484,4 @@ GLOBAL_LIST_INIT(allowed_translations,list(/datum/language/common,/datum/languag
#undef ETHEREAN
#undef BONE
#undef MOTH
#undef CAT