From 72b37df79e068fef87d294436d82d2997c003c42 Mon Sep 17 00:00:00 2001 From: Neerti Date: Tue, 16 Apr 2019 19:32:00 -0400 Subject: [PATCH] Merge pull request #6091 from Heroman3003/yes-ye-yess Fixes *yes --- code/modules/mob/living/carbon/human/emote.dm | 6 +++--- code/modules/mob/living/silicon/robot/emote.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 9ed303732b..a8fd5176e8 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -30,7 +30,7 @@ m_type = 1 //Machine-only emotes - if("ping", "beep", "buzz", "yes", "no", "rcough", "rsneeze") + if("ping", "beep", "buzz", "yes", "ye", "no", "rcough", "rsneeze") if(!isSynthetic()) src << "You are not a synthetic." @@ -53,7 +53,7 @@ else if(act == "ping") display_msg = "pings" use_sound = 'sound/machines/ping.ogg' - else if(act == "yes") + else if(act == "yes" || act == "ye") display_msg = "emits an affirmative blip" use_sound = 'sound/machines/synth_yes.ogg' else if(act == "no") @@ -729,7 +729,7 @@ src << "blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, cry, custom, deathgasp, drool, eyebrow, fastsway/qwag, \ frown, gasp, giggle, glare-(none)/mob, grin, groan, grumble, handshake, hug-(none)/mob, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, \ raise, salute, scream, sneeze, shake, shiver, shrug, sigh, signal-#1-10, slap-(none)/mob, smile, sneeze, sniff, snore, stare-(none)/mob, stopsway/swag, sway/wag, swish, tremble, twitch, \ - twitch_v, vomit, whimper, wink, yawn. Synthetics: beep, buzz, yess, no, rcough, rsneeze, ping" + twitch_v, vomit, whimper, wink, yawn. Synthetics: beep, buzz, yes, no, rcough, rsneeze, ping" else src << "Unusable emote '[act]'. Say *help for a list." diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 7e73eb7e4c..fbf5d1db58 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -185,7 +185,7 @@ playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) m_type = 1 - if("yes") + if("yes", "ye") var/M = null if(param) for (var/mob/A in view(null, null))