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

Merge pull request #30112 from YPOQ/toysoundfix

Browse Source 
Fixes sounds for toy nuke, red button, and talking action figures
This commit is contained in:
Leo
2017-08-24 08:57:02 -03:00
committed by GitHub
parent 5a5307c6d8 6bad54226b
commit aa0844a578
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toys.dm
+2 -2
View File
@@ -959,7 +959,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)
@@ -1028,7 +1028,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