From 37cd7537a551b6334a225c7c7335890b52d52f32 Mon Sep 17 00:00:00 2001 From: "Kortgstation@gmail.com" Date: Fri, 21 Sep 2012 21:34:05 +0000 Subject: [PATCH] NPC clowns should actually die in space now. Mechas now protect from space again (credit to Aranclanos, though I totally helped with this) Mecha occupants now finally get some feedback/notification when they toggle their airtank lights(credit to Aranclanos) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4736 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/mecha/mecha.dm | 4 +++- code/modules/mob/living/carbon/human/life.dm | 5 ++++- code/modules/mob/living/simple_animal/clown.dm | 6 +++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 0f66460a52..85050fba74 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -948,7 +948,8 @@ lights = !lights if(lights) SetLuminosity(luminosity + lights_power) else SetLuminosity(luminosity - lights_power) - log_message("Toggled lights.") + src.occupant_message("Toggled lights [lights?"on":"off"].") + log_message("Toggled lights [lights?"on":"off"].") return @@ -960,6 +961,7 @@ if(usr!=src.occupant) return use_internal_tank = !use_internal_tank + src.occupant_message("Now taking air from [use_internal_tank?"internal airtank":"environment"].") src.log_message("Now taking air from [use_internal_tank?"internal airtank":"environment"].") return diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 0620197076..ad362e3cbc 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -532,7 +532,10 @@ if(!environment) return var/loc_temp = T0C - if(istype(get_turf(src), /turf/space)) + if(istype(loc, /obj/mecha)) + var/obj/mecha/M = loc + loc_temp = M.return_temperature() + else if(istype(get_turf(src), /turf/space)) var/turf/heat_turf = get_turf(src) loc_temp = heat_turf.temperature else if(istype(loc, /obj/machinery/atmospherics/unary/cryo_cell)) diff --git a/code/modules/mob/living/simple_animal/clown.dm b/code/modules/mob/living/simple_animal/clown.dm index bdd86885d8..c75f167213 100644 --- a/code/modules/mob/living/simple_animal/clown.dm +++ b/code/modules/mob/living/simple_animal/clown.dm @@ -36,7 +36,11 @@ max_co2 = 5 min_n2 = 0 max_n2 = 0 - minbodytemp = 0 + minbodytemp = 270 + maxbodytemp = 370 + heat_damage_per_tick = 15 //amount of damage applied if animal's body temperature is higher than maxbodytemp + cold_damage_per_tick = 10 //same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp + unsuitable_atoms_damage = 10 var/hostile = 0