diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 650677df354..0bee396cd89 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -932,41 +932,43 @@ return if("help") - var/emotelist = "aflap(s), airguitar, blink(s), blink(s)_r, blush(es), bow(s)-(none)/mob, burp(s), choke(s), chuckle(s), clap(s), collapse(s), cough(s),cry, cries, custom, dance, dap(s)(none)/mob," \ - + " deathgasp(s), drool(s), eyebrow, fart(s), faint(s), flap(s), flip(s), frown(s), gasp(s), giggle(s), glare(s)-(none)/mob, grin(s), groan(s), grumble(s), grin(s)," \ - + " handshake-mob, hug(s)-(none)/mob, hem, highfive, johnny, jump, laugh(s), look(s)-(none)/mob, moan(s), mumble(s), nod(s), pale(s), point(s)-atom, quiver(s), raise(s), salute(s)-(none)/mob, scream(s), shake(s)," \ - + " shiver(s), shrug(s), sigh(s), signal(s)-#1-10,slap(s)-(none)/mob, smile(s),snap(s), sneeze(s), sniff(s), snore(s), stare(s)-(none)/mob, swag(s), tremble(s), twitch(es), twitch(es)_s," \ - + " wag(s), wave(s), whimper(s), wink(s), yawn(s), quill(s)" + var/emotelist = "aflap(s), airguitar, blink(s), blink(s)_r, blush(es), bow(s)-none/mob, burp(s), choke(s), chuckle(s), clap(s), collapse(s), cough(s), cry, cries, custom, dance, dap(s)-none/mob," \ + + " deathgasp(s), drool(s), eyebrow, fart(s), faint(s), flap(s), flip(s), frown(s), gasp(s), giggle(s), glare(s)-none/mob, grin(s), groan(s), grumble(s), grin(s)," \ + + " handshake-mob, hug(s)-none/mob, hem, highfive, johnny, jump, laugh(s), look(s)-none/mob, moan(s), mumble(s), nod(s), pale(s), point(s)-atom, quiver(s), raise(s), salute(s)-none/mob, scream(s), shake(s)," \ + + " shiver(s), shrug(s), sigh(s), signal(s)-#1-10,slap(s)-none/mob, smile(s),snap(s), sneeze(s), sniff(s), snore(s), stare(s)-none/mob, tremble(s), twitch(es), twitch(es)_s," \ + + " wave(s), whimper(s), wink(s), yawn(s)" switch(dna.species.name) - if("Drask") - emotelist += "\nDrask specific emotes :- drone(s)-(none)/mob, hum(s)-(none)/mob, rumble(s)-(none)/mob" - if("Kidan") - emotelist += "\nKidan specific emotes :- click(s), clack(s)" - if("Unathi") - emotelist += "\nUnathi specific emotes :- hiss(es)" - if("Vulpkanin") - emotelist += "\nVulpkanin specific emotes :- growl(s)-none/mob, howl(s)-none/mob" - if("Vox") - emotelist += "\nVox specific emotes :- quill(s)" if("Diona") - emotelist += "\nDiona specific emotes :- creak(s)" + emotelist += "\nDiona specific emotes :- creak(s)" + if("Drask") + emotelist += "\nDrask specific emotes :- drone(s)-none/mob, hum(s)-none/mob, rumble(s)-none/mob" + if("Kidan") + emotelist += "\nKidan specific emotes :- click(s), clack(s)" if("Skrell") - emotelist += "\nSkrell specific emotes :- warble(s)" + emotelist += "\nSkrell specific emotes :- warble(s)" + if("Tajaran") + emotelist += "\nTajaran specifc emotes :- wag(s), swag(s)" + if("Unathi") + emotelist += "\nUnathi specific emotes :- wag(s), swag(s), hiss(es)" + if("Vox") + emotelist += "\nVox specific emotes :- wag(s), swag(s), quill(s)" + if("Vulpkanin") + emotelist += "\nVulpkanin specific emotes :- wag(s), swag(s), growl(s)-none/mob, howl(s)-none/mob" if(ismachineperson(src)) - emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob, buzz2-(none)/mob" + emotelist += "\nMachine specific emotes :- beep(s)-none/mob, buzz(es)-none/mob, no-none/mob, ping(s)-none/mob, yes-none/mob, buzz2-none/mob" else var/obj/item/organ/external/head/H = get_organ("head") // If you have a robotic head, you can make beep-boop noises if(H && H.is_robotic()) - emotelist += "\nRobotic head specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob, buzz2-(none)/mob" + emotelist += "\nRobotic head specific emotes :- beep(s)-none/mob, buzz(es)-none/mob, no-none/mob, ping(s)-none/mob, yes-none/mob, buzz2-none/mob" if(isslimeperson(src)) - emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob" + emotelist += "\nSlime people specific emotes :- squish(es)-none/mob" else for(var/obj/item/organ/external/L in bodyparts) // if your limbs are squishy you can squish too! if(istype(L.dna.species, /datum/species/slime)) - emotelist += "\nSlime people body part specific emotes :- squish(es)-(none)/mob" + emotelist += "\nSlime people body part specific emotes :- squish(es)-none/mob" break to_chat(src, emotelist)