cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 16:13:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gives synthetics a more irritated buzz noise. (#4561)

Browse Source 
* Adds the ability to make the sad trombone noise for synthetics.

Also moves the sound file itself into the sound/machines folder.

* No wait I can't do that

Moves the sadtrombone noise back to where it came from.

* Changes the sad trombone to buzz-two

Do I win a prize
This commit is contained in:
Tom Heeren
2016-06-12 01:30:49 -05:00
committed by Fox McCloud
parent ab1f40481d
commit 4e31600491
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/emote.dm
+7 -2
View File
@@ -28,8 +28,8 @@
act = lowertext(act)
switch(act)
//Cooldown-inducing emotes
if("ping", "pings", "buzz", "buzzes", "beep", "beeps", "yes", "no")
if (species.name == "Machine") //Only Machines can beep, ping, and buzz
if("ping", "pings", "buzz", "buzzes", "beep", "beeps", "yes", "no", "buzz2")
if (species.name == "Machine") //Only Machines can beep, ping, and buzz, yes, no, and make a silly sad trombone noise.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
else //Everyone else fails, skip the emote attempt
return
@@ -86,6 +86,11 @@
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
m_type = 2
if("buzz2")
message = "<B>[src]</B> emits an irritated buzzing sound."
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
m_type = 2
if("buzz", "buzzes")
var/M = null
if(param)
code/modules/mob/living/silicon/emote.dm
+8 -2
View File
@@ -13,7 +13,7 @@
//Cooldown-inducing emotes
if("scream", "screams")
on_CD = handle_emote_CD(50) //longer cooldown
if("ping","pings","buzz","buzzs","buzzes","beep","beeps","yes","no")
if("ping","pings","buzz","buzzs","buzzes","beep","beeps","yes","no", "buzz2")
//halt is exempt because it's used to stop criminal scum //WHOEVER THOUGHT THAT WAS A GOOD IDEA IS GOING TO GET SHOT.
on_CD = handle_emote_CD() //proc located in code\modules\mob\emote.dm
//Everything else, including typos of the above emotes
@@ -115,7 +115,13 @@
playsound(src.loc, 'sound/goonstation/voice/robot_scream.ogg', 80, 0)
m_type = 2
if("buzz2")
message = "<B>[src]</B> emits an irritated buzzing sound."
playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 0)
m_type = 2
if("help")
to_chat(src, "yes, no, beep, ping, buzz")
to_chat(src, "yes, no, beep, ping, buzz, scream, buzz2")
..(act, m_type, message)