From c919075aca0cabc02ec33bc5cfbb64221463079c Mon Sep 17 00:00:00 2001
From: Ghom <42542238+Ghommie@users.noreply.github.com>
Date: Thu, 2 Jul 2020 19:46:10 +0200
Subject: [PATCH] Thanks Timothy.

---
 code/modules/client/preferences.dm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 240b275084..0bf095f701 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -2737,13 +2737,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	character.dna.update_body_size(old_size)
 
 	//speech stuff
-	var/new_tongue = GLOB.roundstart_tongues[custom_tongue]
-	if(new_tongue)
-		var/obj/item/organ/tongue/T = character.getorganslot(ORGAN_SLOT_TONGUE)
-		if(T)
-			qdel(T)
-		var/obj/item/organ/tongue/new_custom_tongue = new new_tongue
-		new_custom_tongue.Insert(character)
+	if(custom_tongue != default)
+		var/new_tongue = GLOB.roundstart_tongues[custom_tongue]
+		if(new_tongue)
+			var/obj/item/organ/tongue/T = character.getorganslot(ORGAN_SLOT_TONGUE)
+			if(T)
+				qdel(T)
+			var/obj/item/organ/tongue/new_custom_tongue = new new_tongue
+			new_custom_tongue.Insert(character)
 	if(custom_speech_verb != "default")
 		character.dna.species.say_mod = custom_speech_verb