From 42bd1621228b946765bddea3597025899209f95d Mon Sep 17 00:00:00 2001
From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date: Mon, 24 Jul 2023 10:27:04 -0400
Subject: [PATCH] Buffs revivers, Again. (#21673)
* Buffs revivers. Again. They will still not be used.
* nah fuck that just go to 2
---
.../surgery/organs/augments_internal.dm | 27 ++++++++++---------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index bb66b2282f6..9df95782499 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -403,15 +403,16 @@
if(cooldown > world.time || owner.suiciding) // don't heal while you're in cooldown!
return
if(reviving)
- if(owner.health <= HEALTH_THRESHOLD_CRIT)
+ reviving = FALSE
+ if(owner.health <= HEALTH_THRESHOLD_CRIT + 10) //We do not want to leave them on the end of crit constantly.
addtimer(CALLBACK(src, PROC_REF(heal)), 30)
- else
- reviving = FALSE
- if(owner.HasDisease(new /datum/disease/critical/shock(0)) && prob(15)) //If they are no longer in crit, but have shock, and pass a 15% chance:
- for(var/datum/disease/critical/shock/S in owner.viruses)
- S.cure()
- revive_cost += 150
- to_chat(owner, "You feel better.")
+ reviving = TRUE
+ if(owner.health > HEALTH_THRESHOLD_CRIT && owner.HasDisease(new /datum/disease/critical/shock(0)) && prob(15)) //We do not do an else, as we need them to cure shock inside this magic zone of 10 damage
+ for(var/datum/disease/critical/shock/S in owner.viruses)
+ S.cure()
+ revive_cost += 150
+ to_chat(owner, "You feel better.")
+ if(!reviving)
return
cooldown = revive_cost + world.time
revive_cost = 0
@@ -424,14 +425,14 @@
owner.adjustOxyLoss(-3)
revive_cost += 5
if(prob(75) && owner.getBruteLoss())
- owner.adjustBruteLoss(-1)
- revive_cost += 20
+ owner.adjustBruteLoss(-2)
+ revive_cost += 15
if(prob(75) && owner.getFireLoss())
- owner.adjustFireLoss(-1)
- revive_cost += 20
+ owner.adjustFireLoss(-2)
+ revive_cost += 15
if(prob(40) && owner.getToxLoss())
owner.adjustToxLoss(-1)
- revive_cost += 50
+ revive_cost += 25
/obj/item/organ/internal/cyberimp/chest/reviver/emp_act(severity)