From 3ec7fc8c21d728c212f6506c14daf190181beea4 Mon Sep 17 00:00:00 2001
From: Sharkmare <34294231+Sharkmare@users.noreply.github.com>
Date: Thu, 28 Feb 2019 08:56:16 +0100
Subject: [PATCH] Should fix halloss damage spam issue, should also make
halloss interact with painkillers
only display slump if we werent slumped already to prevent spam
No seriously why wasnt this checking for this already REEEE
Also trying to implement painkiller to work for halloss
---
code/modules/mob/living/carbon/human/life.dm | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 65439ec3c1..9ef5e41996 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -950,10 +950,15 @@
adjustBrainLoss(brainOxPercent * oxyloss)
if(halloss >= species.total_health)
- src << "You're in too much pain to keep going..."
- src.visible_message("[src] slumps to the ground, too weak to continue fighting.")
- Paralyse(10)
- setHalLoss(species.total_health - 1)
+ if (chem_effects[CE_PAINKILLER])
+ setHalLoss(species.total_health - 1)
+ else
+ Paralyse(10)
+ setHalLoss(species.total_health - 1)
+ if (!paralysis && !sleeping || !chem_effects[CE_PAINKILLER]) //CHOMPEDIT only display slump if we werent slumped already to prevent spam, sleeping counts as slump state for this matter
+ src << "You're in too much pain to keep going..."
+ src.visible_message("[src] slumps to the ground, too weak to continue fighting.")
+
if(paralysis || sleeping)
blinded = 1