From fffe211c8f94ca834a5246310c4770b00baea99d Mon Sep 17 00:00:00 2001 From: datlo Date: Sun, 20 Jan 2019 12:22:09 +0000 Subject: [PATCH] readd deathgasping to human/borgs --- code/modules/mob/living/carbon/human/death.dm | 3 +++ code/modules/mob/living/silicon/robot/death.dm | 3 +++ 2 files changed, 6 insertions(+) diff --git a/code/modules/mob/living/carbon/human/death.dm b/code/modules/mob/living/carbon/human/death.dm index 3ea69adea15..7259a455154 100644 --- a/code/modules/mob/living/carbon/human/death.dm +++ b/code/modules/mob/living/carbon/human/death.dm @@ -92,6 +92,9 @@ return TRUE /mob/living/carbon/human/death(gibbed) + if(can_die() && !gibbed && deathgasp_on_death) + emote("deathgasp") //let the world KNOW WE ARE DEAD + // Only execute the below if we successfully died . = ..(gibbed) if(!.) diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index 1ad9389b452..21a09eed8a8 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -49,6 +49,9 @@ /mob/living/silicon/robot/death(gibbed) if(can_die()) + if(!gibbed && deathgasp_on_death) + emote("deathgasp") + if(module) module.handle_death(gibbed)