From 8469753da52dc7a0829234c1a12e813a70c7d0f0 Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Sun, 11 Dec 2011 22:03:08 +0000 Subject: [PATCH] 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 ++++++- html/changelog.html | 7 +++++++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index bf216dc67e0..89f8ad88694 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 2b4e9a9caeb..18562bad8af 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -572,8 +572,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 15d5235eb8b..5176b918f53 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() diff --git a/html/changelog.html b/html/changelog.html index b53394d1a19..ce578c09ab8 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -68,6 +68,13 @@ should be listed in the changelog upon commit tho. Thanks. -->
  • Escaping alone in a pod does not count towards the escape alone objective, it counts towards the escape alive objective tho. Escape alone only requires you to escape alone on the emergency shuttle, it doesn't require you to ensure all pods are empty. Cult members that escape on the pods do not ocunt towards the cult escaping acolyte number objective. Escaping on a pod is a valid way to survive meteor.
    • +
  • Polymorph updated: + +
    • + + 8 December 2011