From dfcb1ffdb70befce75fd97cdbffa30cfc8ae0505 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Fri, 15 Jun 2012 09:38:18 +0000 Subject: [PATCH] - Looks like I failed to properly update one of the files before commit. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3830 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/carbon/monkey/life.dm | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index fd6acbd0bc..b82e45846e 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -369,24 +369,11 @@ bodytemperature += 0.1*(environment.temperature - bodytemperature)*environment_heat_capacity/(environment_heat_capacity + 270000) //Account for massive pressure differences - - var/pressure = environment.return_pressure() - - // if(!wear_suit) Monkies cannot into space. - // if(!istype(wear_suit, /obj/item/clothing/suit/space)) - - /*if(pressure < 20) - if(prob(25)) - src << "You feel the splittle on your lips and the fluid on your eyes boiling away, the capillteries in your skin breaking." - adjustBruteLoss(5) - */ - if(pressure > HAZARD_HIGH_PRESSURE) - - adjustBruteLoss(min((10+(round(pressure/(HIGH_STEP_PRESSURE)-2)*5)),MAX_PRESSURE_DAMAGE)) - - + var/adjusted_pressure = calculate_affecting_pressure(pressure) //Returns how much pressure actually affects the mob. + if(adjusted_pressure > HAZARD_HIGH_PRESSURE) + adjustBruteLoss( min( (adjusted_pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT , MAX_PRESSURE_DAMAGE) ) return //TODO: DEFERRED