From a7dfd41335b342f10bdead98656ac29605db9650 Mon Sep 17 00:00:00 2001 From: Spartan6 Date: Thu, 27 Dec 2018 23:35:59 +0000 Subject: [PATCH] Adds better glowstick and flare usage sounds. --- code/game/objects/items/devices/flashlight.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 042e4f0bd97..082958e34bc 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -11,6 +11,7 @@ actions_types = list(/datum/action/item_action/toggle_light) var/on = FALSE var/brightness_on = 4 //luminosity when on + var/togglesound = 'sound/weapons/empty.ogg' /obj/item/flashlight/Initialize() . = ..() @@ -35,7 +36,7 @@ return 0 on = !on - playsound(user, 'sound/weapons/empty.ogg', 100, 1) + playsound(user, togglesound, 100, 1) update_brightness(user) for(var/X in actions) var/datum/action/A = X @@ -158,6 +159,7 @@ obj/item/flashlight/lamp/bananalamp light_color = "#ff0000" // changed colour to a more brighter red. icon_state = "flare" item_state = "flare" + togglesound = 'sound/goonstation/misc/matchstick_light.ogg' var/fuel = 0 var/on_damage = 7 var/produce_heat = 1500 @@ -311,6 +313,7 @@ obj/item/flashlight/lamp/bananalamp color = LIGHT_COLOR_GREEN icon_state = "glowstick" item_state = "glowstick" + togglesound = 'sound/effects/bone_break_1.ogg' var/fuel = 0 var/fuel_lower = 1600 var/fuel_upp = 2000