diff --git a/code/modules/language/unathi.dm b/code/modules/language/draconic.dm
similarity index 94%
rename from code/modules/language/unathi.dm
rename to code/modules/language/draconic.dm
index 5c6da5362f..aaa998c2c0 100644
--- a/code/modules/language/unathi.dm
+++ b/code/modules/language/draconic.dm
@@ -1,5 +1,5 @@
-/datum/language/unathi
-	name = "Unathi"
+/datum/language/draconic
+	name = "Draconic"
 	desc = "The common language of lizard-people, composed of sibilant hisses and rattles."
 	speech_verb = "hisses"
 	ask_verb = "hisses"
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index bbfa6eface..1a9d6b98e6 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -10,9 +10,10 @@
 	var/taste_sensitivity = 15 // lower is more sensitive.
 
 /obj/item/organ/tongue/Initialize(mapload)
-	..()
+	. = ..()
 	languages_possible = typecacheof(list(
 		/datum/language/common,
+		/datum/language/draconic,
 		/datum/language/monkey,
 		/datum/language/ratvar
 	))
@@ -123,7 +124,7 @@
 	taste_sensitivity = 10 // LIZARDS ARE ALIENS CONFIRMED
 
 /obj/item/organ/tongue/alien/Initialize(mapload)
-	..()
+	. = ..()
 	languages_possible = typecacheof(list(
 		/datum/language/xenocommon,
 		/datum/language/common,
@@ -176,7 +177,7 @@
 
 /obj/item/organ/tongue/bone/plasmaman/get_spans()
 	return
-	
+
 /obj/item/organ/tongue/robot
 	name = "robotic voicebox"
 	desc = "A voice synthesizer that can interface with organic lifeforms."
@@ -186,16 +187,8 @@
 	attack_verb = list("beeped", "booped")
 	taste_sensitivity = 25 // not as good as an organic tongue
 
-/obj/item/organ/tongue/robot/Initialize(mapload)
-	..()
-	languages_possible = typecacheof(list(
-		/datum/language/xenocommon,
-		/datum/language/common,
-		/datum/language/ratvar,
-		/datum/language/monkey,
-		/datum/language/drone,
-		/datum/language/machine,
-		/datum/language/swarmer))
+/obj/item/organ/tongue/robot/can_speak_in_language(datum/language/dt)
+	. = TRUE // THE MAGIC OF ELECTRONICS
 
 /obj/item/organ/tongue/robot/get_spans()
 	return ..() | SPAN_ROBOT
diff --git a/tgstation.dme b/tgstation.dme
index 1f3ef27802..92bac3f840 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1419,6 +1419,7 @@
 #include "code\modules\jobs\job_types\security.dm"
 #include "code\modules\jobs\job_types\silicon.dm"
 #include "code\modules\language\common.dm"
+#include "code\modules\language\draconic.dm"
 #include "code\modules\language\drone.dm"
 #include "code\modules\language\language.dm"
 #include "code\modules\language\language_menu.dm"