From f90dcdeaee549101a8cc0d5f43f2d1633164d947 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 17 Aug 2013 03:47:05 -0700 Subject: [PATCH 1/4] Added Diona language, Rootspeak. --- code/modules/mob/language.dm | 8 ++++++++ code/modules/mob/living/carbon/species.dm | 1 + 2 files changed, 9 insertions(+) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index ba868a2bd4..1ab08c1f3b 100644 --- a/code/modules/mob/language.dm +++ b/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" diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 7c3d159b22..4ea033d556 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -91,6 +91,7 @@ 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 From 9743fe673b65b6d31be8f0acbaf723976662b5de Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 17 Aug 2013 04:14:54 -0700 Subject: [PATCH 2/4] Added NO_BREATHE flag check in human Life() proc. --- code/modules/mob/living/carbon/human/life.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d61cdd1cc7..ce29ffa971 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/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)) From 387fbff346dd7957a95072103fc9485b3071fcb6 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 17 Aug 2013 04:15:16 -0700 Subject: [PATCH 3/4] Added some varying temperature and pressure values for different species. --- code/modules/mob/living/carbon/species.dm | 24 ++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 4ea033d556..349f7edca2 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/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" @@ -95,4 +110,11 @@ 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 \ No newline at end of file From 3569529d51d6d0ad2c67e79cd25818fad1e27f39 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 17 Aug 2013 04:17:21 -0700 Subject: [PATCH 4/4] Added languages to monkey variants. --- code/modules/mob/living/carbon/monkey/monkey.dm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 22c36666a5..99c660918e 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/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