Merge branch 'master' into merge-upstream

ss220club · Nov 5, 2024 · a148404 · a148404
2 parents 8f2252b + 78ac77b
commit a148404
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm
@@ -2,7 +2,7 @@
 	set name = "Set Default Language"
 	set category = "IC"
 
-	if(!(language in languages))
+	if(!(language in languages) && !isnull(language))
 		to_chat(src, "<span class='warning'>You don't seem to know how to speak [language].</span>")
 		return
 	if(language)
@@ -16,7 +16,7 @@
 	set name = "Set Default Language"
 	set category = "IC"
 
-	if(!(language in speech_synthesizer_langs))
+	if(!(language in speech_synthesizer_langs) && !isnull(language))
 		to_chat(src, "<span class='warning'>You don't seem to know how to speak [language].</span>")
 		return
 	if(language)

diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
@@ -792,6 +792,12 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
 			src:cameraFollow = null
 
 /mob/Topic(href, href_list)
+	if(href_list["flavor_more"])
+		usr << browse(text("<html><meta charset='utf-8'><head><title>[]</title></head><body><tt>[]</tt></body></html>", name, replacetext(flavor_text, "\n", "<br>")), "window=[name];size=500x200")
+		onclose(usr, "[name]")
+	if(href_list["flavor_change"])
+		update_flavor_text()
+
 	if(usr != src)
 		return TRUE
 	if(..())
@@ -801,11 +807,6 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
 		unset_machine()
 		src << browse(null, t1)
 
-	if(href_list["flavor_more"])
-		usr << browse(text("<html><meta charset='utf-8'><head><title>[]</title></head><body><tt>[]</tt></body></html>", name, replacetext(flavor_text, "\n", "<br>")), "window=[name];size=500x200")
-		onclose(usr, "[name]")
-	if(href_list["flavor_change"])
-		update_flavor_text()
 
 	if(href_list["scoreboard"])
 		usr << browse(GLOB.scoreboard, "window=roundstats;size=500x600")