diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm
index add4a8e277..4a1ca3a152 100644
--- a/code/__DEFINES/language.dm
+++ b/code/__DEFINES/language.dm
@@ -24,3 +24,7 @@
 #define LANGUAGE_STONER			"stoner"
 #define LANGUAGE_VASSAL			"vassal"
 #define LANGUAGE_VOICECHANGE	"voicechange"
+
+//SKYRAT LANGUAGES
+#define LANGUAGE_ADDITIONAL		"additional"
+#define LANGUAGE_NINJA			"ninja"
diff --git a/code/controllers/subsystem/language.dm b/code/controllers/subsystem/language.dm
index e80a7096d8..2272c67b19 100644
--- a/code/controllers/subsystem/language.dm
+++ b/code/controllers/subsystem/language.dm
@@ -2,6 +2,7 @@ SUBSYSTEM_DEF(language)
 	name = "Language"
 	init_order = INIT_ORDER_LANGUAGE
 	flags = SS_NO_FIRE
+	var/list/languages_by_name = list() //SKYRAT CHANGE - language bullshit
 
 /datum/controller/subsystem/language/Initialize(timeofday)
 	for(var/L in subtypesof(/datum/language))
@@ -14,5 +15,32 @@ SUBSYSTEM_DEF(language)
 		var/datum/language/instance = new language
 
 		GLOB.language_datum_instances[language] = instance
+		//skyrat change
+		languages_by_name[initial(language.name)] = new language
+		//
 
 	return ..()
+
+//Skyrat change
+/datum/controller/subsystem/language/proc/AssignLanguage(mob/living/user, client/cli)
+	var/list/my_lang = cli.prefs.language
+	if(isnull(my_lang))
+		return
+	for(var/I in GLOB.all_languages)
+		var/datum/language/L = I
+		var/datum/language/cool = new L
+		if(my_lang == cool.name)
+			if(!cool.restricted || (cool.name in cli.prefs.pref_species.languagewhitelist))
+				user.grant_language(cool.type, TRUE, TRUE, LANGUAGE_ADDITIONAL)
+				to_chat(user, "<span class='notice'>You are able to speak in [my_lang]. If you're actually good at it or not, it's up to you.</span>")
+			else
+				for(var/datum/quirk/Q in cli.prefs.all_quirks)
+					if(cool.name in Q.languagewhitelist)
+						user.grant_language(cool, TRUE, TRUE, LANGUAGE_ADDITIONAL)
+						to_chat(user, "<span class='notice'>You are able to speak in [my_lang]. If you're actually good at it or not, it's up to you.</span>")
+						return
+				to_chat(user, "<span class='warning'>Uh oh. [my_lang] is a restricted language, and couldn't be assigned!</span>")
+				to_chat(user, "<span class='warning'>This probably shouldn't be happening. Scream at Bob on #main-dev.</span>")
+		else
+			continue
+//
diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
index 765f0c8382..57fa017461 100755
--- a/code/controllers/subsystem/ticker.dm
+++ b/code/controllers/subsystem/ticker.dm
@@ -396,6 +396,10 @@ SUBSYSTEM_DEF(ticker)
 				SSjob.EquipRank(N, player.mind.assigned_role, 0)
 				if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character))
 					SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE, N)
+				//skyrat change
+				if(ishuman(N.new_character))
+					SSlanguage.AssignLanguage(N.new_character, N.client)
+				//	
 		CHECK_TICK
 	if(captainless)
 		for(var/mob/dead/new_player/N in GLOB.player_list)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 240b275084..8040c6ad17 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -164,6 +164,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		)
 	var/custom_speech_verb = "default" //if your say_mod is to be something other than your races
 	var/custom_tongue = "default" //if your tongue is to be something other than your races
+	var/language = ""
 
 	var/list/custom_names = list()
 	var/preferred_ai_core_display = "Blue"
@@ -337,6 +338,10 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				dat += "<a href ='?_src_=prefs;preference=[custom_name_id];task=input'><b>[namedata["pref_name"]]:</b> [custom_names[custom_name_id]]</a> "
 			dat += "<br><br>"
 
+			//SKYRAT EDIT - additional language
+			dat += "<b>Additional Language</b><br>"
+			dat += "<a href='?_src_=prefs;preference=language;task=menu'>[language ? language : "None"]</a></center><br>"
+			//
 			dat += "<b>Custom job preferences:</b><BR>"
 			dat += "<a href='?_src_=prefs;preference=ai_core_icon;task=input'><b>Preferred AI Core Display:</b> [preferred_ai_core_display]</a><br>"
 			dat += "<a href='?_src_=prefs;preference=sec_dept;task=input'><b>Preferred Security Department:</b> [prefered_security_department]</a><BR></td>"
@@ -1464,6 +1469,48 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		if(SSquirks.quirk_points[q] > 0)
 			.++
 
+//SKYRAT EDIT - extra language
+/datum/preferences/proc/SetLanguage(mob/user)
+	var/list/dat = list()
+	dat += "<center><b>Choose an Additional Language</b></center><br>"
+	dat += "<center>Do note, however, than you can only have one chosen language.</center><br>"
+	dat += "<center>If you want no additional language at all, simply remove the currently chosen language.</center><br>"
+	dat += "<hr>"
+	if(SSlanguage && SSlanguage.languages_by_name.len)
+		for(var/V in SSlanguage.languages_by_name)
+			var/datum/language/L = SSlanguage.languages_by_name[V]
+			if(!L)
+				return
+			var/language_name = initial(L.name)
+			var/restricted = FALSE
+			var/has_language = FALSE
+			if(L.restricted)
+				restricted = TRUE
+			if(language_name == language)
+				has_language = TRUE
+			var/font_color = "#4682B4"
+			var/nullify = ""
+			if(restricted && !(language_name in pref_species.languagewhitelist))
+				var/quirklanguagefound = FALSE
+				for(var/datum/quirk/Q in all_quirks)
+					if(language_name in Q.languagewhitelist)
+						quirklanguagefound = TRUE
+				if(!quirklanguagefound)
+					continue
+			else
+				dat += "<b><font color='[font_color]'>[language_name]:</font></b> [initial(L.desc)]"
+				dat += "<a href='?_src_=prefs;preference=language;task=update;language=[has_language ? nullify : language_name]'>[has_language ? "Remove" : "Choose"]</a><br>"
+	else 
+		dat += "<center><b>The language subsystem hasn't fully loaded yet! Please wait a bit and try again.</b></center><br>"
+	dat += "<hr>"
+	dat += "<center><a href='?_src_=prefs;preference=language;task=close'>Done</a></center>"
+
+	var/datum/browser/popup = new(user, "mob_occupation", "<div align='center'>Language Preference</div>", 900, 600) //no reason not to reuse the occupation window, as it's cleaner that way
+	popup.set_window_options("can_close=0")
+	popup.set_content(dat.Join())
+	popup.open(FALSE)
+//
+
 /datum/preferences/Topic(href, href_list, hsrc)			//yeah, gotta do this I guess..
 	. = ..()
 	if(href_list["close"])
@@ -1557,7 +1604,23 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			else
 				SetQuirks(user)
 		return TRUE
-
+	//SKYRAT CHANGE - only language pref
+	else if(href_list["preference"] == "language")
+		switch(href_list["task"])
+			if("close")
+				user << browse(null, "window=mob_occupation")
+				ShowChoices(user)
+			if("update")
+				var/lang = href_list["language"]
+				if(SSlanguage.languages_by_name[lang] || lang == "")
+					language = lang
+					SetLanguage(user)
+				else
+					SetLanguage(user)
+			else
+				SetLanguage(user)
+		return TRUE
+//
 	switch(href_list["task"])
 		if("random")
 			switch(href_list["preference"])
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index aa1b6f801b..1014b8e909 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -514,6 +514,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	//Quirks
 	S["all_quirks"]			>> all_quirks
+	//SKYRAT ADDITION - additional language
+	S["language"]			>> language
+	//
 
 	//Citadel code
 	S["feature_genitals_use_skintone"]	>> features["genitals_use_skintone"]
@@ -821,6 +824,9 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	//Quirks
 	WRITE_FILE(S["all_quirks"]			, all_quirks)
+	//SKYRAT ADDITION - additional language
+	WRITE_FILE(S["language"]			, language)
+	//
 
 	WRITE_FILE(S["vore_flags"]			, vore_flags)
 	WRITE_FILE(S["vore_taste"]			, vore_taste)
diff --git a/code/modules/language/aphasia.dm b/code/modules/language/aphasia.dm
index 91f14f9111..5ca44cf5b9 100644
--- a/code/modules/language/aphasia.dm
+++ b/code/modules/language/aphasia.dm
@@ -11,3 +11,6 @@
 	space_chance = 20
 	default_priority = 10
 	icon_state = "aphasia"
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
diff --git a/code/modules/language/beachbum.dm b/code/modules/language/beachbum.dm
index 528e9a8da2..51f4689a91 100644
--- a/code/modules/language/beachbum.dm
+++ b/code/modules/language/beachbum.dm
@@ -20,3 +20,6 @@
 					"tail", "trim", "tube", "wobble", "roll", "gnarly", "epic")
 
 	icon_state = "beach"
+	//SKYRAT CHANGE - language restriction
+	restricted = FALSE
+	//
diff --git a/code/modules/language/codespeak.dm b/code/modules/language/codespeak.dm
index 5d658b1fce..d31d82e769 100644
--- a/code/modules/language/codespeak.dm
+++ b/code/modules/language/codespeak.dm
@@ -5,6 +5,9 @@
 	default_priority = 0
 	flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD
 	icon_state = "codespeak"
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
 
 /datum/language/codespeak/scramble(input)
 	var/lookup = check_cache(input)
diff --git a/code/modules/language/common.dm b/code/modules/language/common.dm
index 8d06dd8fa0..4e874d084d 100644
--- a/code/modules/language/common.dm
+++ b/code/modules/language/common.dm
@@ -9,6 +9,9 @@
 	default_priority = 100
 
 	icon_state = "galcom"
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE //i know it's weird, but it's restricted because crewmembers spawn with it by default
+	//
 
 //Syllable Lists
 /*
diff --git a/code/modules/language/draconic.dm b/code/modules/language/draconic.dm
index aaa998c2c0..fe7ed28fc9 100644
--- a/code/modules/language/draconic.dm
+++ b/code/modules/language/draconic.dm
@@ -18,3 +18,6 @@
 	)
 	icon_state = "lizard"
 	default_priority = 90
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
diff --git a/code/modules/language/drone.dm b/code/modules/language/drone.dm
index 390e0027cf..3609cc3fda 100644
--- a/code/modules/language/drone.dm
+++ b/code/modules/language/drone.dm
@@ -14,3 +14,6 @@
 	default_priority = 20
 
 	icon_state = "drone"
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
diff --git a/code/modules/language/dwarven.dm b/code/modules/language/dwarven.dm
index fe2df478f9..ffd22dd3f8 100644
--- a/code/modules/language/dwarven.dm
+++ b/code/modules/language/dwarven.dm
@@ -6,8 +6,11 @@
 	space_chance = 100 // Each 'syllable' is its own word
 	key = "D"
 	flags = TONGUELESS_SPEECH
+	//SKYRAT CHANGE - language restriction
+	restricted = FALSE
+	//
 
 	syllables = list("kulet", "alak", "bidok", "nicol", "anam", "gatal", "mabdug", "zustash", "sedil", "ustos", "emr", "izeg", "beming", "gost", "ntak", "tosid", "feb", "berim", "ibruk", "ermis", "thoth", "thatthil", "gistang", "libash", "lakish", "asdos", "roder", "nel", "biban", "ugog", "ish", "robek", "olmul", "nokzam", "emuth", "fer", "uvel", "dolush", "ag^k", "ucat", "ng rak", "enir", "ugath", "lisig", "etg", "erong", "osed", "lanlar", "udir", "tarmid", "s krith", "nural", "bugsud", "okag", "nazush", "nashon", "ftrid", "en''r", "dstik", "kogan", "ingish", "dudgoth", "stalk*b", "themor", "murak", "altth", "osod", "thcekut", "cog", "selsten", "egdoth", "othsin", "idek", "st", "suthmam", "im", "okab", "onlnl", "gasol", "tegir", "nam...sh", "noval", "shalig", "shin", "lek", ",,kim", "kfkdal", "stum,,m", "alud", "olom", "%lot", "rozsed", "thos", "okon", "n<ng", "ostar", "rorul", "kovath", "tblel", "stal", "girtol", "kit<g", "lokast", "reked", "comnith", "sidos", "setnek", "ethbesh", "nug", "mokez", "c''s", "idos", "ogcek", "utheg", "tilgil", "ebsas", "lurak", "tobul", "ilush", "d%nush", "rimtar", "kun", ",s", "kiror", "nicat", "onshen", "r%rith", "mafol", "sid", "ntdn", "tilat", "cetat", "egot", "dib", "oril", "bukog", "atot", "imik", "sudir", "odshith", "rag", "dodck", "sinsot", "es", "dostob", "gast", ",lmeth", "romlam", "av,d", "dartl", "fn", "oddom", "z,gel", "og", "shatag", "om", "gis%k", "balad", "nekik", "dakas", "dolek", "sog", "rafar", "laltur", "cekeng", "dan", "ozsit", "dunan", "uling", "dcebesh", "berath", "zangin", "shadkik", "innok", "vukcas", "metul", "than", "gesul", "ustir", "torish", "memrut", "usal", "''m", "angrir", "cagith", "momuz", "zas", "deshlir", "astesh", "''fid", "mothram", "rit", "nolthag", "matul", "irtir", "unul", "urist", "umom", "d%m", "lodel", "kodor", "alod", "n''kor", "asen", "rtsh", "ursas", "vakun", "thol", "kizbiz", "uthg£r", "''nor", "gar", "terstum", "zagith", "noshtath", "ub", "k", "amur", "minran", "idar", "rodnul", "nuggad", "okbod", "tun", "mtmgoz", "fak", "ogon", "r%mrit", "stidest", "zag", "kosak", "sub", "shegum", "addor", "talin", "zin", "tmmeb", "sakub", "tig", "edir", "tath", "vesh", "etest", "atir", "lors<th", "rir", "em", "deb", "shuthraz", "Sshgor", "rkal", "ac''b", "okir", "arngish", "zilir", "im", "<ssun", "ilus", "gedor", "ramtak", "sombith", "ker", "lcenem", "umid", "seth", "sogdol", "shis", "er", "odroz", "urem", "nist", "cdad", "lithrush", "zotir", "zikel", "zikfth", "stagshil", "at''l", "ck", "ziril", "uthar", "tatlosh", "ngitkar", "dur", "keshan", "ned", "eststek", "ar", "%tul", "ltluth", "totmon", "bem", "fenglel", "gigin", "atham", "amug", "cabnul", "nog", "fotthor", "nltang", "dumed", "geshud", "inglaz", ",zneth", "tiklom", "<sir", "eshim", "lumash", "gishdist", "thcedas", "enog", "dozeb", "muz", "fst", "dushig", "bakat", "shistat", "goral", "kSbmak", "inod", "zisur", "list", "olon", "%rtong", "ngotol", "kolad", "egen", "r£bal", "gintar", "figul", "fikod", "bebmal", "bavast", "kttdir", ",thes", "igest", "reg", "ubur", "belbez", "n*m", "bunsoth", "limul", "kurig", "ugzol", "erib", "cegam", "mas", "zugob", "mashus", "isin", "mond-l", "siz", "sar...m", "dal", "omer", "sumun", "gommuk", "usith", "nerrid", "z god", "mithmis", "enol", "munSst", "bol", "-z", "btl", "sitheb", "duthnur", "ilbtd", "rurast", "suton", "nuglush", "ulthush", "razes", "bist''k", "Szum", "nil", "nil", "otad", "oddet", "thetdel", "golud", "-d", "kadol", "lur", "dumur", "akn-n", "otel", "ser", "zanor", "ur", "bokbon", "Sfim", "shash", "zon", "obur", "banik", "seb<r", "lirlez", "erlin", "inen", "tmft", "goster", "kunon", "tarag", "kiron", "lilum", "oggez", "bom", "stet r", "sikel", "unnos", "kisul", "ikus", "sheget", "famthut", "rorung", "idor", "enur", "kur", "fok sh", "vostaz", "ushil", "gumr", "ular", "enen", "goshcest", "fzkob", "meb", "likot", "st%tnin", "zarut", "nelzur", "datan", "tabmik", "rinal", "ebgok", "soshosh", "bukshon", "stcegil", "lumen", "maton", "abol", "cim", "egath", "imketh", "ilned", "zuden", "emtan", "ed%m", "noscem", "vag£sh", "alis", "etar", "inshot", "zasit", "arzes", ",bor", "oth", "vakist", "ner", "bul", "nddor", "onam", "ulol", "toral", "omoth", "erar", "govos", "orab", "dalkam", "subol", "gomath", "cerol", "mingkil", "detthost", "rerik", "lolor", "os", "istam", "giken", "od", "mengmad", "fmid", "bungek", "zedot", "thak", "tetcth", "romek", "utir", "<lul", "uleng", "sosmil", "aval", "lush*b", "asin", "vunom", "vurtib", "gukil", "dimol", "lelgas", "nethg''n", "itur", "avan", "mingus", "aroth", "udos", "imust", "sh...mman", "rinmol", "muzish", "k''n", "stul", "thash", "kenis", "fathkal", "inob", "igril", "an", "unob", "nalthish", "ost%sh", "kel", "eddaz", "ekur", "arfl", "shar", "rimuk", "ottan", "shagul", "*nul", "egeth", "s''d", "dusak", "ovus", "gom*k", "stesok", "vanktb", "<lon", "od^s", "alen", "bobrur", "stoling", "dum", "zagstok", "ol", "gatis", "udler", "adesh", "usfn", "kavud", "kirun", "shasad", "shoveth", "lathon", "um", "thubil", "egom", "ugith", "ngutug", "kez", "l,rim", "ik-l", "semtom", "kib", "rotik", "ir", "stos^th", "kezol", "anan", "disuth", "rcethol", "tezul", "irol", "otam", "rod<m", "nunok", "umel", "ishlum", "kin", "mebzuth", "usib", "nar", "migrur", "egar", "dakon", "lod", "nir", "an''n", "muved", "am", "vab''k", " g", "ritas", "udril", "shigcs", "d thnes", "fgez", "m''rul", "zulash", "logem", "abal", "kulin", "lerom", "gatin", "ul", "monom", "biscl", "ginok", "rumred", "ugeth", "thuveg", "gor", "damol", "elcur", "erok", "tok", "cem", "rSt", "shoner", "inrus", "mist^m", "midor", "nilgin", "merir", "nikuz", "kamuk", "enal", "zSler", "stibbom", "vildang", "arkoth", "lash%d", "kasith", "ngathsesh", "tashem", "besmar", "furgig", "n''nub", "rushrul", "megob", "uvir", "shrir", "esrel", "bukSt", "nimak", "lestus", "fullut", "arkim", "imsal", "led", "unib", "ron", "udar", "borush", "detes", "umoz", "serkib", "vudthar", "razot", "atem", "ezuk", "vozbel", "toltot", "n,r", "stukos", "ang", "nuden", "ikud", "memad", "eshik", "emgash", "tirist", "athel", "seng", "osdin", "ethram", "kamut", "locun", "selor", "ig%r", "id", "astts", "fbir", "mosus", "omthel", "odur", "istbar", "zodost", "dumat", "relon", "notlith", "suthtn", "ilid", "tithleth", "kezar", "ast", "fath", "t''l£n", "nabid", "sibrek", "thining", "gasns", "noglesh", "aroz", "tfmol", "nanul", "urr<th", "kik%s", "askak", "kes", "abshoth", "ubas", "angish", "allas", "gembish", "urvad", "fel", "ingul", "nekut", "genlath", "shulmik", "lenod", "abras", "asol", "shethel", "urn-t", "zursul", "othsal", "shedim", "arak", "tiz''t", "taran", "bithit", "otik", "kerlceg", "l^ned", "sodel", "''nam", "zuglar", "keskal", "ntst", "uvcth", "mcevid", ",th", "kaffsh", "ngumrash", "zokun", "eshom", "nesteth", "thebil", "ammesh", "ral", "reksas", "gesis", "osal", "anir", "nabreth", "dak,l", "rungak", "nekol", "anriz", "kosh", "noth", "tharnas", "gansit", "b...goz", "bim", "themthir", "sakil", "tekmok", "rasuk", "g,zot", "toz''r", "tob", "kal", "eshtfn", "mezum", "umar", "zeber", "geles", "therleth", "tinan", "zekrim", "magel", "adur", "ezar", "bonun", "b-nem", "egur", "unol", "vod", "lal", "debish", "bushos", "lokum", "thortith", "omft", "sethal", "soshor", "thocit", "esesh", "l-rit", "ubal", "*stob", "lashid", "usur", "kob", "kigok", "bekom", "magak", "v%s", "estrith", "gongith", "dugud", "zat", "nomal", "oltud", "savot", "vcer", "dustcek", "shnstsak", "risid", "deler", "aztong", "g<non", "sholil", "ecut", "m%tin", "lam", "togal", "mot", "nceles", "nefast", "atith", "r^g", "emen", ",kig", "abod", "sat", "timad", "ibas", "othob", "f-beg", "tunur", "idgag", "eb", "omshit", "ibes", "oceg", "akuth", "isram", "ad", "imgoz", "nis", "stot", "''gred", "sined", "tec...k", "subet", "urmim", "obash", "dastot", "udib", "enkos", "kesh", "kidet", "ob", "thils,g", "asteb", "akmesh", "vim", "angzak", "gakit", "r%cus", "kurik", "unkil", "mez", "erith", "kalur", "arros", "amud", "nobgost", "tan", "l<d", "ashok", "nod", "nin", "rakust", "melbil", "nol", "raz", "dostust", "tat", "st<vut", "sigun", "urdim", "k,l n", "shelret", "<ggal", "r%dreg", "idr,th", "datlad", "ilral", "borik", "meden", "vafig", "tizen", "dizesh", "kobem", "cavor", "shilr...r", "segun", "messog", "bukith", "bufut", "nilim", "ingtak", "damor", "gim", "nob", "eknar", "mengib", "isrir", "ish%m", "ticek", "mer", "othfsh", "k''kdath", "distat", "nirur", "kiret", "thisrid", "vucar", "kizab", "tudrug", "s^gam", "amluth", "nozush", "mirstal", "zamoth", "bomik", "munsog", "razmer", "liruk", "geget", "zenon", "okol", "torir", "stodir", "''ggon", "tikis", "unos", "legon", "alnis", "<kor", "tathtak", "lidod", "azin", "isden", "uker", "kussad", "nilun", "bamg-s", "adril", "koshmot", "fl", "umgush", "senel", "sital", "kil", "kol", "bomrek", "boket", "atil", "iklist", "volal", "lish", "omrist", "ud", "fesh", "akath", "lim", "damced", "anur", "kulal", "lolum", "ducim", "vesrul", "urosh", "akith", "l^rush", "ethir", "ced", "budam", "inol", "okang", "ging", "rilem", "kizest", "keb''sh", "shesam", "ber", "zan", "zust", "enshal", "nastid", "ultSr", "ag", "zareth", "tislam", "doren", "rcth", "ntzom", "akrul", "gusil", "kilrud", "lolok", "lemlor", "ivom", "fikuk", "gulgun", "kast", "usir", "sodzul", "st*k<d", "etas", "otil", "sosad", "n<r", "anban", "dithbish", "ekir", "onol", "godum", "lcelar", "ib", "etur", "rithul", "cboth", "al", "zimkel", "bimmon", ",kil", "tezad", "lfven", "sashas", "sezuk", "saneb", "kik", "dasnast", "it^g", "okil", "esis", "buris", "ecem", "kekath", "nas", "nursher", "limfr", "sostet", "ken", "estil", "oram", "galthor", "nefek", "gabet", "idok", "tetthush", "ukath", "igang", "ushul", "sil", "kar", "thur", "nitom", "azzin", "selen", "gadan", "osor", "thalal", "onesh", "guz", "^sik", "thestar", "astis", "''tthat", "lisid", "nalish", "ozor", "ceshfot", "dok", "edos", "anzish", "l-k", "semor", "multsh", "fm", "kutam", "eges", "fimshel", "egul", "tesum", "cubor", "enseb", "idith", "edim", "vetek", "g,rig", "lecad", "sterus", "umtm", "anil", "nobang", "at^sh", "umril", "milol", "rig*th", "Srith", "thazor", "gashcoz", "bor", "f''ker", "megid", "elik", "tekkud", "olin", "nrlom", "stemel", "inem", "lulfr", "zolak", "g,rem", "gidur", "aban", "neb<n", "zasgim", "thclthod", "iden", "''ssek", "amkol", "l''bor", "shrrat", "k^dnath", "titthal", "stistr,s", "tetist", "riras", "t''ras", "gekur", "gudos", "durad", "z^vut", "adil", "ngesg,s", "stettad", "shos^l", "udil", "litast", "arel", "otin", "vel", "avuz", "rithlut", "tomus", "dugan", "kalal", "shoshin", "eser", "cebmat", "kebul", "asiz", "alm''sh", "rur", "rutod", "vumom", "orrun", "taron", "s rek", "ugosh", "esmul", "kisat", "il", "rinul", "mukar", "amkin", "mosos", "rith", "t*m", "bugud", "otung", "zoz", "umshad", "das%l", "lames", "lavath", "ozur", "zotthol", "nan", "rorash", "nguteg", "''sust", "um,m", "instol", "kesting", "ebbus", "bobet", "ong", "zokgen", "r,duk", "zunek", "kezat", "kad,n", "sar", "^lbem", "ertal", "rfmol", "girust", "nabas", "lozlok", "ongos", "shusug", "tongus", "tustzal", "kgneb", "gamil", "gingim", "arin", "gov-l", "vetor", "sharsid", "nakis", "lanir", "ikl", "nakbab", "nimem", "numol", "urol", "atul", "deg", "onul", ",gash", "bogsosh", "ushang", "emal", "ethzuth", "gathil", "kebon", "sutung", "nizdast", "mimkot", "vir", "tumam", "osstam", "kulsim", "gemis", "^r", "fenok", "igrish", "urus", "rodem", "zengod", "ister", "luskal", "knrar", "ilas", "an-z", "angen", "desis", "damSl", "assog", "usen", "babin", "tustem", "debben", "kabat", "ftast", "ebal", "lanzil", "belar", "solam", "cr", "nucam", "letom", "mengthul", "th^mnol", "lin*n", "vuthil", "rerscer", "oltar", "domas", "asmel", "nish", "mamot", "nakuth", "udist", "ost", "shadust", "morus", "akrel", "kith", "bomel", "orngim", "ngubmul", "mat", "nulom", "ustan", "buzat", "thob", "tilesh", "gecast", "aran", "st%lmith", "dolil", "amem", "kasben", "fashuk", "-bom", "mostod", "mangr*d", "keng", "odkish", "roduk", "eggut", "bumal", "kurel", "kithnn", "nurom", "shomad", "doshet", "ltl", "lun", "kugik", "tulon", "zoden", "nang^s", "rifot", "kastar", "zefon", "kovest", "madush", "ttrem", "shSrel", "goden", "birut", "shorast", "meng", "olthez", "litez", "miz^s", "nonshut", "ltrul", "tusung", "ullung", "minbaz", "zethruk", "k-buk", "kivish", "rithog", "rabed", "rusest", "omtug", "stektob", "zimun", "num", "oslan", "mis", "salul", "langgud", "mugshith", "l*r", "mishthem", "sibnir", "zansong", "or", "est", "thistus", "bot", "aned", "absam", "vuzded", "emet", "luzat", "duthal", "cugshil", "shasar", "emdush", "shungmag", "zar", "luror", "manthul", "sholkik", "sankest", "othud", "ngithol", "udesh", "afen", "dast", "nothis", "cem,z", "sosh", "zalud", "geth", "udiz", "nitig", "ziksis", "midrim", "urthaz", "vuknud", "s<sal", "thum", "ar''sh", "guthstak", "as%n", "neshast", "tenshed", "catten", "l^gan", "...lil", "nukad", "rakas", "bibar", "nitem", "vanel", "som", "gutid", "ros", "sestan", "ganad", "ardes", "tobot", "niral", "zavaz", "tellist", "umgan", "kesham", "azmol", "thokdeg", "dolok", "detgash", "zocuk", "gulnas", "arek", "rath", "ngot-n", "zocol", "evost", "lotol", "farash", "ruken", "enas", "isul", "miroth", "mor", ",srath", "shed", "tabar", "lush-t", "tm", "sut", "saruth", ",rged", "aral", "solon", "zulban", "stan<r", "lorbam", "stkzul", "kat", "teskom", "r,m", "koshosh", "moldath", "-losh", "k£d", "masos", "fastam", "isan", "betan", "thibam", "elol", "uvar", "rul", "zaled", "esar", "k...s", "znzcun", "vathem", "m<shak", "dubmen", "akam", "osram", "kuthd^ng", "assar", "shizek", "mingtuth", "rafum", "omet", "merseth", "cs", "itnet", "g<sstir", "dalem", "<dath", "gemsit", "ashzos", "enten", "nomes", "birir", "kukon", "fgoth", " gesh", "dalzat", "tad", "m%list", "ison", "rokel", "arceth", "rimad", "shigin", "kastol", "ruzos", "sharul", "omt,l", "eren", "sobnr", "noram", "dSg", "neth", "okin", "maskir", "dugal", "shagog", "shazak", "tin''th", "thir", "necak", "ital", "nulral", "nnal", "gomcm", "vumshar", "borlon", "ngobol", "gireth", "okun", "rovol", "thulom", "kanzud", "l*rtm", "rosat", "ottem", "duthtish", "thestkig", "thabost", "v£sh", "cugg n", "obok", "muthir", "rovod", "uzar", "kor", "amas", "ashm''n", "bisek", "zaneg", "gcsmer", "zimesh", "bothon", "losis", "ildom", "azuz", "golast", "edn...d", "evon", "arom", "ninur", "conngim", "fongbez", "arrug", "av-sh", "rimis", "thokit", "agseth", "sharast", "bardum", "givel", "tm", "nikot", "arist", "sheced", "stin", "zoluth", "mestthos", "ineth", "amost", "oklit", "deduk", "m-thkat", "kosoth", "cegbit", "oshgft", "tazuk", "imbit", "b%r-l", "sarvesh", "zuntcer", "sazir", "ekast", "desgir", "stfkud", "gonggash", "uzol", "moshn£n", "urir", "geshak", "lektad", "akir", "zalns", "teshkad", "kudust", "sastres", "becor", "nob''t", "tokthat", "gishgil", "lfndar", "karas", "etom", "thomal", "emad", "tangath", "ezost", "vath", "zakgol", "stibmer", "mnshos", "teling", "lased", "rintor", "cestlig", "tcerdug", "bab", "stingbol", "gethust", "maram", "nid*st", "bashnom", "ekzong", "thusest", "bocash", "dedros", "akur", "cecum", "etvuth", "t''mud", "datur", "tishis", "lir", "dard", "nugreth", "zim", "avum", "ishash", "tel", "ilrom", "unfl", "cilob", "<ngiz", "dakost", "kobel", "sheshek", "tolis", "gothum", "adek", "ibel", "lesast", ",tol", "adas", "custith", "minkot", "ceton", "sholSb", "deg%l", "uvash", "kumil", "fidgam", "lar", "stinth,d", "kemsor", "onrel", "sefol", "edzul", "nisgak", "dotir", "k...lreth", "alek", "resil", "umstiz", "k^shshak", "sirab", "shaketh", "tatek", "isos", "occeg", "atzul", "sebs£r", "odom", "arust", "g''tom", "sulus", "lensham", "geb", "ozon", "ngegdol", "storlut", "bekar", "gan", "zamnuth", "edt-l", "nol^th", "thabum", "astod", "ruth''sh", "lisat", "zagug", "gudas", "sesh", "osh,b", "olil", "ustuth", "tholtig", "medtob", "asob", "gtk<z", "shem", "nadak", "nirmek", "imush", "kogsak", "<teb", "dceshmab", "atces", "t''sed", "kikrost", "ngal k", "takth", "nunr", "vukrig", "rerras", "ar''l", "sosas", "r-l", "tholest", "tishak", "tharith", "vutram", "shotom", "<lun", "rfluk", "vosut", "s-bil", "ifin", "okosh", "zafal", "rulush", "gikut", "rem", "thikthog", "idash", "tathtat", "mesir", "lir,r", "celkeb", "adag", "isak", "kekim", "bfsen", "koman", "imesh", "shetb^th", "ultb", "dogik", "rodim", "kathil", "''ndin", "mekur", "enoz", "satneng", "rotig", "sof-sh", "asrer", "ozleb", "etath", "rumad", "es,st", "suvas", "bal", "oshot", "stelid", "med", "inir", "scebosh", "lunrud", "olum", "shuk", "''ler", "stizash", "gusgash", "<tsas", "edan", "ked", "ungSg", "merrang", "gudid", "kashez", "amal", "athncer", "shithath", "istik", "akmam", "timn,r", "elis", "kan", "lelum", "othil", "oth''s", "nentuk", "dural", "salir", "kulbet", "fazis", "thik,n", "-lmush", "mishar", "tastrod", "tod''r", "ostath", "thasdoth", "belal", "ston", "ribar", "tunom", "kudar", "g,bar", "nothok", "libad", "gemur", "elbel", "ennol", "amnek", "soloz", "mus''d", "samam", "ethad", "eshon", "etcm", "Srnam", "kethil", "enam", "inush", "atol", "''sir", "vathez", "fur...t", "kegeth", "cud<st", "laz", "kttfk", "thedak", "lumnum", "''sed", "orshar", "thad", "shan", "ellest", "odg£b", "inash", "steg%th", "zithis", "lerteth", "stistmig", "luslem", "sherik", "zukthist", "artob", "n%las", "zes", "n^cik", "-thir", "othlest", "ibesh", "fash", "anist", "*rdir", "rab", "orshet", "uzlir", "ginet", "eral", "ilash", "etn...r", "tom^m", "ins,l", "riril", "thimshur", "nokgol", "m''zir", "igath", "gasir", "bubnus", "<thod", "uthmik", "uben", "adbok", "ronush", "rikkir", "thiz", "lak...l", "r''ber", "egast", "akgos", "zatam", "sholid", "akest", "thun", "gidthur", "immast", "sanreb", "m<kstal", "vudnis", "estun", "ozkak", "tkum", "kacoth", "etost", "arban", "kurol", "agsal", "rethal", "oshur", "vathsith", "biths^st", "kezkig", "kir", "shadmal", " dol", "ablish", "shislug", "zutshosh", "ogtum", "bat''k", "izkil", "ireg", "ushlub", "deleth", "thetust", "stigaz", "ethab", "em,th", "konad", "shukar", "idrom", "gubel", "egeb", "astel", "boshut", "uzan", "ranzar", "rcesen", "nakas", "gatiz", "erush", "shameb", "ushesh", "katthir", "ikthag", "rnthar", "sizir", "tost", "al-th", "ator", "kad''l", "istrath", "shos", "ulzest", "kastaz", "kod", "etes", "nosing", "merig", "fushur", "avog", "oth''r", "midil", "fevil", "itt s", "bakust", "b%mbul", "duz", "zeg", "edcl", "kifed", "thet", "ostuk", "endok", "ushat", "ukosh", "lebes", "lim£r", "cd", "desor", "amith", "ilir", "ishol", "otsus", "mogshum", "ishen", "kiddir", "meban", "g£r", "rodum", "monang", "thosbut", "at^k", "edod", "astan", "tangak", "sacat", "d''bar", "komut", "dimshas", "olnen", "tathur", "evud", "oshosh", "orstist", "kab", "talul", "sokan", "nanir", "irid", "t''gum", "asd-g", "mes", "nasod", "lemis", "stukcn", "nanoth", "kokeb", "cruk", "zursl", "mozib", "gorroth", "egsttk", "as...s", "zalstom", "ikal", "esdor", "rilbet", "dezrem", "sebshos", "neb,l", "gethor", "ralfth", "baros", "iseth", "cen,th", "leshal", "san d", "rithzfm", "kordam", "roldeth", "ugut", "arbost", "sedish", "tadar", "azoth", "osresh", "eddud", "artum", "dallith", "siknug", "vashzud", "ngilok", "ilon", "nlud", "gemesh", "rashgur", "mothdast", "d k", "thukkan", "alron", "ung*b", "£tost", "bel", "sanus", "kith,l", "theb", "konos", "neb", "itred", "ecosh", "cegol", "luthoz", "thastith", "remang", "athser", "ngusham", "gingik", "rangab", "kontuth", "letmos", "mishim", "losush", "othbem", "b^ngeng", "lasgan", "utal", "sedur", "engig", "sunggor", "thistun", "k''shdes", "ngefel", "umer", "uleb", "n shas", "r''mab", "sezom", "shashdon", "m%bnith", "k n", "gitnuk", "daros", "nokim", "mostib", "thethrus", "kagmel", "bidnoz", "elbost", "oten", "ushdish", "kitung", "nubam", "onget", "d%ngstam", "nimar", "gelut", "nis-n", "tarem", "nam", "kozoth", "tokmek", "ed", "et", "thunen", "shokmug", "vutok", "zanos", "torad", "berdan", "nal", "mosol", "othduk", "kinem", "zatthud", "nabtr", "rirn''l", "lised", "danman", "nirk£n", "mubun")
 
 	default_priority = 90
-	icon_state = "dwarf"
\ No newline at end of file
+	icon_state = "dwarf"
diff --git a/code/modules/language/language.dm b/code/modules/language/language.dm
index 536bf06e8d..11b4c8574d 100644
--- a/code/modules/language/language.dm
+++ b/code/modules/language/language.dm
@@ -25,6 +25,9 @@
 	// if you are seeing someone speak popcorn language, then something is wrong.
 	var/icon = 'icons/misc/language.dmi'
 	var/icon_state = "popcorn"
+	//SKYRAT CHANGE - is this language available on the character setup? Set to true if not.
+	var/restricted = TRUE
+	//
 
 /datum/language/proc/display_icon(atom/movable/hearer)
 	var/understands = hearer.has_language(src.type)
diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm
index 6e3d27f2b8..de00c0042f 100644
--- a/code/modules/language/language_holder.dm
+++ b/code/modules/language/language_holder.dm
@@ -253,16 +253,16 @@ Key procs
 	blocked_languages = null
 
 /datum/language_holder/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))
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
+							//	/datum/language/dwarf = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
+							// /datum/language/dwarf = list(LANGUAGE_ATOM))
 
 /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))
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
+							//	/datum/language/slime = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
+							// /datum/language/slime = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
 
 /datum/language_holder/lightbringer
 	understood_languages = list(/datum/language/slime = list(LANGUAGE_ATOM))
@@ -270,13 +270,17 @@ Key procs
 	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))
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
+							//	/datum/language/draconic = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
+						//	/datum/language/draconic = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
 
 /datum/language_holder/lizard/ash
 	selected_language = /datum/language/draconic
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM), //SKYRAT EDIT - additional languages
+								/datum/language/draconic = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
+							/datum/language/draconic = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
 
 /datum/language_holder/monkey
 	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
@@ -284,10 +288,10 @@ Key procs
 	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))
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
+							//	/datum/language/mushroom = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
+						//	/datum/language/mushroom = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
 
 /datum/language_holder/slime
 	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
@@ -300,21 +304,26 @@ Key procs
 	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))
+	understood_languages = list(/datum/language/common = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
+							//	/datum/language/sylvan = list(LANGUAGE_ATOM))
+	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM))
+						//	/datum/language/sylvan = list(LANGUAGE_ATOM)) //SKYRAT EDIT - additional languages
 
 
 /datum/language_holder/synthetic
-	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))
+	understood_languages = list(// SKYRAT EDIT - additional languages
+								/datum/language/sandcode/solcommon = list(LANGUAGE_ATOM),
+								/datum/language/sandcode/technorussian = list(LANGUAGE_ATOM),
+								/datum/language/sandcode/neokanji = list(LANGUAGE_ATOM),
+								/datum/language/sandcode/dunmeri = list(LANGUAGE_ATOM))
 	spoken_languages = list(/datum/language/common = list(LANGUAGE_ATOM),
 							/datum/language/machine = list(LANGUAGE_ATOM),
 							/datum/language/draconic = list(LANGUAGE_ATOM),
+							// SKYRAT EDIT - additional languages
+							/datum/language/sandcode/solcommon = list(LANGUAGE_ATOM),
+							/datum/language/sandcode/technorussian = list(LANGUAGE_ATOM),
+							/datum/language/sandcode/neokanji = list(LANGUAGE_ATOM),
+							/datum/language/sandcode/dunmeri = list(LANGUAGE_ATOM),
 							/datum/language/slime = list(LANGUAGE_ATOM),
 							/datum/language/dwarf = list(LANGUAGE_ATOM))
 
diff --git a/code/modules/language/machine.dm b/code/modules/language/machine.dm
index b7ef701e30..b4bfcf0923 100644
--- a/code/modules/language/machine.dm
+++ b/code/modules/language/machine.dm
@@ -10,7 +10,10 @@
 	syllables = list("beep","beep","beep","beep","beep","boop","boop","boop","bop","bop","dee","dee","doo","doo","hiss","hss","buzz","buzz","bzz","ksssh","keey","wurr","wahh","tzzz")
 	space_chance = 10
 	default_priority = 90
-
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
+	
 	icon_state = "eal"
 
 /datum/language/machine/get_random_name()
diff --git a/code/modules/language/monkey.dm b/code/modules/language/monkey.dm
index 53e598b02b..789576b242 100644
--- a/code/modules/language/monkey.dm
+++ b/code/modules/language/monkey.dm
@@ -10,3 +10,6 @@
 	default_priority = 80
 
 	icon_state = "animal"
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
diff --git a/code/modules/language/mushroom.dm b/code/modules/language/mushroom.dm
index b896d11449..f101d3fce9 100644
--- a/code/modules/language/mushroom.dm
+++ b/code/modules/language/mushroom.dm
@@ -9,3 +9,6 @@
 	sentence_chance = 0
 	default_priority = 80
 	syllables = list("poof", "pff", "pFfF", "piff", "puff", "pooof", "pfffff", "piffpiff", "puffpuff", "poofpoof", "pifpafpofpuf")
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
diff --git a/code/modules/language/narsian.dm b/code/modules/language/narsian.dm
index 42d0a06531..9ab727833e 100644
--- a/code/modules/language/narsian.dm
+++ b/code/modules/language/narsian.dm
@@ -27,7 +27,10 @@
 	) //the base syllables, which include a few rare ones that won't appear in the mixed syllables
 	icon_state = "narsie"
 	default_priority = 10
-
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
+	
 /datum/language/narsie/New()
 	for(var/syllable in base_syllables) //we only do this once, since there's only ever a single one of each language datum.
 		for(var/target_syllable in base_syllables)
diff --git a/code/modules/language/ratvarian.dm b/code/modules/language/ratvarian.dm
index b924d2fc79..86d150891a 100644
--- a/code/modules/language/ratvarian.dm
+++ b/code/modules/language/ratvarian.dm
@@ -9,11 +9,14 @@
 	default_priority = 10
 	spans = list(SPAN_ROBOT)
 	icon_state = "ratvar"
-
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
+	
 /datum/language/ratvar/scramble(var/input)
 	. = text2ratvar(input)
 
 /datum/language/ratvar/get_spoken_verb(msg_end)
 	if(!msg_end)
 		return pick(random_speech_verbs)
-	return ..()
\ No newline at end of file
+	return ..()
diff --git a/code/modules/language/slime.dm b/code/modules/language/slime.dm
index cca56ca933..02af2696ba 100644
--- a/code/modules/language/slime.dm
+++ b/code/modules/language/slime.dm
@@ -8,5 +8,8 @@
 	flags = TONGUELESS_SPEECH
 	syllables = list("qr","qrr","xuq","qil","quum","xuqm","vol","xrim","zaoo","qu-uu","qix","qoo","zix","*","!")
 	default_priority = 70
-
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
+	
 	icon_state = "slime"
diff --git a/code/modules/language/swarmer.dm b/code/modules/language/swarmer.dm
index e3b7826706..98dfbab8dc 100644
--- a/code/modules/language/swarmer.dm
+++ b/code/modules/language/swarmer.dm
@@ -12,7 +12,10 @@
 	default_priority = 60
 
 	icon_state = "swarmer"
-
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
+	
 	// since various flats and sharps are the same,
 	// all non-accidental notes are doubled in the list
 	/* The list with unicode symbols for the accents.
diff --git a/code/modules/language/vampiric.dm b/code/modules/language/vampiric.dm
index ab48a17d2f..3b8707c451 100644
--- a/code/modules/language/vampiric.dm
+++ b/code/modules/language/vampiric.dm
@@ -11,6 +11,9 @@
 	space_chance = 40
 	default_priority = 90
 	icon_state = "bloodsucker"
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE
+	//
 
 	flags = TONGUELESS_SPEECH | LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD // Hide the icon next to your text if someone doesn't know this language.
 	syllables = list(
diff --git a/code/modules/language/xenocommon.dm b/code/modules/language/xenocommon.dm
index f046ecd34a..6d2c5e1dfb 100644
--- a/code/modules/language/xenocommon.dm
+++ b/code/modules/language/xenocommon.dm
@@ -9,3 +9,6 @@
 	default_priority = 50
 
 	icon_state = "xeno"
+	//SKYRAT CHANGE - language restriction
+	restricted = TRUE //I think humanoid xenos should have a separate language...
+	//
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 6888a6590f..b21de717cb 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -429,6 +429,9 @@
 
 	if(humanc && CONFIG_GET(flag/roundstart_traits))
 		SSquirks.AssignQuirks(humanc, humanc.client, TRUE, FALSE, job, FALSE)
+	//skyrat change
+	if(humanc)
+		SSlanguage.AssignLanguage(humanc, humanc.client, TRUE, FALSE, job, FALSE)
 
 	log_manifest(character.mind.key,character.mind,character,latejoin = TRUE)
 
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 65313dbc37..cd07120cce 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -108,6 +108,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 
 	/// Our default override for typing indicator state
 	var/typing_indicator_state
+	//SKYRAT SNOWFLAKE
+	var/list/languagewhitelist = list()
 
 ///////////
 // PROCS //
diff --git a/code/modules/mob/living/carbon/human/species_types/bugmen.dm b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
index a79f9e2392..2c219d4f3f 100644
--- a/code/modules/mob/living/carbon/human/species_types/bugmen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/bugmen.dm
@@ -16,6 +16,7 @@
 	icon_limbs = DEFAULT_BODYPART_ICON_CITADEL
 	exotic_bloodtype = "BUG"
 	exotic_blood_color = BLOOD_COLOR_BUG
+	languagewhitelist = list("Moffic", "Buggy") //Skyrat change - species language whitelist
 
 /datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H)
 	if(H)
diff --git a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
index b6d56b8e5d..672ca9db13 100644
--- a/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/furrypeople.dm
@@ -66,6 +66,7 @@
 	exotic_bloodtype = "X*"
 	damage_overlay_type = "xeno"
 	liked_food = MEAT
+	languagewhitelist = list("Xenomorph")
 
 //Praise the Omnissiah, A challange worthy of my skills - HS
 
diff --git a/code/modules/mob/living/carbon/human/species_types/ipc.dm b/code/modules/mob/living/carbon/human/species_types/ipc.dm
index 96efaebd74..09a4322fde 100644
--- a/code/modules/mob/living/carbon/human/species_types/ipc.dm
+++ b/code/modules/mob/living/carbon/human/species_types/ipc.dm
@@ -23,6 +23,7 @@
 	exotic_blood_color = BLOOD_COLOR_OIL
 
 	var/datum/action/innate/monitor_change/screen
+	languagewhitelist = list("Encoded Audio Language") //Skyrat change - species language whitelist
 
 /datum/species/ipc/on_species_gain(mob/living/carbon/human/C)
 	if(isipcperson(C) && !screen)
diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
index 8eca716a6a..3ab787fdd3 100644
--- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm
@@ -22,6 +22,7 @@
 	coldmod = 6   // = 3x cold damage
 	heatmod = 0.5 // = 1/4x heat damage
 	burnmod = 0.5 // = 1/2x generic burn damage
+	languagewhitelist = list("Slime") //Skyrat change - species language whitelist
 	species_language_holder = /datum/language_holder/jelly
 
 /datum/species/jelly/on_species_loss(mob/living/carbon/C)
diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
index c42e0bf175..65d7667f8c 100644
--- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
@@ -25,6 +25,7 @@
 	disliked_food = GRAIN | DAIRY
 	liked_food = GROSS | MEAT
 	inert_mutation = FIREBREATH
+	languagewhitelist = list("Draconic") //Skyrat change - species language whitelist
 	species_language_holder = /datum/language_holder/lizard
 
 /datum/species/lizard/random_name(gender,unique,lastname)
diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
index dcb6d868fc..b0ad3f144b 100644
--- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm
@@ -23,6 +23,7 @@
 
 	mutanteyes = /obj/item/organ/eyes/night_vision/mushroom
 	var/datum/martial_art/mushpunch/mush
+	languagewhitelist = list("Mushroom") //Skyrat change - species language whitelist
 	species_language_holder = /datum/language_holder/mushroom
 
 /datum/species/mush/on_species_gain(mob/living/carbon/C, datum/species/old_species)
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 0383a19764..bc0c82afe4 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -21,6 +21,7 @@
 	disliked_food = FRUIT
 	liked_food = VEGETABLES
 	outfit_important_for_life = /datum/outfit/plasmaman
+	languagewhitelist = list("Calcic") //Skyrat change - species language whitelist
 
 /datum/species/plasmaman/spec_life(mob/living/carbon/human/H)
 	var/datum/gas_mixture/environment = H.loc.return_air()
diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
index e79160da06..25203f5827 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -18,6 +18,7 @@
 	var/light_oxyheal = -1
 	var/light_burnheal = -1
 	var/light_bruteheal = -1
+	languagewhitelist = list("Sylvan") //Skyrat change - species language whitelist
 
 /datum/species/pod/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
index fede67b47a..d2f897ffcb 100644
--- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm
@@ -14,6 +14,7 @@
 
 	dangerous_existence = 1
 	mutanteyes = /obj/item/organ/eyes/night_vision
+	languagewhitelist = list("Shadowtongue") //Skyrat change - species language whitelist
 
 /datum/species/shadow/on_species_gain(mob/living/carbon/C, datum/species/old_species)
 	. = ..()
diff --git a/code/modules/mob/living/carbon/human/species_types/synthliz.dm b/code/modules/mob/living/carbon/human/species_types/synthliz.dm
index af2e83ee0f..4dd59a08ab 100644
--- a/code/modules/mob/living/carbon/human/species_types/synthliz.dm
+++ b/code/modules/mob/living/carbon/human/species_types/synthliz.dm
@@ -16,6 +16,7 @@
 	mutantliver = /obj/item/organ/liver/ipc
 	mutantstomach = /obj/item/organ/stomach/ipc
 	mutanteyes = /obj/item/organ/eyes/ipc
+	languagewhitelist = list("Encoded Audio Language")
 
 	exotic_bloodtype = "S"
 	exotic_blood_color = BLOOD_COLOR_OIL
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index e8d6539507..4cd35e1008 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -24,6 +24,15 @@
 		/datum/language/slime,
 		/datum/language/vampiric,
 		/datum/language/dwarf,
+		/datum/language/machine, //Skyrat change - adds machine language
+		/datum/language/sandcode/calcic, //Skyrat change - plasmaman language
+		/datum/language/sandcode/dunmeri, //Skyrat change - dunmer language
+		/datum/language/sandcode/moffic, //Skyrat change - insect language
+		/datum/language/sandcode/neokanji, //Skyrat change - generally asian language
+		/datum/language/sandcode/shadowtongue, //Skyrat change - shadowpeople language
+		/datum/language/sandcode/solcommon, //Skyrat change - sol common blah blah
+		/datum/language/sandcode/sylvan, //Skyrat change - plantpeople langauge
+		/datum/language/sandcode/technorussian, //Skyrat change - russian stereotype language
 		/datum/language/sandcode/sergal,
 	))
 	healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!!
diff --git a/sandcode/code/datums/traits/_quirk.dm b/sandcode/code/datums/traits/_quirk.dm
new file mode 100644
index 0000000000..3dfc9ed6c4
--- /dev/null
+++ b/sandcode/code/datums/traits/_quirk.dm
@@ -0,0 +1,2 @@
+/datum/quirk
+	var/list/languagewhitelist =list() //basically whitelists these languages in the setup if you have this quirk
diff --git a/sandcode/code/datums/traits/neutral.dm b/sandcode/code/datums/traits/neutral.dm
index 3f5811e272..415ec9aab1 100644
--- a/sandcode/code/datums/traits/neutral.dm
+++ b/sandcode/code/datums/traits/neutral.dm
@@ -11,21 +11,3 @@
 	var/datum/brain_trauma/severe/hypnotic_stupor/T = new()
 	var/mob/living/carbon/human/H = quirk_holder
 	H.gain_trauma(T, TRAUMA_RESILIENCE_ABSOLUTE)
-
-/datum/quirk/knows_sagaru
-	name = "Sagaru"
-	desc = "From heavy study or just being born in Tal, you know the language Sagaru"
-	value = 0
-	human_only = TRUE
-	gain_text = "<span class='danger'>You remember that you know Sagaru.</span>"
-	lose_text = "<span class='danger'>You simply forgot how to speak Sagaru.</span>"
-	medical_record_text = null
-	mob_trait = TRAIT_KNOWSSAGARU
-
-/datum/quirk/knows_sagaru/add()
-	var/mob/living/carbon/human/H = quirk_holder
-	H.grant_language(/datum/language/sandcode/sergal)
-
-/datum/quirk/knows_sagaru/remove() //theorically you're not even able to lose it, but what if you do?
-	var/mob/living/carbon/human/H = quirk_holder
-	H.remove_language(/datum/language/sandcode/sergal)
diff --git a/sandcode/code/modules/language/language.dm b/sandcode/code/modules/language/language.dm
index 5205743209..b4cccd2987 100644
--- a/sandcode/code/modules/language/language.dm
+++ b/sandcode/code/modules/language/language.dm
@@ -14,3 +14,200 @@
 	syllables = list("grr", "gah", "woof", "arf", "arra", "rah", "wor", "sarg")
 	icon_state = "cheese"
 	flags = TONGUELESS_SPEECH
+	restricted = FALSE
+
+/datum/language/sandcode/buggy
+	name = "Buggy"
+	desc = "A barely comprehensible language, spoken by insectoid-like races."
+	speech_verb = "flutters"
+	ask_verb = "flits"
+	exclaim_verb = "flaps"
+	key = "f"
+	flags = TONGUELESS_SPEECH
+	space_chance = 10
+	syllables = list(
+		"brr", "bzz", "zzz", "zzp", "ziip", "buzz", "rrr", "skrk", "skr", "sk",
+		"tsk","pzz", "tzzz", "pzt", "krrr"
+	)
+	icon_state = "buggy"
+	default_priority = 94
+	restricted = TRUE
+
+/datum/language/sandcode/calcic
+	name = "Calcic"
+	desc = "The disjointed and staccato language of plasmamen. Also understood by skeletons."
+	speech_verb = "rattles"
+	ask_verb = "queries"
+	exclaim_verb = "screeches"
+	whisper_verb = "clicks"
+	key = "q"
+	flags = TONGUELESS_SPEECH
+	space_chance = 10
+	syllables = list(
+		"k", "ck", "ack", "ick", "cl", "tk", "sk", "isk", "tak",
+		"kl", "hs", "ss", "ks", "lk", "dk", "gk", "ka", "ska", "la", "pk",
+    	"wk", "ak", "ik", "ip", "ski", "bk", "kb", "ta", "is", "it", "li", "di",
+    	"ds", "ya", "sck", "crk", "hs", "ws", "mk", "aaa", "skraa", "skee", "hss",
+		"raa", "klk", "tk", "stk", "clk"
+	)
+	icon_state = "calcic"
+	default_priority = 89
+	restricted = TRUE
+
+/datum/language/sandcode/dunmeri
+	name = "Dunmeri"
+	desc = "The native language of the dark elves of lavaland."
+	speech_verb = "proclaims"
+	ask_verb = "queries"
+	exclaim_verb = "declares"
+	whisper_verb = "hushes"
+	key = "v"
+	space_chance = 30
+	flags = TONGUELESS_SPEECH
+	syllables = list(
+		"sid", "n'", "wah", "shad", "i'ag", "ald", "alt",
+		"bal", "mora", "chap'", "druhn", "aka", "vehk", "ur",
+		"cor", "prus", "dun", "meri", "mer", "dra", "dae",
+		"gah", "hla", "isra", "ju", "kena", "khan", "kogo",
+		"mola", "mira", "muth", "sera", "nammu", "nchow",
+		"oad", "rah", "quada", "sad", "rith", "ser","jo",
+		"ra","na","sun", "s'", "wit", "tel","t'","tong"
+	)
+	icon_state = "dunmeri"
+	default_priority = 92
+	restricted = FALSE
+
+/datum/language/sandcode/moffic
+	name = "Moffic"
+	desc = "The language of the Mothpeople borders on complete unintelligibility."
+	speech_verb = "flutters"
+	ask_verb = "flits"
+	exclaim_verb = "flaps"
+	key = "m"
+	flags = TONGUELESS_SPEECH
+	space_chance = 10
+	syllables = list(
+		"år", "i", "går", "sek", "mo", "ff", "ok", "gj", "ø", "gå", "la", "le",
+		"lit", "ygg", "van", "dår", "næ", "møt", "idd", "hvo", "ja", "på", "han",
+		"så", "ån", "det", "att", "nå", "gö", "bra", "int", "tyc", "om", "när",
+		"två", "må", "dag", "sjä", "vii", "vuo", "eil", "tun", "käyt", "teh", "vä",
+		"hei", "huo", "suo", "ää", "ten", "ja", "heu", "stu", "uhr", "kön", "we", "hön"
+	)
+	icon_state = "moffic"
+	default_priority = 93
+	restricted = TRUE
+
+/datum/language/sandcode/neokanji
+	name = "Neo-Kanji"
+	desc = "A bastardized mixture of many old Earth asian dialects. Famously known as the official language of the spider clan."
+	speech_verb = "proclaims"
+	ask_verb = "queries"
+	exclaim_verb = "declares"
+	whisper_verb = "hushes"
+	key = "c"
+	space_chance = 40
+	default_priority = 94
+	flags = TONGUELESS_SPEECH
+	syllables = list("ka", "ki", "ku", "ke", "ko", "ta",
+					"chi", "tsu", "te", "to", "sa", "shi",
+					"su", "se", "so", "na","ni","nu","ne",
+					"no","n","ha","hi","fu","he","ho","ma",
+					"mi","mu","me","mo","ya","yu","yo","ra",
+					"ri","ru","re","ro","wa","wo", "an", "ang",
+					"ao", "ba", "bai", "ban", "bang", "bao",
+					"bei", "beng", "chuai", "xing", "xong", "zhao",
+					"zhong", "xil", "ping", "dang", "guang", "guan",
+					"jing", "jiao", "kung", "fu", "lo", "wang",
+					"liu", "ling", "mang", "nong", "peng", "qiong",
+					"san","tiao", "wan","xiong", "men")
+	icon_state = "neokanji"
+	restricted = FALSE
+
+/datum/language/sandcode/shadowtongue
+	name = "Shadowtongue"
+	desc = "What a grand and intoxicating innocence."
+	speech_verb = "growls"
+	ask_verb = "growls"
+	exclaim_verb = "roars"
+	key = "x"
+	flags = TONGUELESS_SPEECH
+	space_chance = 50
+	syllables = list(
+		"er", "sint", "en", "et", "nor", "bahr", "sint", "un", "ku'elm", "lakor", "eri",
+    	"noj", "dashilu", "as", "ot", "lih", "morh", "ghinu", "kin", "sha", "marik", "jibu",
+    	"sudas", "fut", "kol", "bivi", "pohim", "devohr", "ru", "huirf", "neiris", "sut",
+    	"devehr", "iru", "gher", "gan", "ujil", "lacor", "bahris", "ghar", "alnef", "wah",
+    	"khurdhar", "bar", "et", "ilu", "dash", "diru", "noj", "de", "damjulan", "luvahr",
+    	"telshahr", "tifur", "enhi", "am", "bahr", "nei", "neibahri", "n'chow", "n'wah",
+    	"s'wit", "b'vehk", "f'lah", "muth", "sera", "sedura", "bal", "dun"
+	)
+	icon_state = "shadowtongue"
+	default_priority = 95
+	restricted = TRUE
+
+/datum/language/sandcode/solcommon
+	name = "Sol Common"
+	desc = "The old Earthen language of Latin, re-adopted into the modern day to offer more identity to Humanity."
+	speech_verb = "proclaims"
+	ask_verb = "queries"
+	exclaim_verb = "declares"
+	whisper_verb = "hushes"
+	key = "p"
+	space_chance = 30
+	default_priority = 96
+	flags = TONGUELESS_SPEECH
+	syllables = list(
+		"sed", "ut", "unde", "omnis", "iste", "natus", "sit", "vol", "totam", "rem", "eaque", "ipsa", "quae", "ab", "illo",
+		"et", "quasi", "dicta", "sunt", "enim", "ipsam", "aut", "odit", "qui", "porro", "amet", "que",
+		"eius", "modi", "inci","ad", "vel", "eum", "iure", "hic", "pa", "mit", "dis", "du", "di", "tol", "mi"
+	)
+	icon_state = "solcommon"
+	restricted = FALSE
+
+/datum/language/sandcode/sylvan
+	name = "Sylvan"
+	desc = "A complicated, ancient language spoken by sentient plants."
+	speech_verb = "expresses"
+	ask_verb = "inquires"
+	exclaim_verb = "declares"
+	key = "h"
+	flags = TONGUELESS_SPEECH
+	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 = "sylvan"
+	default_priority = 97
+	restricted = TRUE
+
+/datum/language/sandcode/technorussian
+	name = "Technorussian"
+	desc = "Ancient language of Russian colonists, rusted with time and bastardized with technical terms in everyday use."
+	speech_verb = "proclaims"
+	ask_verb = "queries"
+	exclaim_verb = "declares"
+	whisper_verb = "hushes"
+	key = "2"
+	space_chance = 70
+	default_priority = 98
+	flags = TONGUELESS_SPEECH
+	syllables = list("zhena", "reb", "kot", "tvoy", "vodka", "blyad", "verbovka", "ponimat", "zhit", "kley", "sto", "yat", "si", "det", \
+					 "re", "be", "nok", "chto", "techno", "kak", "govor", "navernoe", "da", "net", "horosho", "pochemu", "privet","lubov", \
+					 "ebat", "krovat", "stol", "za", "ryad", "ka", "voyna", "dumat", "patroni", "tarakanu", "zdorovie", "day", "dengi", \
+					 "pizdec", "mat", "tvoyu", "suka", "ayblya", "uebok", "sosi", "ebi", "huyar", "trahat", "pizda", "uebu", "zaebal", "zgorela", \
+					 "pizduy", "srat", "naydu", "ubyi", "uebishe", "blyadina", "priebali", "prosrali", "suche", "voituyay", "tupoy", "daun", "churka", \
+					 "nelez", "sovershenstvo", "viju", "stradaniye", "smusl", "spaseniye", "pomosh", "zvezdu", "kosmos", "pokorim", "lublu", "bereza",  \
+					 "zashishu", "luna", "planeta", "voshod", "mercaet", "smeshno", "razum", "trud", "mucheniya", "chudo", "borba", "sudba", "svoboda", \
+					 "provodimost", "inicializaciya", "compilaciya", "izolaciya", "teplootdacha", "izlucheniye", "osnasheniye", \
+					 "vidimost", "indukciya", "ionizaciya", "laser", "svyaz", "provodka", "atmosfera", "davleniye", "temperatura", \
+					 "obyem", "massa", "scorost", "uskoreniye", "radiaciya", "ves", "neobhodimost", "dokozatelstvo", "teorema", "kipeniye", \
+					 "inovaciya", "proruv", "turbulentnost", "zashita", "pitaniye", "zamukaniye", "korotkoye", "dlennoye", "verticalno", \
+					 "portal", "systema", "electronika", "nigilizm", "anarhizm", "communistu", "tupuye", "sopla", "obshivka", "obtekaemost", \
+					 "dinamica", "statica", "organizacuya", "yeyenet", "radio", "peredacha", "priem", "slushno", "chastota", "gerts", "stantiya", \
+					 "suda", "huyar", "odin", "dva", "tri", "holod", "granata", "ne", "re", "ru", "korabl")
+	icon_state = "technorussian"
+	restricted = FALSE
diff --git a/sandcode/code/modules/ninja/outfit.dm b/sandcode/code/modules/ninja/outfit.dm
new file mode 100644
index 0000000000..1dd747f220
--- /dev/null
+++ b/sandcode/code/modules/ninja/outfit.dm
@@ -0,0 +1,9 @@
+/datum/outfit/ninja/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
+	if(istype(H.wear_suit, suit))
+		var/obj/item/clothing/suit/space/space_ninja/S = H.wear_suit
+		if(istype(H.belt, belt))
+			S.energyKatana = H.belt
+		S.randomize_param()
+	H.grant_language(/datum/language/sandcode/neokanji, TRUE, TRUE, LANGUAGE_NINJA)
+	var/datum/language_holder/LH = H.get_language_holder()
+	LH.selected_language = /datum/language/sandcode/neokanji
diff --git a/sandcode/icons/misc/language.dmi b/sandcode/icons/misc/language.dmi
index 7dd6956d2a..ba1724df58 100644
Binary files a/sandcode/icons/misc/language.dmi and b/sandcode/icons/misc/language.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index de76e5b49e..dcf85b8c6a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -3493,6 +3493,7 @@
 #include "modular_citadel\code\modules\reagents\objects\items.dm"
 #include "sandcode\code\__DEFINES\language.dm"
 #include "sandcode\code\__DEFINES\traits.dm"
+#include "sandcode\code\datums\traits\_quirk.dm"
 #include "sandcode\code\datums\traits\negative.dm"
 #include "sandcode\code\datums\traits\neutral.dm"
 #include "sandcode\code\game\area\ship_area.dm"
@@ -3519,6 +3520,7 @@
 #include "sandcode\code\modules\mob\living\give.dm"
 #include "sandcode\code\modules\mob\living\simple_animal\hostile\megafauna\drake.dm"
 #include "sandcode\code\modules\mob\living\simple_animal\hostile\megafauna\sand.dm"
+#include "sandcode\code\modules\ninja\outfit.dm"
 #include "sandcode\code\modules\power\port_gen.dm"
 #include "sandcode\code\modules\projectiles\guns\ballistic\pistol.dm"
 #include "sandcode\code\modules\reagents\chemistry\reagents\other_reagents.dm"