From ec90b208629977a132590aeae58225edb41a906b Mon Sep 17 00:00:00 2001 From: cebutris Date: Sun, 4 Jun 2017 13:20:08 -0400 Subject: [PATCH 1/3] oof --- code/modules/mob/living/emote.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index cacd433fec..eb0c7094c3 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -87,6 +87,7 @@ message_larva = "lets out a sickly hiss of air and falls limply to the floor..." message_monkey = "lets out a faint chimper as it collapses and stops moving..." message_simple = "stops moving..." + playsound(user.loc, 'sound/voice/oof.ogg', 80, 1, 1) //Defenitley not copypasta stat_allowed = UNCONSCIOUS /datum/emote/living/deathgasp/run_emote(mob/user, params) From 12790a5422378c1a85cc858a2882171edd82a077 Mon Sep 17 00:00:00 2001 From: cebutris Date: Sun, 4 Jun 2017 13:22:29 -0400 Subject: [PATCH 2/3] i swear I added this the first time --- sound/voice/oof.ogg | Bin 0 -> 9714 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sound/voice/oof.ogg diff --git a/sound/voice/oof.ogg b/sound/voice/oof.ogg new file mode 100644 index 0000000000000000000000000000000000000000..dd0e7edee6fd66e940e911454b8cd066de3f6d27 GIT binary patch literal 9714 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 Date: Mon, 5 Jun 2017 03:37:25 -0400 Subject: [PATCH 3/3] it actually works now --- code/modules/mob/living/emote.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index eb0c7094c3..a894bad825 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -87,7 +87,6 @@ message_larva = "lets out a sickly hiss of air and falls limply to the floor..." message_monkey = "lets out a faint chimper as it collapses and stops moving..." message_simple = "stops moving..." - playsound(user.loc, 'sound/voice/oof.ogg', 80, 1, 1) //Defenitley not copypasta stat_allowed = UNCONSCIOUS /datum/emote/living/deathgasp/run_emote(mob/user, params) @@ -96,6 +95,7 @@ message_simple = S.deathmessage . = ..() message_simple = initial(message_simple) + playsound(user.loc, 'sound/voice/oof.ogg', 80, 1, 1)//Defenitley not copypasta if(. && isalienadult(user)) playsound(user.loc, 'sound/voice/hiss6.ogg', 80, 1, 1)