From 4a36c1399cc16f92dfc1bcd8ab860282cde4dfc2 Mon Sep 17 00:00:00 2001 From: Name Date: Fri, 8 Mar 2019 06:24:23 -0500 Subject: [PATCH] Hands now kill brains as hard as everything else --- code/__DEFINES/combat.dm | 2 +- code/modules/client/verbs/suicide.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 46d46f64fd3..b67a326a62c 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -18,7 +18,7 @@ #define OXYLOSS (1<<3) #define SHAME (1<<4) #define MANUAL_SUICIDE (1<<5) //suicide_act will do the actual killing. -#define MANUAL_SUICIDE_NONLETHAL (1<<6) +#define MANUAL_SUICIDE_NONLETHAL (1<<6) //when the suicide is conditionally lethal #define EFFECT_STUN "stun" #define EFFECT_KNOCKDOWN "knockdown" diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index e8f1558c5d9..a8dfa31b9bf 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -105,6 +105,7 @@ visible_message("[suicide_message]", "[suicide_message]") + set_suicide(TRUE) suicide_log() adjustOxyLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0))