diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index c4833791343..26c6cced4ef 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -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 diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 6233a560ac9..95abba54f1c 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -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."