From 8d93edfdf426d5ee5110cf3650bf52e91d303e58 Mon Sep 17 00:00:00 2001
From: silicons <2003111+silicons@users.noreply.github.com>
Date: Sun, 5 Feb 2023 09:29:25 -0800
Subject: [PATCH] temporary hotfix* for people screaming while unconscious
(#5032)
---
code/modules/organs/external/_external.dm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/code/modules/organs/external/_external.dm b/code/modules/organs/external/_external.dm
index 4b0f7a597d7..e7d7405f9a4 100644
--- a/code/modules/organs/external/_external.dm
+++ b/code/modules/organs/external/_external.dm
@@ -195,7 +195,8 @@
if(status & ORGAN_BROKEN && brute)
jostle_bone(brute)
- if(organ_can_feel_pain() && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/dogborg/sleeper)) owner.emote("scream") //getting hit on broken hand hurts
+ if(organ_can_feel_pain() && IS_CONSCIOUS(owner) && prob(40) && !isbelly(owner.loc) && !istype(owner.loc, /obj/item/dogborg/sleeper))
+ owner.emote("scream") //getting hit on broken hand hurts
if(used_weapon)
add_autopsy_data("[used_weapon]", brute + burn)
@@ -986,7 +987,7 @@ Note that amputating the affected organ does in fact remove the infection from t
"Something feels like it shattered in your [name]!",\
"You hear a sickening crack.")
jostle_bone()
- if(organ_can_feel_pain() && !isbelly(owner.loc))
+ if(organ_can_feel_pain() && IS_CONSCIOUS(owner) && !isbelly(owner.loc))
INVOKE_ASYNC(owner, /mob/proc/emote, "scream")
playsound(src.loc, "fracture", 10, 1, -2)