Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit742

2025-12-10 09:54:52 +00:00 · 2020-05-11 00:46:51 +02:00
parent b229386efa 7cfbdf3a1d
commit 7109851089
74 changed files with 1049 additions and 596 deletions
--- a/code/modules/language/codespeak.dm
+++ b/code/modules/language/codespeak.dm
@@ -46,7 +46,7 @@
 		return

 	to_chat(user, "<span class='boldannounce'>You start skimming through [src], and suddenly your mind is filled with codewords and responses.</span>")
-	user.grant_language(/datum/language/codespeak)
+	user.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND)

 	use_charge(user)

@@ -65,7 +65,7 @@
 		M.visible_message("<span class='danger'>[user] beats [M] over the head with [src]!</span>", "<span class='userdanger'>[user] beats you over the head with [src]!</span>", "<span class='italics'>You hear smacking.</span>")
 	else
 		M.visible_message("<span class='notice'>[user] teaches [M] by beating [M.p_them()] over the head with [src]!</span>", "<span class='boldnotice'>As [user] hits you with [src], codewords and responses flow through your mind.</span>", "<span class='italics'>You hear smacking.</span>")
-		M.grant_language(/datum/language/codespeak)
+		M.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND)
 		use_charge(user)

 /obj/item/codespeak_manual/proc/use_charge(mob/user)
--- a/code/modules/language/language_holder.dm
+++ b/code/modules/language/language_holder.dm
@@ -1,149 +1,332 @@
-/datum/language_holder
-	var/list/languages = list(/datum/language/common)
-	var/list/shadow_languages = list()
-	var/only_speaks_language = null
-	var/selected_default_language = null
-	var/datum/language_menu/language_menu
+/*!Language holders will either exist in an atom/movable or a mind. Creation of language holders happens
+automatically when they are needed, for example when something tries to speak.
+Where a mind is available, the mind language holder will be the one "in charge". The mind holder
+will update its languages based on the atom holder, and will get updated as part of
+transformations and other events that cause new languages to become available.
+Every language holder has three lists of languages (and sources for each of them):
+- understood_languages
+- spoken_languages
+- blocked_languages
+Understood languages let you understand them, spoken languages lets you speak them
+(if your tongue is compatible), and blocked languages will let you do neither no matter
+what the source of the language is.
+Language holders are designed to mostly only ever require the use the helpers in atom/movable
+to achieve your goals, but it is also possible to work on them directly if needed. Any adding
+and removing of languages and sources should only happen through the procs, as directly changing
+these will mess something up somewhere down the line.
+All atom movables have the initial_language_holder var which allows you to set the default language
+holder to create. For example, /datum/language_holder/alien will give you xenocommon and a block for
+galactic common. Human species also have a default language holder var that will be updated on
+species change, initial_species_holder.
+Key procs
+* [grant_language](atom/movable.html#proc/grant_language)
+* [remove_language](atom/movable.html#proc/remove_language)
+* [add_blocked_language](atom/movable.html#proc/add_blocked_language)
+* [remove_blocked_language](atom/movable.html#proc/remove_blocked_language)
+* [grant_all_languages](atom/movable.html#proc/grant_all_languages)
+* [remove_all_languages](atom/movable.html#proc/remove_all_languages)
+* [has_language](atom/movable.html#proc/has_language)
+* [can_speak_language](atom/movable.html#proc/can_speak_language)
+* [get_selected_language](atom/movable.html#proc/get_selected_language)
+* [update_atom_languages](atom/movable.html#proc/update_atom_languages)
+*/

+/datum/language_holder
+	/// Understood languages.
+	var/list/understood_languages = list(/datum/language/common = list(LANGUAGE_MIND))
+	/// A list of languages that can be spoken. Tongue organ may also set limits beyond this list.
+	var/list/spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
+	/// A list of blocked languages. Used to prevent understanding and speaking certain languages, ie for certain mobs, mutations etc.
+	var/list/blocked_languages = list()
+	/// If true, overrides tongue limitations.
 	var/omnitongue = FALSE
+	/// Handles displaying the language menu UI.
+	var/datum/language_menu/language_menu
+	/// Currently spoken language
+	var/selected_language
+	/// Tracks the entity that owns the holder.
 	var/owner

-/datum/language_holder/New(owner)
-	src.owner = owner
-
-	languages = typecacheof(languages)
-	shadow_languages = typecacheof(shadow_languages)
-
-/datum/language_holder/Destroy()
-	owner = null
-	QDEL_NULL(language_menu)
-	languages.Cut()
-	shadow_languages.Cut()
-	return ..()
-
-/datum/language_holder/proc/copy(newowner)
-	var/datum/language_holder/copy = new(newowner)
-	copy.languages = src.languages.Copy()
-	// shadow languages are not copied.
-	copy.only_speaks_language = src.only_speaks_language
-	copy.selected_default_language = src.selected_default_language
-	// language menu is not copied, that's tied to the holder.
-	copy.omnitongue = src.omnitongue
-	return copy
-
-/datum/language_holder/proc/grant_language(datum/language/dt, shadow = FALSE)
-	if(shadow)
-		shadow_languages[dt] = TRUE
-	else
-		languages[dt] = TRUE
-
-/datum/language_holder/proc/grant_all_languages(omnitongue=FALSE)
-	for(var/la in GLOB.all_languages)
-		grant_language(la)
-
-	if(omnitongue)
-		src.omnitongue = TRUE
-
-/datum/language_holder/proc/get_random_understood_language()
-	var/list/possible = list()
-	for(var/dt in languages)
-		possible += dt
-	. = safepick(possible)
-
-/datum/language_holder/proc/remove_language(datum/language/dt, shadow = FALSE)
-	if(shadow)
-		shadow_languages -= dt
-	else
-		languages -= dt
-
-/datum/language_holder/proc/remove_all_languages()
-	languages.Cut()
-
-/datum/language_holder/proc/has_language(datum/language/dt)
-	if(is_type_in_typecache(dt, languages))
-		return LANGUAGE_KNOWN
-	else
-		var/atom/movable/AM = get_atom()
-		var/datum/language_holder/L = AM.get_language_holder(shadow=FALSE)
-		if(L != src)
-			if(is_type_in_typecache(dt, L.shadow_languages))
-				return LANGUAGE_SHADOWED
-	return FALSE
-
-/datum/language_holder/proc/copy_known_languages_from(thing, replace=FALSE)
-	var/datum/language_holder/other
-	if(istype(thing, /datum/language_holder))
-		other = thing
-	else if(ismovable(thing))
-		var/atom/movable/AM = thing
-		other = AM.get_language_holder()
-	else if(istype(thing, /datum/mind))
-		var/datum/mind/M = thing
-		other = M.get_language_holder()
-
-	if(replace)
-		src.remove_all_languages()
-
-	for(var/l in other.languages)
-		src.grant_language(l)
-
-
-/datum/language_holder/proc/open_language_menu(mob/user)
-	if(!language_menu)
-		language_menu = new(src)
-	language_menu.ui_interact(user)
-
-/datum/language_holder/proc/get_atom()
-	if(ismovable(owner))
-		. = owner
-	else if(istype(owner, /datum/mind))
+/// Initializes, and copies in the languages from the current atom if available.
+/datum/language_holder/New(_owner)
+	owner = _owner
+	if(istype(owner, /datum/mind))
 		var/datum/mind/M = owner
 		if(M.current)
-			. = M.current
+			update_atom_languages(M.current)
+	get_selected_language()
+
+/datum/language_holder/Destroy()
+	QDEL_NULL(language_menu)
+	return ..()
+
+/// Grants the supplied language.
+/datum/language_holder/proc/grant_language(language, understood = TRUE, spoken = TRUE, source = LANGUAGE_MIND)
+	if(understood)
+		if(!understood_languages[language])
+			understood_languages[language] = list()
+		understood_languages[language] |= source
+		. = TRUE
+	if(spoken)
+		if(!spoken_languages[language])
+			spoken_languages[language] = list()
+		spoken_languages[language] |= source
+		. = TRUE
+
+/// Grants every language to understood and spoken, and gives omnitongue.
+/datum/language_holder/proc/grant_all_languages(understood = TRUE, spoken = TRUE, grant_omnitongue = TRUE, source = LANGUAGE_MIND)
+	for(var/language in GLOB.all_languages)
+		grant_language(language, understood, spoken, source)
+	if(grant_omnitongue)	// Overrides tongue limitations.
+		omnitongue = TRUE
+	return TRUE
+
+/// Removes a single language or source, removing all sources returns the pre-removal state of the language.
+/datum/language_holder/proc/remove_language(language, understood = TRUE, spoken = TRUE, source = LANGUAGE_ALL)
+	if(understood && understood_languages[language])
+		if(source == LANGUAGE_ALL)
+			understood_languages -= language
+		else
+			understood_languages[language] -= source
+			if(!length(understood_languages[language]))
+				understood_languages -= language
+		. = TRUE
+
+	if(spoken && spoken_languages[language])
+		if(source == LANGUAGE_ALL)
+			spoken_languages -= language
+		else
+			spoken_languages[language] -= source
+			if(!length(spoken_languages[language]))
+				spoken_languages -= language
+		. = TRUE
+
+/// Removes every language and optionally sets omnitongue false. If a non default source is supplied, only removes that source.
+/datum/language_holder/proc/remove_all_languages(source = LANGUAGE_ALL, remove_omnitongue = FALSE)
+	for(var/language in GLOB.all_languages)
+		remove_language(language, TRUE, TRUE, source)
+	if(remove_omnitongue)
+		omnitongue = FALSE
+	return TRUE
+
+/// Adds a single language or list of languages to the blocked language list.
+/datum/language_holder/proc/add_blocked_language(languages, source = LANGUAGE_MIND)
+	if(!islist(languages))
+		languages = list(languages)
+	for(var/language in languages)
+		if(!blocked_languages[language])
+			blocked_languages[language] = list()
+		blocked_languages[language] |= source
+	return TRUE
+
+/// Removes a single language or list of languages from the blocked language list.
+/datum/language_holder/proc/remove_blocked_language(languages, source = LANGUAGE_MIND)
+	if(!islist(languages))
+		languages = list(languages)
+	for(var/language in languages)
+		if(blocked_languages[language])
+			if(source == LANGUAGE_ALL)
+				blocked_languages -= language
+			else
+				blocked_languages[language] -= source
+				if(!length(blocked_languages[language]))
+					blocked_languages -= language
+	return TRUE
+
+/// Checks if you have the language. If spoken is true, only checks if you can speak the language.
+/datum/language_holder/proc/has_language(language, spoken = FALSE)
+	if(language in blocked_languages)
+		return FALSE
+	if(spoken)
+		return language in spoken_languages
+	return language in understood_languages
+
+/// Checks if you can speak the language. Tongue limitations should be supplied as an argument.
+/datum/language_holder/proc/can_speak_language(language)
+	var/atom/movable/ouratom = get_atom()
+	var/tongue = ouratom.could_speak_language(language)
+	if((omnitongue || tongue) && has_language(language, TRUE))
+		return TRUE
+	return FALSE
+
+/// Returns selected language if it can be spoken, or decides, sets and returns a new selected language if possible.
+/datum/language_holder/proc/get_selected_language()
+	if(selected_language && can_speak_language(selected_language))
+		return selected_language
+	selected_language = null
+	var/highest_priority
+	for(var/lang in spoken_languages)
+		var/datum/language/language = lang
+		var/priority = initial(language.default_priority)
+		if((!highest_priority || (priority > highest_priority)) && !(language in blocked_languages))
+			if(can_speak_language(language))
+				selected_language = language
+				highest_priority = priority
+	return selected_language
+
+/// Gets a random understood language, useful for hallucinations and such.
+/datum/language_holder/proc/get_random_understood_language()
+	return pick(understood_languages)
+
+/// Gets a random spoken language, useful for forced speech and such.
+/datum/language_holder/proc/get_random_spoken_language()
+	return pick(spoken_languages)
+
+/// Opens a language menu reading from the language holder.
+/datum/language_holder/proc/open_language_menu(mob/user)
+	if(!language_menu)
+		language_menu = new (src)
+	language_menu.ui_interact(user)
+
+/// Gets the atom, since we some times need to check if the tongue has limitations.
+/datum/language_holder/proc/get_atom()
+	if(owner)
+		if(istype(owner, /datum/mind))
+			var/datum/mind/M = owner
+			return M.current
+		return owner
+	return FALSE
+
+/// Empties out the atom specific languages and updates them according to the supplied atoms language holder.
+/datum/language_holder/proc/update_atom_languages(atom/movable/thing)
+	var/datum/language_holder/from_atom = thing.get_language_holder(FALSE)	//Gets the atoms language holder
+	if(from_atom == src)	//This could happen if called on an atom without a mind.
+		return FALSE
+	for(var/language in understood_languages)
+		remove_language(language, TRUE, FALSE, LANGUAGE_ATOM)
+	for(var/language in spoken_languages)
+		remove_language(language, FALSE, TRUE, LANGUAGE_ATOM)
+	for(var/language in blocked_languages)
+		remove_blocked_language(language, LANGUAGE_ATOM)
+
+	copy_languages(from_atom)
+	get_selected_language()
+	return TRUE
+
+/// Copies all languages from the supplied atom/language holder. Source should be overridden when you
+/// do not want the language overwritten by later atom updates or want to avoid blocked languages.
+/datum/language_holder/proc/copy_languages(var/datum/language_holder/from_holder, source_override)
+	if(source_override)	//No blocked languages here, for now only used by ling absorb.
+		for(var/language in from_holder.understood_languages)
+			grant_language(language, TRUE, FALSE, source_override)
+		for(var/language in from_holder.spoken_languages)
+			grant_language(language, FALSE, TRUE, source_override)
+	else
+		for(var/language in from_holder.understood_languages)
+			grant_language(language, TRUE, FALSE, from_holder.understood_languages[language])
+		for(var/language in from_holder.spoken_languages)
+			grant_language(language, FALSE, TRUE, from_holder.spoken_languages[language])
+		for(var/language in from_holder.blocked_languages)
+			add_blocked_language(language, from_holder.blocked_languages[language])
+	return TRUE
+
+
+//************************************************
+//*        Specific language holders              *
+//*      Use atom language sources only.           *
+//************************************************/
+

 /datum/language_holder/alien
-	languages = list(/datum/language/xenocommon)
-
-/datum/language_holder/monkey
-	languages = list(/datum/language/monkey)
-
-/datum/language_holder/swarmer
-	languages = list(/datum/language/swarmer)
+	understood_languages = list(/datum/language/xenocommon = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/xenocommon = list(LANGUAGE_ATOM))
+	blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))

 /datum/language_holder/clockmob
-	languages = list(/datum/language/common, /datum/language/ratvar)
-	only_speaks_language = /datum/language/ratvar
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/ratvar = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/ratvar = list(LANGUAGE_ATOM))

 /datum/language_holder/construct
-	languages = list(/datum/language/common, /datum/language/narsie)
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/narsie = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+							/datum/language/narsie = list(LANGUAGE_ATOM))

 /datum/language_holder/drone
-	languages = list(/datum/language/common, /datum/language/drone, /datum/language/machine)
-	only_speaks_language = /datum/language/drone
+	understood_languages = list(/datum/language/drone = list(LANGUAGE_ATOM),
+								/datum/language/machine = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/drone = list(LANGUAGE_ATOM))
+	blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))

 /datum/language_holder/drone/syndicate
-	only_speaks_language = null
+	blocked_languages = null

 /datum/language_holder/dwarf
-	languages = list(/datum/language/common, /datum/language/dwarf)
-	only_speaks_language = /datum/language/dwarf
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/dwarf = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+							/datum/language/dwarf = list(LANGUAGE_ATOM))

-/datum/language_holder/slime
-	languages = list(/datum/language/common, /datum/language/slime)
-	only_speaks_language = /datum/language/slime
+/datum/language_holder/jelly
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/slime = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+							/datum/language/slime = list(LANGUAGE_ATOM))

 /datum/language_holder/lightbringer
-	// TODO change to a lightbringer specific sign language
-	languages = list(/datum/language/slime)
+	understood_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
+	blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
+
+/datum/language_holder/lizard
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/draconic = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+							/datum/language/draconic = list(LANGUAGE_ATOM))
+
+/datum/language_holder/lizard/ash
+	selected_language = /datum/language/draconic
+
+/datum/language_holder/monkey
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/monkey = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/monkey = list(LANGUAGE_ATOM))
+
+/datum/language_holder/mushroom
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/mushroom = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+							/datum/language/mushroom = list(LANGUAGE_ATOM))
+
+/datum/language_holder/slime
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/slime = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
+
+/datum/language_holder/swarmer
+	understood_languages = list(/datum/language/swarmer = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/swarmer = list(LANGUAGE_ATOM))
+	blocked_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
+
+/datum/language_holder/sylvan
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/sylvan = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+							/datum/language/sylvan = list(LANGUAGE_ATOM))
+

 /datum/language_holder/synthetic
-	languages = list(/datum/language/common)
-	shadow_languages = list(/datum/language/common, /datum/language/machine, /datum/language/draconic, /datum/language/slime, /datum/language/dwarf)
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/machine = list(LANGUAGE_ATOM),
+								/datum/language/draconic = list(LANGUAGE_ATOM),
+								/datum/language/slime = list(LANGUAGE_ATOM),
+								/datum/language/dwarf = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+							/datum/language/machine = list(LANGUAGE_ATOM),
+							/datum/language/draconic = list(LANGUAGE_ATOM),
+							/datum/language/slime = list(LANGUAGE_ATOM),
+							/datum/language/dwarf = list(LANGUAGE_ATOM))
+
+/datum/language_holder/venus
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+								/datum/language/sylvan = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/sylvan = list(LANGUAGE_ATOM))

 /datum/language_holder/empty
-	languages = list()
-	shadow_languages = list()
+	understood_languages = list()
+	spoken_languages = list()

 /datum/language_holder/universal/New()
 	..()
-	grant_all_languages(omnitongue=TRUE)
+	grant_all_languages()
--- a/code/modules/language/language_menu.dm
+++ b/code/modules/language/language_menu.dm
@@ -1,8 +1,8 @@
 /datum/language_menu
 	var/datum/language_holder/language_holder

-/datum/language_menu/New(language_holder)
-	src.language_holder = language_holder
+/datum/language_menu/New(_language_holder)
+	language_holder = _language_holder

 /datum/language_menu/Destroy()
 	language_holder = null
@@ -24,21 +24,20 @@
 		data["is_living"] = FALSE

 	data["languages"] = list()
-	for(var/ld in GLOB.all_languages)
-		var/result = language_holder.has_language(ld)
+	for(var/lang in GLOB.all_languages)
+		var/result = language_holder.has_language(lang) || language_holder.has_language(lang, TRUE)
 		if(!result)
 			continue
-		var/shadow = result == LANGUAGE_SHADOWED
-		var/datum/language/LD = ld
+		var/datum/language/language = lang
 		var/list/L = list()

-		L["name"] = initial(LD.name)
-		L["desc"] = initial(LD.desc)
-		L["key"] = initial(LD.key)
-		L["is_default"] = (LD == language_holder.selected_default_language)
-		L["shadow"] = shadow
+		L["name"] = initial(language.name)
+		L["desc"] = initial(language.desc)
+		L["key"] = initial(language.key)
+		L["is_default"] = (language == language_holder.selected_language)
 		if(AM)
-			L["can_speak"] = AM.can_speak_in_language(LD)
+			L["can_speak"] = AM.can_speak_language(language)
+			L["can_understand"] = AM.has_language(language)

 		data["languages"] += list(L)

@@ -47,15 +46,15 @@
 		data["omnitongue"] = language_holder.omnitongue

 		data["unknown_languages"] = list()
-		for(var/ld in GLOB.all_languages)
-			if(language_holder.has_language(ld))
+		for(var/lang in GLOB.all_languages)
+			if(language_holder.has_language(lang) || language_holder.has_language(lang, TRUE))
 				continue
-			var/datum/language/LD = ld
+			var/datum/language/language = lang
 			var/list/L = list()

-			L["name"] = initial(LD.name)
-			L["desc"] = initial(LD.desc)
-			L["key"] = initial(LD.key)
+			L["name"] = initial(language.name)
+			L["desc"] = initial(language.desc)
+			L["key"] = initial(language.key)

 			data["unknown_languages"] += list(L)
 	return data
@@ -68,27 +67,51 @@

 	var/language_name = params["language_name"]
 	var/datum/language/language_datum
-	for(var/ld in GLOB.all_languages)
-		var/datum/language/LD = ld
-		if(language_name == initial(LD.name))
-			language_datum = LD
+	for(var/lang in GLOB.all_languages)
+		var/datum/language/language = lang
+		if(language_name == initial(language.name))
+			language_datum = language
 	var/is_admin = check_rights_for(user.client, R_ADMIN)

 	switch(action)
 		if("select_default")
-			if(language_datum && AM.can_speak_in_language(language_datum))
-				language_holder.selected_default_language = language_datum
+			if(language_datum && AM.can_speak_language(language_datum))
+				language_holder.selected_language = language_datum
 				. = TRUE
 		if("grant_language")
 			if((is_admin || isobserver(AM)) && language_datum)
-				language_holder.grant_language(language_datum)
+				var/list/choices = list("Only Spoken", "Only Understood", "Both")
+				var/choice = input(user,"How do you want to add this language?","[language_datum]",null) as null|anything in choices
+				var/spoken = FALSE
+				var/understood = FALSE
+				switch(choice)
+					if("Only Spoken")
+						spoken = TRUE
+					if("Only Understood")
+						understood = TRUE
+					if("Both")
+						spoken = TRUE
+						understood = TRUE
+				language_holder.grant_language(language_datum, understood, spoken)
 				if(is_admin)
 					message_admins("[key_name_admin(user)] granted the [language_name] language to [key_name_admin(AM)].")
 					log_admin("[key_name(user)] granted the language [language_name] to [key_name(AM)].")
 				. = TRUE
 		if("remove_language")
 			if((is_admin || isobserver(AM)) && language_datum)
-				language_holder.remove_language(language_datum)
+				var/list/choices = list("Only Spoken", "Only Understood", "Both")
+				var/choice = input(user,"Which part do you wish to remove?","[language_datum]",null) as null|anything in choices
+				var/spoken = FALSE
+				var/understood = FALSE
+				switch(choice)
+					if("Only Spoken")
+						spoken = TRUE
+					if("Only Understood")
+						understood = TRUE
+					if("Both")
+						spoken = TRUE
+						understood = TRUE
+				language_holder.remove_language(language_datum, understood, spoken)
 				if(is_admin)
 					message_admins("[key_name_admin(user)] removed the [language_name] language to [key_name_admin(AM)].")
 					log_admin("[key_name(user)] removed the language [language_name] to [key_name(AM)].")
--- a/code/modules/language/sylvan.dm
+++ b/code/modules/language/sylvan.dm
@@ -0,0 +1,18 @@
+// The language of the vinebings. Yes, it's a shameless ripoff of elvish.
+/datum/language/sylvan
+	name = "Sylvan"
+	desc = "A complicated, ancient language spoken by vine like beings."
+	speech_verb = "expresses"
+	ask_verb = "inquires"
+	exclaim_verb = "declares"
+	key = "h"
+	space_chance = 20
+	syllables = list(
+		"fii", "sii", "rii", "rel", "maa", "ala", "san", "tol", "tok", "dia", "eres",
+    	"fal", "tis", "bis", "qel", "aras", "losk", "rasa", "eob", "hil", "tanl", "aere",
+    	"fer", "bal", "pii", "dala", "ban", "foe", "doa", "cii", "uis", "mel", "wex",
+    	"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 = "plant"
+	default_priority = 90