From 79805c8cbeef4dd5be9852f21d7bea027e85bfc5 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 3 Mar 2017 18:19:39 -0500 Subject: [PATCH] Adds *mlem and *awoo YOU. MAKE. ME. ***SICK.*** That you somehow convinced me to do this. --- code/modules/mob/living/carbon/human/emote.dm | 1 + code/modules/mob/living/carbon/human/emote_vr.dm | 16 ++++++++++++++++ vorestation.dme | 1 + 3 files changed, 18 insertions(+) create mode 100644 code/modules/mob/living/carbon/human/emote_vr.dm diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 56e71d931a0..e926c10185a 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -18,6 +18,7 @@ if(src.stat == 2.0 && (act != "deathgasp")) return + if(attempt_vr(src,"emote_vr",list(act,m_type,message))) return //VOREStation Add - Custom Emote Handler switch(act) if ("airguitar") diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm new file mode 100644 index 00000000000..c7a028039b5 --- /dev/null +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -0,0 +1,16 @@ +/mob/living/carbon/human/emote_vr(var/act,var/m_type=1,var/message = null) + + switch(act) + if ("mlem") + message = "mlems their tongue up over their nose. Mlem." + m_type = 1 + if ("awoo") + message = "awoos loudly. AwoooOOOOoooo!" + m_type = 2 + + if (message) + log_emote("[name]/[key] : [message]") + custom_emote(m_type,message) + return 1 + + return 0 diff --git a/vorestation.dme b/vorestation.dme index 9b928585116..eafce1bda3c 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1661,6 +1661,7 @@ #include "code\modules\mob\living\carbon\human\appearance.dm" #include "code\modules\mob\living\carbon\human\death.dm" #include "code\modules\mob\living\carbon\human\emote.dm" +#include "code\modules\mob\living\carbon\human\emote_vr.dm" #include "code\modules\mob\living\carbon\human\examine.dm" #include "code\modules\mob\living\carbon\human\examine_vr.dm" #include "code\modules\mob\living\carbon\human\human.dm"