Merge pull request #10643 from KorPhaeron/soundfix

Fixes sounds cutting out halfway
This commit is contained in:
Remie Richards
2015-07-18 00:03:23 +01:00
2 changed files with 7 additions and 6 deletions
+1 -1
View File
@@ -11,7 +11,7 @@
var/alt_desc = null
var/toggle_message = null
var/alt_toggle_message = null
var/activation_sound = null
var/active_sound = null
var/toggle_cooldown = null
var/cooldown = 0
var/obj/item/device/flashlight/F = null
+6 -5
View File
@@ -66,9 +66,10 @@
icon_state = "[initial(icon_state)]up"
usr << "[alt_toggle_message] \the [src]"
usr.update_inv_head(0)
while(up)
playsound(src.loc, "[activation_sound]", 100, 0, 4)
sleep(15)
if(active_sound)
while(up)
playsound(src.loc, "[active_sound]", 100, 0, 4)
sleep(15)
/obj/item/clothing/head/helmet/justice
name = "helmet of justice"
@@ -79,8 +80,8 @@
action_button_name = "Toggle Justice Lights"
can_toggle = 1
toggle_cooldown = 20
activation_sound = 'sound/items/WEEOO1.ogg'
active_sound = 'sound/items/WEEOO1.ogg'
/obj/item/clothing/head/helmet/justice/escape
name = "alarm helmet"
desc = "WEEEEOOO. WEEEEEOOO. STOP THAT MONKEY. WEEEOOOO."