cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6091 from Heroman3003/yes-ye-yess

Browse Source 
Fixes *yes
This commit is contained in:
Neerti
2019-04-16 19:32:00 -04:00
committed by VirgoBot
parent c4530b7625
commit 72b37df79e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/mob/living/carbon/human/emote.dm
View File

@@ -30,7 +30,7 @@
m_type = 1 m_type = 1
//Machine-only emotes //Machine-only emotes
if("ping", "beep", "buzz", "yes", "no", "rcough", "rsneeze") if("ping", "beep", "buzz", "yes", "ye", "no", "rcough", "rsneeze")
if(!isSynthetic()) if(!isSynthetic())
src << "<span class='warning'>You are not a synthetic.</span>" src << "<span class='warning'>You are not a synthetic.</span>"
@@ -53,7 +53,7 @@
else if(act == "ping") else if(act == "ping")
display_msg = "pings" display_msg = "pings"
use_sound = 'sound/machines/ping.ogg' use_sound = 'sound/machines/ping.ogg'
else if(act == "yes") else if(act == "yes" || act == "ye")
display_msg = "emits an affirmative blip" display_msg = "emits an affirmative blip"
use_sound = 'sound/machines/synth_yes.ogg' use_sound = 'sound/machines/synth_yes.ogg'
else if(act == "no") 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, \ 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, \ 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, \ 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 else
src << "<font color='blue'>Unusable emote '[act]'. Say *help for a list.</font>" src << "<font color='blue'>Unusable emote '[act]'. Say *help for a list.</font>"

2
code/modules/mob/living/silicon/robot/emote.dm
View File

@@ -185,7 +185,7 @@
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0) playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
m_type = 1 m_type = 1
if("yes") if("yes", "ye")
var/M = null var/M = null
if(param) if(param)
for (var/mob/A in view(null, null)) for (var/mob/A in view(null, null))