jesus please just stop me pain

DopplerShift13 · Oct 8, 2024 · fce3269 · fce3269
1 parent 84354b0
commit fce3269
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 98 deletions.
diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm
@@ -32,7 +32,6 @@ GLOBAL_LIST_INIT(guardian_tech_surnames, world.file2list("strings/names/guardian
 GLOBAL_LIST_INIT(guardian_fantasy_surnames, world.file2list("strings/names/guardian_tarot.txt"))
 GLOBAL_LIST_INIT(operative_aliases, world.file2list("strings/names/operative_alias.txt"))
 GLOBAL_LIST_INIT(voidwalker_names, world.file2list("strings/names/voidwalker.txt"))
-GLOBAL_LIST_INIT(ramatan_first, world.file2list("strings/names/ramatan_first.txt")) //DOPPLER EDIT ADDITION
 GLOBAL_LIST_INIT(ramatan_last, world.file2list("strings/names/ramatan_last.txt")) //DOPPLER EDIT ADDITION
 
 GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt"))

diff --git a/modular_doppler/languages/code/language menu/client_languages.dm b/modular_doppler/languages/code/language menu/client_languages.dm
@@ -48,16 +48,12 @@
 	var/datum/language_holder/lang_holder = new species.species_language_holder()
 	for(var/language in preferences.get_adjusted_language_holder())
 		preferences.languages[language] = LANGUAGE_SPOKEN
-		preferences.languages[language] = LANGUAGE_UNDERSTOOD
 	qdel(lang_holder)
 	qdel(species)
 
 	for(var/language in lang_holder.spoken_languages)
 		preferences.languages[language] = LANGUAGE_SPOKEN
 
-	for(var/language in lang_holder.understood_languages)
-		preferences.languages[language] = LANGUAGE_UNDERSTOOD
-
 	qdel(lang_holder)
 	qdel(species)
 
@@ -77,7 +73,6 @@
 		preferences.languages = list()
 		for(var/language in lang_holder.spoken_languages)
 			preferences.languages[language] = LANGUAGE_SPOKEN
-			preferences.languages[language] = LANGUAGE_UNDERSTOOD
 
 	var/list/selected_languages = list()
 	var/list/unselected_languages = list()
@@ -90,8 +85,6 @@
 
 		if(species.always_customizable && !(language.type in lang_holder.spoken_languages)) // For the ghostrole species. We don't want ashwalkers speaking beachtongue now.
 			continue
-		if(species.always_customizable && !(language.type in lang_holder.understood_languages)) // For the ghostrole species. We don't want ashwalkers speaking beachtongue now.
-			continue
 		if(preferences.languages[language.type])
 			selected_languages += list(list(
 				"description" = language.desc,

diff --git a/modular_doppler/languages/code/language_datums.dm b/modular_doppler/languages/code/language_datums.dm
@@ -72,7 +72,7 @@
 	if(force_use_syllables)
 		return ..()
 
-	return "[pick(GLOB.ramatan_first)] [pick(GLOB.ramatan_last)]"
+	return "The [pick(GLOB.ramatan_last)]"
 
 /datum/language/common
 	name = "Sol Common"

diff --git a/modular_doppler/strings/names/ramatan_first.txt b/modular_doppler/strings/names/ramatan_first.txt
diff --git a/modular_doppler/strings/names/ramatan_last.txt b/modular_doppler/strings/names/ramatan_last.txt
diff --git a/strings/names/ramatan_first.txt b/strings/names/ramatan_first.txt
diff --git a/strings/names/ramatan_last.txt b/strings/names/ramatan_last.txt
@@ -52,6 +52,7 @@ Monk
 Multitude
 Mystic
 Nomad
+Obsessed
 Occult
 Other
 Penitent
@@ -64,7 +65,6 @@ Reclaimer
 Rider
 Sage
 Seeker
-Seer
 Severed
 Shifter
 Silent
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ Monk @@
     Multitude
     Mystic
     Nomad
+    Obsessed
     Occult
     Other
     Penitent
@@ Expand All / @@ -64,7 +65,6 @@ Reclaimer @@
     Rider
     Sage
     Seeker
-    Seer
     Severed
     Shifter
     Silent
@@ Expand Down @@