From bf9f922390bea3c2ea6bb48da8a3f06caa79b75e Mon Sep 17 00:00:00 2001 From: "rockdtben@gmail.com" Date: Mon, 13 Aug 2012 13:21:02 +0000 Subject: [PATCH] -Fixes issue 690 -Made my comment less ambiguous git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4391 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/implants/implant.dm | 3 ++- code/modules/mob/living/carbon/human/life.dm | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 99fe108f5d..3f80a108b7 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -10,8 +10,9 @@ proc/activate() return + // What does the implant do upon injection? - // return 0 if the implant fails to persist (ex. Revhead and loyalty implant.) + // return 0 if the implant fails (ex. Revhead and loyalty implant.) // return 1 if the implant succeeds (ex. Nonrevhead and loyalty implant.) proc/implanted(var/mob/source) return 1 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index d173d58d4d..ab5dbdfb7a 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -412,8 +412,11 @@ if(breath.temperature > (T0C+66) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :( if(prob(20)) - src << "\red You feel a searing heat in your lungs!" + src << "\red You feel your face burning and a searing heat in your lungs!" fire_alert = max(fire_alert, 1) + var/transfer_coefficient = 100000 // Burning air is being forced into your lungs and mouth + handle_temperature_damage(HEAD, breath.temperature, breath.heat_capacity()*transfer_coefficient) + handle_temperature_damage(UPPER_TORSO, breath.temperature, breath.heat_capacity()*transfer_coefficient) else fire_alert = 0