From 6823ccfc2074bdd7cfdfeffaef2388e47d2b70d1 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Thu, 23 Jun 2011 19:04:00 +0000 Subject: [PATCH] Buff to CPR: - You can now heal someone with CPR who is has anywhere from -1 to -99 HP (was -1 to -40) - Doing CPR will now heal 7 HP per CPR instead of 5 - Doing CPR will now give the receiver a message that they're being helped - Putting someone into the cryo cell who is either asleep or has between -1 and -99 HP will give them a message. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1712 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/cryo.dm | 2 ++ code/modules/mob/living/carbon/human/human.dm | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index f63552a1012..b74c97a825e 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -230,6 +230,8 @@ M.client.eye = src M.pulling = null M.loc = src + if(M.health > -100 && (M.health < 0 || M.sleeping)) + M << "\blue You feel a cold liquid surround you. Your skin starts to freeze up." src.occupant = M // M.metabslow = 1 src.add_fingerprint(usr) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index c4db177e0a7..918b72c1656 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1445,7 +1445,7 @@ src = null src = H.monkeyize() contract_disease(M.virus,1,0) - + return /mob/living/carbon/human/attack_paw(mob/M as mob) @@ -2523,16 +2523,14 @@ It can still be worn/put on as normal. //SN src = null del(src) return - if ((target.health >= -75.0 && target.health < 0)) + if ((target.health >= -99.0 && target.health < 0)) target.cpr_time = world.time - if (target.health >= -40.0) - var/suff = min(target.oxyloss, 5) - target.oxyloss -= suff - target.updatehealth() - if(target.reagents.get_reagent_amount("inaprovaline") < 10) - target.reagents.add_reagent("inaprovaline", 10) + var/suff = min(target.oxyloss, 7) + target.oxyloss -= suff + target.updatehealth() for(var/mob/O in viewers(source, null)) O.show_message(text("\red [] performs CPR on []!", source, target), 1) + target << "\blue You feel a breath of fresh air enter your lungs. It feels good." source << "\red Repeat every 7 seconds AT LEAST." if("fuel") var/obj/item/weapon/fuel/S = item