diff --git a/code/modules/mob/simple_animal/carp.dm b/code/modules/mob/simple_animal/carp.dm index 2e00c22424d..ad167a954cc 100644 --- a/code/modules/mob/simple_animal/carp.dm +++ b/code/modules/mob/simple_animal/carp.dm @@ -35,6 +35,8 @@ max_co2 = 0 min_n2 = 0 max_n2 = 0 + minbodytemp = 0 //so they don't freeze in space + maxbodytemp = 295 //if it's just 25 degrees, they start to burn up var/stance = CARP_STANCE_IDLE //Used to determine behavior var/stance_step = 0 //Used to delay checks depending on what stance the bear is in @@ -46,11 +48,6 @@ 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 24705a19f2b..7fdf5573475 100644 --- a/code/modules/mob/simple_animal/kobold.dm +++ b/code/modules/mob/simple_animal/kobold.dm @@ -17,7 +17,8 @@ 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 + minbodytemp = 250 + min_oxy = 1 /mob/living/simple_animal/kobold/Life() ..() diff --git a/code/modules/mob/simple_animal/simple_animal_life.dm b/code/modules/mob/simple_animal/simple_animal_life.dm index 45bb8275695..eb5e87b7482 100644 --- a/code/modules/mob/simple_animal/simple_animal_life.dm +++ b/code/modules/mob/simple_animal/simple_animal_life.dm @@ -81,15 +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.") : ""]") + 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(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.") : ""]") + if(prob(15)) + emote("auto",1,"gasps![prob(50) ? "[pick(" It seems unable to breath."," It seems to be asphyxiating.")]" : ""]")