shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes sounds for toy nuke, red button, and talking action figures (#2475)

Browse Source
This commit is contained in:
CitadelStationBot
2017-08-24 20:31:24 -05:00
committed by kevinz000
parent d5dfe45c1e
commit 3ea2288820
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/toys.dm
View File

@@ -952,7 +952,7 @@
user.visible_message("<span class='warning'>[user] presses a button on [src].</span>", "<span class='notice'>You activate [src], it plays a loud noise!</span>", "<span class='italics'>You hear the click of a button.</span>")
sleep(5)
icon_state = "nuketoy"
playsound(src, 'sound/machines/alarm.ogg', 100, 0, surround = 0)
playsound(src, 'sound/machines/alarm.ogg', 100, 0)
sleep(135)
icon_state = "nuketoycool"
sleep(cooldown - world.time)
@@ -1021,7 +1021,7 @@
if (cooldown < world.time)
cooldown = (world.time + 300) // Sets cooldown at 30 seconds
user.visible_message("<span class='warning'>[user] presses the big red button.</span>", "<span class='notice'>You press the button, it plays a loud noise!</span>", "<span class='italics'>The button clicks loudly.</span>")
playsound(src, 'sound/effects/explosionfar.ogg', 50, 0, surround = 0)
playsound(src, 'sound/effects/explosionfar.ogg', 50, 0)
for(var/mob/M in urange(10, src)) // Checks range
if(!M.stat && !isAI(M)) // Checks to make sure whoever's getting shaken is alive/not the AI
sleep(8) // Short delay to match up with the explosion sound

2
code/modules/chatter/chatter.dm
View File

@@ -38,7 +38,7 @@
var/path = "sound/chatter/[phomeme]_[length].ogg"
playsound(loc, path,
vol = 40, vary = 0, extrarange = 3, falloff = FALSE, surround = 1)
vol = 40, vary = 0, extrarange = 3, falloff = FALSE)
sleep((length + 1) * chatter_get_sleep_multiplier(phomeme))