From d631e11e78f20ce65500b3eaca68ae0bb4cd8b5f Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Sun, 11 Dec 2011 22:03:08 +0000 Subject: [PATCH] TG update: Fire now does four times as much damage, to make it so that running through a blaze is now likely a fatal enterprise. Firesuit still offers protection. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2664 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/carbon/brain/life.dm | 16 +++++++++++++--- code/modules/mob/living/carbon/human/life.dm | 4 ++++ code/modules/mob/living/carbon/monkey/life.dm | 7 ++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 2fe670bec49..b4e051a9d08 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -116,9 +116,19 @@ handle_temperature_damage(body_part, exposed_temperature, exposed_intensity) if(nodamage) return - var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) - //adjustFireLoss(2.5*discomfort) - adjustFireLoss(5.0*discomfort) + + if(exposed_temperature > bodytemperature) + var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) + //adjustFireLoss(2.5*discomfort) + //adjustFireLoss(5.0*discomfort) + adjustFireLoss(20.0*discomfort) + + else + var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) + //adjustFireLoss(2.5*discomfort) + adjustFireLoss(5.0*discomfort) + + handle_chemicals_in_body() diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 7985d1c524a..96357e6e70c 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -575,8 +575,12 @@ handle_temperature_damage(body_part, exposed_temperature, exposed_intensity) if(nodamage) return + var/discomfort = min(abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) + if(exposed_temperature > bodytemperature) + discomfort *= 4 + if(mutantrace == "plant") discomfort *= 3 //I don't like magic numbers. I'll make mutantraces a datum with vars sometime later. -- Urist else diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 628a455adff..cff8cb751f5 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -371,7 +371,12 @@ if(src.nodamage) return var/discomfort = min( abs(exposed_temperature - bodytemperature)*(exposed_intensity)/2000000, 1.0) //adjustFireLoss(2.5*discomfort) - adjustFireLoss(5.0*discomfort) + + if(exposed_temperature > bodytemperature) + adjustFireLoss(20.0*discomfort) + + else + adjustFireLoss(5.0*discomfort) handle_chemicals_in_body()