From aad7bcd01822f442a3867db2ac0df74b455585db Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Wed, 29 Dec 2010 04:31:13 +0000 Subject: [PATCH] Cyborgs now have a death emote, so people know when to stop beating them up. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@733 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/silicon/robot/death.dm | 2 ++ code/modules/mob/living/silicon/robot/emote.dm | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/code/modules/mob/living/silicon/robot/death.dm b/code/modules/mob/living/silicon/robot/death.dm index 5e2fa67b11..a31590247e 100644 --- a/code/modules/mob/living/silicon/robot/death.dm +++ b/code/modules/mob/living/silicon/robot/death.dm @@ -1,5 +1,7 @@ /mob/living/silicon/robot/death(gibbed) var/cancel + if (!gibbed) + src.emote("deathgasp") src.stat = 2 src.canmove = 0 diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 9c7626f1b7..dd5e96dfcc 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -79,6 +79,10 @@ message = "[src] nods." m_type = 1 + if ("deathgasp") + message = "[src] shudders violently for a moment, then becomes motionless, its eyes slowly darkening." + m_type = 1 + if ("glare") var/M = null if (param)