From 8464424c7ee9b7975b153366dd646cb4340402e5 Mon Sep 17 00:00:00 2001 From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com> Date: Mon, 27 Apr 2026 02:12:56 +0200 Subject: [PATCH] Death and Unconscious Messages (#22321) adds a death message, changes the brain damage message to output in the chat, and tweaks the unconscious message to display in a chat examine box. death image brain damage image unconscious image --- code/modules/mob/living/carbon/human/death.dm | 2 ++ code/modules/mob/living/carbon/human/life.dm | 4 ++-- code/modules/organs/internal/brain.dm | 8 ++++---- html/changelogs/SleepyGemmy-death.yml | 7 +++++++ 4 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/SleepyGemmy-death.yml diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 5ff5ff87397..09568fad545 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -28,6 +28,8 @@ if(stat == DEAD) return + to_chat(src, EXAMINE_BLOCK_RED(SPAN_DANGER(FONT_LARGE("You have died.")))) + vr_disconnect() BITSET(hud_updateflag, HEALTH_HUD) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index c95127feae8..e8dc3736706 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -834,11 +834,11 @@ if(paralysis || sleeping || InStasis()) blinded = TRUE if(sleeping && !stat) - species.sleep_msg(src) set_stat(UNCONSCIOUS) + species.sleep_msg(src) if(!sleeping_msg_debounce) sleeping_msg_debounce = TRUE - to_chat(src, SPAN_NOTICE(FONT_LARGE("You are now unconscious.
You will not remember anything you \"see\" happening around you until you regain consciousness."))) + to_chat(src, EXAMINE_BLOCK_BLUE(SPAN_NOTICE(FONT_LARGE("You are now unconscious. You will not remember anything you see, hear, or feel happening around you until you regain consciousness.")))) adjustHalLoss(-3) if (species.tail) diff --git a/code/modules/organs/internal/brain.dm b/code/modules/organs/internal/brain.dm index ede0cefeb89..1b206239f17 100644 --- a/code/modules/organs/internal/brain.dm +++ b/code/modules/organs/internal/brain.dm @@ -242,17 +242,17 @@ /obj/item/organ/internal/brain/proc/handle_severe_brain_damage() set waitfor = FALSE healed_threshold = 0 - to_chat(owner, "Where am I...?") + to_chat(owner, SPAN_NOTICE(FONT_LARGE("Where am I...?"))) owner.Paralyse(20) sleep(5 SECONDS) if(!owner) return - to_chat(owner, "What's going on...?") + to_chat(owner, SPAN_NOTICE(FONT_LARGE("What is going on...?"))) sleep(10 SECONDS) if(!owner) return - to_chat(owner, "What happened...?") - alert(owner.find_mob_consciousness(), "You have taken massive brain damage! You will not be able to remember the events leading up to your injury.", "Brain Damaged") + to_chat(owner, SPAN_NOTICE(FONT_LARGE("What happened...?"))) + to_chat(owner, EXAMINE_BLOCK_RED(SPAN_NOTICE(FONT_LARGE("You have taken massive brain damage. You will not be able to remember the events leading up to your injury.")))) /obj/item/organ/internal/brain/proc/handle_damage_effects() if(owner.stat) diff --git a/html/changelogs/SleepyGemmy-death.yml b/html/changelogs/SleepyGemmy-death.yml new file mode 100644 index 00000000000..cf70b89a89d --- /dev/null +++ b/html/changelogs/SleepyGemmy-death.yml @@ -0,0 +1,7 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - rscadd: "Added a death message." + - rscadd: "Changed the unconscious and brain damage messages to use the chat examine boxes."