From 630949ffac288a67a9acaaa6d0b6fde97e6c3ad0 Mon Sep 17 00:00:00 2001
From: Kepplerx <65926304+Kepplerx@users.noreply.github.com>
Date: Sun, 14 Mar 2021 11:38:34 +0100
Subject: [PATCH] Shaking the dead now gives a message indicating the person is
dead (#15512)
* Shaking the dead now gives a message indicating the person is dead
* Update carbon.dm
* Update carbon.dm
* Revert "Revert "Revert "Update carbon.dm"""
This reverts commit 5e5da7bb6ddba56872a05b0e5c6aaa2c835c1e94.
* Fixing, and adding a check for self waking
Overhaul based on Faries points
---
code/modules/mob/living/carbon/carbon.dm | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 1bbcb62626d..8b0f8961e53 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -212,6 +212,11 @@
swap_hand()
/mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
+ if(stat == DEAD)
+ if(M != src)
+ M.visible_message("[M] desperately shakes [src] trying to wake [p_them()] up, but sadly there is no reaction!", \
+ "You shake [src] trying to wake [p_them()] sadly they appear to be too far gone!")
+ return
if(health >= HEALTH_THRESHOLD_CRIT)
if(src == M && ishuman(src))
check_self_for_injuries()