From 28ea1f720b1f8b39dcdc00f88013c210947a50ce Mon Sep 17 00:00:00 2001
From: skoglol <33292112+kriskog@users.noreply.github.com>
Date: Thu, 27 May 2021 13:34:20 +0200
Subject: [PATCH] Stops giving you organ damage messages if you arent conscious
 (#59311)

---
 code/modules/reagents/withdrawal/generic_addictions.dm | 3 +++
 code/modules/surgery/organs/organ_internal.dm          | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/reagents/withdrawal/generic_addictions.dm b/code/modules/reagents/withdrawal/generic_addictions.dm
index f00b504ee64..f08d9bd756e 100644
--- a/code/modules/reagents/withdrawal/generic_addictions.dm
+++ b/code/modules/reagents/withdrawal/generic_addictions.dm
@@ -217,6 +217,9 @@
 		return
 	if(DT_PROB(65, delta_time))
 		return
+	if(affected_carbon.stat >= SOFT_CRIT)
+		return
+
 	var/obj/item/organ/organ = pick(affected_carbon.internal_organs)
 	if(organ.low_threshold)
 		to_chat(affected_carbon, organ.low_threshold_passed)
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 46ed4655f01..e6484788f18 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -172,7 +172,7 @@
 	damage = clamp(damage + damage_amount, 0, maximum)
 	var/mess = check_damage_thresholds(owner)
 	prev_damage = damage
-	if(mess && owner)
+	if(mess && owner.stat <= SOFT_CRIT)
 		to_chat(owner, mess)
 
 ///SETS an organ's damage to the amount "damage_amount", and in doing so clears or sets the failing flag, good for when you have an effect that should fix an organ if broken