From c05de92150c933995bb589e012b21dc61bab9cf3 Mon Sep 17 00:00:00 2001 From: KasparoVy <12377767+KasparoVy@users.noreply.github.com> Date: Mon, 25 Nov 2019 02:47:17 -0500 Subject: [PATCH 1/2] Add a Help Prompt (*vhelp) for Virgo-Specific Emotes So you can easily get a list of all fun emotes without code-diving. --- code/modules/mob/living/carbon/human/emote.dm | 2 +- code/modules/mob/living/carbon/human/emote_vr.dm | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 6eaa3a36d8..7a0b6a82ff 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -732,7 +732,7 @@ twitch_v, vomit, whimper, wink, yawn. Synthetics: beep, buzz, yes, no, rcough, rsneeze, ping") else - to_chat(src, "Unusable emote '[act]'. Say *help for a list.") + to_chat(src, "Unusable emote '[act]'. Say *help or *vhelp for a list.") //VOREStation Edit, mention *vhelp for Virgo-specific emotes located in emote_vr.dm. if (message) custom_emote(m_type,message) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 7af30292d1..0934752562 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -35,7 +35,7 @@ message = "peeps like a bird." m_type = 2 playsound(loc, 'sound/voice/peep.ogg', 50, 1, -1) - if("chirp") + if ("chirp") message = "chirps!" playsound(src.loc, 'sound/misc/nymphchirp.ogg', 50, 0) m_type = 2 @@ -75,6 +75,8 @@ src.SpinAnimation(7,1) message = "does a flip!" m_type = 1 + if ("vhelp") //Help for Virgo-specific emotes. + to_chat(src, "vwag, vflap, mlem, awoo, nya, peep, chirp, weh, merp, bark, his, squeak, nsay, nme, flip") if (message) custom_emote(m_type,message) From e77c01645d4372dac252b0391024ab946ccb2e4d Mon Sep 17 00:00:00 2001 From: KasparoVy <12377767+KasparoVy@users.noreply.github.com> Date: Mon, 25 Nov 2019 21:10:54 -0500 Subject: [PATCH 2/2] Correct Spelling of Hiss Emote in Help Message The last S is silent, but that doesn't mean we shouldn't write it. --- code/modules/mob/living/carbon/human/emote_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 0934752562..583483edd6 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -76,7 +76,7 @@ message = "does a flip!" m_type = 1 if ("vhelp") //Help for Virgo-specific emotes. - to_chat(src, "vwag, vflap, mlem, awoo, nya, peep, chirp, weh, merp, bark, his, squeak, nsay, nme, flip") + to_chat(src, "vwag, vflap, mlem, awoo, nya, peep, chirp, weh, merp, bark, hiss, squeak, nsay, nme, flip") if (message) custom_emote(m_type,message)