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

Allowed humanoid FBPs to use the new borg sounds as well. Added entries for "yes" and "no" to the synthetic *help list.

Browse Source
This commit is contained in:
Earthcrusher
2016-01-21 02:48:15 -06:00
parent 41df41e549
commit 1e93d6e408
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@
message = "is strumming the air and headbanging like a safari chimp."
m_type = 1
if("ping", "beep", "buzz")
if("ping", "beep", "buzz", "yes", "no")
if(!isSynthetic())
src << "<span class='warning'>You are not a synthetic.</span>"
@@ -48,6 +48,12 @@
else if(act == "ping")
display_msg = "pings"
use_sound = 'sound/machines/ping.ogg'
else if(act == "yes")
display_msg = "emits an affirmative blip"
use_sound = 'sound/machines/synth_yes.ogg'
else if(act == "no")
display_msg = "emits a negative blip"
use_sound = 'sound/machines/synth_no.ogg'
if (param)
message = "[display_msg] at [param]."

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

@@ -240,7 +240,7 @@
src << "You are not security."
if ("help")
src << "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt"
src << "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt, yes, no"
else
src << "\blue Unusable emote '[act]'. Say *help for a list."