Merge pull request #734 from Citadel-Station-13/upstream-merge-26780

[MIRROR] Draconic language, for lizards

code/modules/language/draconic.dm

@@ -0,0 +1,20 @@
+/datum/language/draconic
+	name = "Draconic"
+	desc = "The common language of lizard-people, composed of sibilant hisses and rattles."
+	speech_verb = "hisses"
+	ask_verb = "hisses"
+	exclaim_verb = "roars"
+	key = "o"
+	flags = TONGUELESS_SPEECH
+	space_chance = 40
+	syllables = list(
+		"za", "az", "ze", "ez", "zi", "iz", "zo", "oz", "zu", "uz", "zs", "sz",
+		"ha", "ah", "he", "eh", "hi", "ih", "ho", "oh", "hu", "uh", "hs", "sh",
+		"la", "al", "le", "el", "li", "il", "lo", "ol", "lu", "ul", "ls", "sl",
+		"ka", "ak", "ke", "ek", "ki", "ik", "ko", "ok", "ku", "uk", "ks", "sk",
+		"sa", "as", "se", "es", "si", "is", "so", "os", "su", "us", "ss", "ss",
+		"ra", "ar", "re", "er", "ri", "ir", "ro", "or", "ru", "ur", "rs", "sr",
+		"a",  "a",  "e",  "e",  "i",  "i",  "o",  "o",  "u",  "u",  "s",  "s"
+	)
+	icon_state = "lizard"
+	default_priority = 90

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

@@ -17,6 +17,9 @@
 	skinned_type = /obj/item/stack/sheet/animalhide/lizard
 	exotic_bloodtype = "L"
 
+/datum/species/lizard/after_equip_job(datum/job/J, mob/living/carbon/human/H)
+	H.grant_language(/datum/language/draconic)
+
 /datum/species/lizard/random_name(gender,unique,lastname)
 	if(unique)
 		return random_unique_lizard_name(gender)

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,10 +124,11 @@
 	taste_sensitivity = 10 // LIZARDS ARE ALIENS CONFIRMED
 
 /obj/item/organ/tongue/alien/Initialize(mapload)
-	..()
+	. = ..()
 	languages_possible = typecacheof(list(
 		/datum/language/xenocommon,
 		/datum/language/common,
+		/datum/language/draconic,
 		/datum/language/ratvar,
 		/datum/language/monkey))
 
@@ -175,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."
@@ -185,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

code/modules/surgery/organs/tongue.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm	(rejected hunks)
+@@ -13,7 +13,7 @@
+ 	. = ..()
+ 	languages_possible = typecacheof(list(
+ 		/datum/language/common,
+-		/datum/language/unathi,
++		/datum/language/draconic,
+ 		/datum/language/monkey,
+ 		/datum/language/ratvar
+ 	))

tgstation.dme

@@ -1423,6 +1423,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"

tgstation.dme.rej

@@ -0,0 +1,9 @@
+diff a/tgstation.dme b/tgstation.dme	(rejected hunks)
+@@ -1377,6 +1377,7 @@
+ #include "code\modules\jobs\job_types\silicon.dm"
+ #include "code\modules\jobs\map_changes\map_changes.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"