cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-31 09:08:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7393 from GunHog/WhyDidYouBorgTheClown

Browse Source 
More Silicon Emotes!
This commit is contained in:
Swag McYolosteinen
2015-01-29 19:06:19 +01:00
parent 3bb7213d14 2920aa3aa9
commit eafdaae185
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/emote.dm
+29 -4
View File
@@ -30,7 +30,7 @@
else
message = "<B>[src]</B> beeps."
playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
m_type = 1
m_type = 2
if ("bow")
if (!src.buckled)
@@ -63,7 +63,17 @@
else
message = "<B>[src]</B> buzzes."
playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
m_type = 1
m_type = 2
if ("buzz2")
message = "<B>[src]</B> buzzes twice."
playsound(loc, 'sound/machines/buzz-two.ogg', 50, 0)
m_type = 2
if ("chime") //You have mail!
message = "<B>[src]</B> chimes."
playsound(loc, 'sound/machines/chime.ogg', 50, 0)
m_type = 2
if ("clap")
if (!src.restrained())
@@ -107,6 +117,11 @@
else
message = "<B>[src]</B> glares."
if ("honk") //Honk!
message = "<B>[src]</B> honks!"
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
m_type = 2
if ("look")
var/M = null
if (param)
@@ -153,7 +168,12 @@
else
message = "<B>[src]</B> pings."
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 1
m_type = 2
if ("sad") //When words cannot express...
message = "<B>[src]</B> plays a sad trombone."
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 0)
m_type = 2
if ("salute")
if (!src.buckled)
@@ -194,8 +214,13 @@
message = "<B>[src]</B> twitches."
m_type = 1
if ("warn") //HUMAN HARM DETECTED. PLEASE DIE IN AN ORDERLY FASHION.
message = "<B>[src]</B> blares an alarm!"
playsound(loc, 'sound/machines/warning-buzzer.ogg', 50, 0)
m_type = 2
if ("help")
src << "Help for cyborg emotes. You can use these emotes with say \"*emote\":\n\naflap, beep-(none)/mob, bow-(none)/mob, buzz-(none)/mob, clap, custom, deathgasp, flap, glare-(none)/mob, look-(none)/mob, me, nod, ping-(none)/mob, \nsalute-(none)/mob, twitch, twitch_s,"
src << "Help for cyborg emotes. You can use these emotes with say \"*emote\":\n\naflap, beep-(none)/mob, bow-(none)/mob, buzz-(none)/mob,buzz2,chime, clap, custom, deathgasp, flap, glare-(none)/mob, honk, look-(none)/mob, me, nod, ping-(none)/mob, sad, \nsalute-(none)/mob, twitch, twitch_s, warn,"
else
src << "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>"