Expanding language keys and adding mixed-language speech.

code/_helpers/game.dm

@@ -204,19 +204,22 @@
 	var/list/hearturfs = list()
 	FOR_DVIEW(var/turf/T, range, center, INVISIBILITY_MAXIMUM)
 		hearturfs[T] = TRUE
-		for(var/mob/M in T)
-			mobs += M
+		if(islist(mobs))
+			for(var/mob/M in T)
+				mobs += M
 	END_FOR_DVIEW
 
-	for(var/mob/M in global.player_list)
-		if(check_ghosts && M.stat == DEAD && M.get_preference_value(check_ghosts) != PREF_NEARBY)
-			mobs |= M
-		else if(hearturfs[get_turf(M)])
-			mobs |= M
-
-	for(var/obj/O in global.listening_objects)
-		if(hearturfs[get_turf(O)])
-			objs += O
+	if(islist(mobs))
+		for(var/mob/M in global.player_list)
+			if(check_ghosts && M.stat == DEAD && M.get_preference_value(check_ghosts) != PREF_NEARBY)
+				mobs |= M
+			else if(hearturfs[get_turf(M)])
+				mobs |= M
+
+	if(islist(objs))
+		for(var/obj/O in global.listening_objects)
+			if(hearturfs[get_turf(O)])
+				objs += O
 
 
 

code/_helpers/text.dm

@@ -365,6 +365,15 @@ var/global/regex/starts_lowercase_regex = regex(@"^[a-z]")
 /proc/trim(text)
 	return trim_left(trim_right(text))
 
+/// Adds punctuation to an emote or speech message automatically.
+/proc/handle_autopunctuation(message)
+	if(!message)
+		return
+	var/end_char = copytext_char(trim_right(strip_html_properly(message)), -1)
+	if(!(end_char in list(".", "?", "!", "-", "~")))
+		message += "."
+	return message
+
 //Returns a string with the first element of the string capitalized.
 // NOTE: This will not work if there are any HTML tags.
 /proc/capitalize(text)

code/controllers/subsystems/initialization/lore.dm

@@ -23,10 +23,6 @@ SUBSYSTEM_DEF(lore)
 	var/list/credits_topics =          list("SACRED GEOMETRY","ABSTRACT MATHEMATICS","LOVE","DRUGS","CRIME","PRODUCTIVITY","LAUNDRY")
 	var/list/credits_nouns =           list("DIGNITY", "SANITY")
 
-	// Probably not the best subsystem for these, but oh well.
-	var/list/languages_by_key
-	var/list/languages_by_name
-
 /datum/controller/subsystem/lore/Initialize()
 
 	var/list/all_backgrounds = decls_repository.get_decls_of_subtype(/decl/background_detail)
@@ -71,23 +67,3 @@ SUBSYSTEM_DEF(lore)
 		possible_titles |= credits_other
 		global.end_credits_title = pick(possible_titles)
 	. = global.end_credits_title
-
-/datum/controller/subsystem/lore/proc/get_language_by_name(var/language_name)
-	if(!languages_by_name)
-		languages_by_name = list()
-		var/list/language_types = decls_repository.get_decls_of_subtype(/decl/language)
-		for(var/thing in language_types)
-			var/decl/language/lang = language_types[thing]
-			if(lang.name)
-				languages_by_name[lang.name] = lang
-	. = languages_by_name[language_name]
-
-/datum/controller/subsystem/lore/proc/get_language_by_key(var/language_key)
-	if(!languages_by_key)
-		languages_by_key = list()
-		var/list/language_types = decls_repository.get_decls_of_subtype(/decl/language)
-		for(var/thing in language_types)
-			var/decl/language/lang = language_types[thing]
-			if(lang.key)
-				languages_by_key[lang.key] = lang
-	. = languages_by_key[language_key]

code/datums/trading/_trader.dm

@@ -39,9 +39,9 @@
 	if(!ispath(trader_currency, /decl/currency))
 		trader_currency = global.using_map.default_currency
 	if(ispath(name_language, /decl/language))
-		var/decl/language/L = GET_DECL(name_language)
-		if(istype(L))
-			name = L.get_random_language_name(pick(MALE,FEMALE))
+		var/decl/language/language = GET_DECL(name_language)
+		if(istype(language))
+			name = language.get_random_language_name(pick(MALE,FEMALE))
 	if(!name)
 		name = capitalize(pick(global.using_map.first_names_female + global.using_map.first_names_male)) + " " + capitalize(pick(global.using_map.last_names))
 

code/game/atoms.dm

@@ -642,22 +642,22 @@
 	- `range?`: The number of tiles away the message will be visible from. Default: world.view
 	- `check_ghosts?`: Set to `TRUE` if ghosts should see the message if their preferences allow
 */
-/atom/proc/visible_message(var/message, var/self_message, var/blind_message, var/range = world.view, var/check_ghosts = null)
+/atom/proc/visible_message(var/message, var/self_message, var/blind_message, var/range = world.view, var/check_ghosts = null, atom/source)
 	var/turf/T = get_turf(src)
 	var/list/mobs = list()
 	var/list/objs = list()
 	get_listeners_in_range(T,range, mobs, objs, check_ghosts)
 
 	for(var/o in objs)
 		var/obj/O = o
-		O.show_message(message, VISIBLE_MESSAGE, blind_message, AUDIBLE_MESSAGE)
+		O.show_message(message, VISIBLE_MESSAGE, blind_message, AUDIBLE_MESSAGE, source = source)
 
 	for(var/m in mobs)
 		var/mob/M = m
 		if(M.see_invisible >= invisibility)
-			M.show_message(message, VISIBLE_MESSAGE, blind_message, AUDIBLE_MESSAGE)
+			M.show_message(message, VISIBLE_MESSAGE, blind_message, AUDIBLE_MESSAGE, source = source)
 		else if(blind_message)
-			M.show_message(blind_message, AUDIBLE_MESSAGE)
+			M.show_message(blind_message, AUDIBLE_MESSAGE, source = source)
 
 /**
 	Show a message to all mobs and objects in earshot of this atom
@@ -670,18 +670,18 @@
 	- `check_ghosts?`: TRUE if ghosts should hear the message if their preferences allow
 	- `radio_message?`: The string to send over radios
 */
-/atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance = world.view, var/check_ghosts = null, var/radio_message)
+/atom/proc/audible_message(var/message, var/deaf_message, var/hearing_distance = world.view, var/check_ghosts = null, var/radio_message, atom/source)
 	var/turf/T = get_turf(src)
 	var/list/mobs = list()
 	var/list/objs = list()
 	get_listeners_in_range(T, hearing_distance, mobs, objs, check_ghosts)
 
 	for(var/m in mobs)
 		var/mob/M = m
-		M.show_message(message,2,deaf_message,1)
+		M.show_message(message, AUDIBLE_MESSAGE, deaf_message, VISIBLE_MESSAGE, source = source)
 	for(var/o in objs)
 		var/obj/O = o
-		O.show_message(message,2,deaf_message,1)
+		O.show_message(message, AUDIBLE_MESSAGE, deaf_message, VISIBLE_MESSAGE, source = source)
 
 /**
 	Attempt to drop this atom onto the destination.
@@ -1082,3 +1082,10 @@
 // Test for if stepping on a tile containing this obj is safe to do, used for things like landmines and cliffs.
 /atom/proc/is_safe_to_step(mob/living/stepper)
 	return TRUE
+
+//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
+/atom/proc/show_message(msg, type, alt, alt_type, atom/source)
+	return
+
+/atom/proc/see_signlang(message, verb = "gestures", decl/language/language, mob/speaker, prefix)
+	return

code/game/jobs/server_whitelist.dm

@@ -74,20 +74,20 @@ var/global/list/alien_whitelist = list()
 
 	// Forbidden languages do not care about admin rights.
 	if(istype(species,/decl/language))
-		var/decl/language/L = species
-		if(L.flags & LANG_FLAG_FORBIDDEN)
+		var/decl/language/language = species
+		if(language.language_flags & LANG_FLAG_FORBIDDEN)
 			return FALSE
 
 	if(check_rights(R_ADMIN, FALSE, M))
 		return TRUE
 
 	if(istype(species,/decl/language))
-		var/decl/language/L = species
-		if(L.flags & LANG_FLAG_RESTRICTED)
+		var/decl/language/language = species
+		if(language.language_flags & LANG_FLAG_RESTRICTED)
 			return FALSE
-		if(!get_config_value(/decl/config/toggle/use_alien_whitelist) || !(L.flags & LANG_FLAG_WHITELISTED))
+		if(!get_config_value(/decl/config/toggle/use_alien_whitelist) || !(language.language_flags & LANG_FLAG_WHITELISTED))
 			return TRUE
-		return whitelist_lookup(L.name, M.ckey)
+		return whitelist_lookup(language.name, M.ckey)
 
 	if(istype(species,/decl/species))
 		var/decl/species/S = species