Merge pull request #3531 from Zuhayr/dev

Languages/species mucking around.

code/modules/mob/language.dm

@@ -43,6 +43,14 @@
 	key = "v"
 	flags = RESTRICTED
 
+/datum/language/diona
+	name = "Rootspeak"
+	desc = "A creaking, subvocal language spoken instinctively by the Dionaea. Due to the unique makeup of the average Diona, a phrase of Rootspeak can be a combination of anywhere from one to twelve individual voices and notes."
+	speech_verb = "creaks and rustles"
+	colour = "soghun"
+	key = "t"
+	flags = RESTRICTED
+
 /*
 /datum/language/human
 	name = "Sol Common"

code/modules/mob/living/carbon/human/life.dm

@@ -275,6 +275,7 @@
 	proc/breathe()
 		if(reagents.has_reagent("lexorin")) return
 		if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) return
+		if(species && species.flags & NO_BREATHE) return
 
 		var/datum/organ/internal/lungs/L = internal_organs["lungs"]
 		L.process()
@@ -312,7 +313,6 @@
 
 					breath = loc.remove_air(breath_moles)
 
-
 					if(!is_lung_ruptured())
 						if(!breath || breath.total_moles < BREATH_MOLES / 5 || breath.total_moles > BREATH_MOLES * 5)
 							if(prob(5))

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -78,18 +78,28 @@
 	..()
 	dna.mutantrace = "lizard"
 	greaterform = "Unathi"
+	add_language("Sinta'unathi")
 
 /mob/living/carbon/monkey/skrell/New()
 
 	..()
 	dna.mutantrace = "skrell"
 	greaterform = "Skrell"
+	add_language("Skrellian")
 
 /mob/living/carbon/monkey/tajara/New()
 
 	..()
 	dna.mutantrace = "tajaran"
 	greaterform = "Tajaran"
+	add_language("Siik'tajr")
+
+/mob/living/carbon/monkey/diona/New()
+
+	..()
+	dna.mutantrace = "plant"
+	greaterform = "Diona"
+	add_language("Rootspeak")
 
 /mob/living/carbon/monkey/movement_delay()
 	var/tally = 0

code/modules/mob/living/carbon/species.dm

@@ -15,7 +15,7 @@
 	var/attack_verb = "punch"    // Empty hand hurt intent verb.
 	var/mutantrace               // Safeguard due to old code.
 
-	var/breath_type     // Non-oxygen gas breathed, if any.
+	var/breath_type = "oxygen"   // Non-oxygen gas breathed, if any.
 
 	var/cold_level_1 = 260  // Cold damage level 1 below this point.
 	var/cold_level_2 = 200  // Cold damage level 2 below this point.
@@ -63,6 +63,14 @@
 	attack_verb = "scratch"
 	darksight = 8
 
+	cold_level_1 = 200
+	cold_level_2 = 140
+	cold_level_3 = 80
+
+	heat_level_1 = 330
+	heat_level_2 = 380
+	heat_level_3 = 800
+
 	primitive = /mob/living/carbon/monkey/tajara
 
 	flags = WHITELISTED | HAS_LIPS | HAS_UNDERWEAR | HAS_TAIL
@@ -82,6 +90,13 @@
 	deform = 'icons/mob/human_races/r_def_vox.dmi'
 	language = "Vox-pidgin"
 
+	warning_low_pressure = 50
+	hazard_low_pressure = 0
+
+	cold_level_1 = 80
+	cold_level_2 = 50
+	cold_level_3 = 0
+
 	eyes = "vox_eyes_s"
 	breath_type = "nitrogen"
 
@@ -91,7 +106,15 @@
 	name = "Diona"
 	icobase = 'icons/mob/human_races/r_plant.dmi'
 	deform = 'icons/mob/human_races/r_def_plant.dmi'
+	language = "Rootspeak"
 	attack_verb = "slash"
 	primitive = /mob/living/carbon/monkey/diona
 
+	warning_low_pressure = 50
+	hazard_low_pressure = 0
+
+	heat_level_1 = 500
+	heat_level_2 = 700
+	heat_level_3 = 1200
+
 	flags = NO_EAT | NO_BREATHE | REQUIRE_LIGHT | NON_GENDERED | NO_SCAN | IS_PLANT