From 56ec95fe004c0be6428b0040cbec166cad3f6167 Mon Sep 17 00:00:00 2001 From: HugoLuman Date: Thu, 14 Apr 2016 00:15:40 -0700 Subject: [PATCH] New color, Regen refactor Regen tiers all shifted up by one Previous tier 3 rates now tier 4, even harder to reach Drask language now has its own color (Bugged commits retconned) Signed-off-by: HugoLuman --- code/modules/mob/language.dm | 2 +- .../mob/living/carbon/human/species/drask.dm | 15 ++++++++++----- interface/stylesheet.dm | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index e4f944cf482..ead49d9af6f 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -282,7 +282,7 @@ speech_verb = "drones" ask_verb = "hums" exclaim_verb = "rumbles" - colour = "slime" + colour = "drask" key = "%" flags = RESTRICTED syllables = list("hoorb","vrrm","ooorm","urrrum","ooum","ee","ffm","hhh","mn","ongg") diff --git a/code/modules/mob/living/carbon/human/species/drask.dm b/code/modules/mob/living/carbon/human/species/drask.dm index 59bc94623be..73e134c9782 100644 --- a/code/modules/mob/living/carbon/human/species/drask.dm +++ b/code/modules/mob/living/carbon/human/species/drask.dm @@ -56,8 +56,8 @@ ) -/datum/species/drask/handle_temperature(datum/gas_mixture/breath, var/mob/living/carbon/human/H) // called by human/life, handles temperatures - if( (abs(310.15 - breath.temperature) > 50) && !(RESIST_HEAT in H.mutations)) // Hot air hurts :( +/datum/species/drask/handle_temperature(datum/gas_mixture/breath, var/mob/living/carbon/human/H) + if( (abs(310.15 - breath.temperature) > 50) && !(RESIST_HEAT in H.mutations)) if(H.status_flags & GODMODE) return 1 //godmode if(breath.temperature < 260) if(prob(20)) @@ -67,21 +67,26 @@ to_chat(H, "You feel your face burning and a searing heat in your lungs!") switch(breath.temperature) - if(-INFINITY to 65) + if(-INFINITY to 30) // This'll make the tank pressure drop really low, won't last very long H.adjustFireLoss(cold_env_multiplier*5) //Has to be half the brute, since it has a 2x multiplier from burn_mod H.adjustBruteLoss(cold_env_multiplier*10) H.fire_alert = max(H.fire_alert, 1) //To alert that their breath is cold enough for healing. Does not seem to affect cold movement slowdown - if(66 to 200) + if(31 to 75) H.adjustFireLoss(cold_env_multiplier*3) H.adjustBruteLoss(cold_env_multiplier*6) H.fire_alert = max(H.fire_alert, 1) - if(201 to 260) + if(76 to 200) // A bit slower than Diona. More per increment, but increments much slower than Diona H.adjustFireLoss(cold_env_multiplier*1.5) H.adjustBruteLoss(cold_env_multiplier*3) H.fire_alert = max(H.fire_alert, 1) + if(201 to 260) // Much slower than Diona + H.adjustFireLoss(cold_env_multiplier*0.5) + H.adjustBruteLoss(cold_env_multiplier*1) + H.fire_alert = max(H.fire_alert, 1) + if(heat_level_1 to heat_level_2) H.apply_damage(hot_env_multiplier*HEAT_GAS_DAMAGE_LEVEL_1, BURN, "head", used_weapon = "Excessive Heat") H.fire_alert = max(H.fire_alert, 2) diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index b045e1adbdc..5ed85668221 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -93,6 +93,7 @@ h1.alert, h2.alert {color: #000000;} .clown {color: #ff0000;} .shadowling {color: #3b2769;} .vulpkanin {color: #B97A57;} +.drask {color: #a3d4eb; font-family: "Arial Black";} .rough {color: #7092BE; font-family: "Trebuchet MS", cursive, sans-serif;} .say_quote {font-family: Georgia, Verdana, sans-serif;} .sans {font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}