From 2b2017126a489dc327c8041ab988449184f9e59a Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sun, 5 Aug 2012 03:13:49 +1000 Subject: [PATCH] tweaks to simple_animals, carps no longer freeze / require oxy to live (but rapidly burn up from 25+ degree temp), kobolds no longer require oxy to live Signed-off-by: Cael_Aislinn --- code/modules/mob/simple_animal/carp.dm | 5 +++++ code/modules/mob/simple_animal/kobold.dm | 1 + code/modules/mob/simple_animal/simple_animal.dm | 2 +- code/modules/mob/simple_animal/simple_animal_life.dm | 7 +++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/simple_animal/carp.dm b/code/modules/mob/simple_animal/carp.dm index 24c3d749503..2e00c22424d 100644 --- a/code/modules/mob/simple_animal/carp.dm +++ b/code/modules/mob/simple_animal/carp.dm @@ -46,6 +46,11 @@ health = 50 melee_damage_lower = 10 melee_damage_upper = 20 + minbodytemp = 0 //so they don't freeze in space + maxbodytemp = 295 //if it's just 25 degrees, they start to burn up var/min_oxy = 5 + min_oxy = 0 //doesn't need to breath + max_tox = 0 //can survive toxic atmospheres + max_co2 = 0 /proc/iscarp(var/mob/M) return istype(M, /mob/living/simple_animal/carp) diff --git a/code/modules/mob/simple_animal/kobold.dm b/code/modules/mob/simple_animal/kobold.dm index 91a12fa23c5..24705a19f2b 100644 --- a/code/modules/mob/simple_animal/kobold.dm +++ b/code/modules/mob/simple_animal/kobold.dm @@ -17,6 +17,7 @@ response_help = "pets the" response_disarm = "gently pushes aside the" response_harm = "kicks the" + min_oxy = 0 //doesn't need oxy to breathe. kobolds are space asteroid miners /mob/living/simple_animal/kobold/Life() ..() diff --git a/code/modules/mob/simple_animal/simple_animal.dm b/code/modules/mob/simple_animal/simple_animal.dm index c365f421029..16998d8a9c8 100644 --- a/code/modules/mob/simple_animal/simple_animal.dm +++ b/code/modules/mob/simple_animal/simple_animal.dm @@ -27,7 +27,7 @@ //Temperature effect var/minbodytemp = 270 - var/maxbodytemp = 370 + var/maxbodytemp = 305 var/heat_damage_per_tick = 3 //amount of damage applied if animal's body temperature is higher than maxbodytemp var/cold_damage_per_tick = 2 //same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp diff --git a/code/modules/mob/simple_animal/simple_animal_life.dm b/code/modules/mob/simple_animal/simple_animal_life.dm index e03984e6653..45bb8275695 100644 --- a/code/modules/mob/simple_animal/simple_animal_life.dm +++ b/code/modules/mob/simple_animal/simple_animal_life.dm @@ -81,8 +81,15 @@ //Atmos effect if(bodytemperature < minbodytemp) health -= cold_damage_per_tick + if(prob(15) + emote("auto",1,"shivers![prob(50) : pick(" It seems quite cold."," It seems to be freezing.") : ""]") + else if(bodytemperature > maxbodytemp) health -= heat_damage_per_tick + if(prob(15) + emote("auto",1,"sweats![prob(50) : pick(" It seems quite hot."," It seems to be burning up.") : ""]") if(!atmos_suitable) health -= unsuitable_atoms_damage + if(prob(15) + emote("auto",1,"gasps![prob(50) : pick(" It seems unable to breath."," It seems to be asphyxiating.") : ""]")