mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-22 05:17:38 +01:00
Adds more sounds (#2590)
Adds sounds for turning on flashlights, flares, flipping coins, shuffling deck of cards, using lighters and zippos, drills, sonic jackhammers, bikes and some weapon related sounds.
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
action_button_name = "Toggle Flashlight"
|
||||
var/on = 0
|
||||
var/brightness_on = 3 //luminosity when on
|
||||
var/activation_sound = 'sound/items/flashlight.ogg'
|
||||
|
||||
/obj/item/device/flashlight/Initialize()
|
||||
if (on)
|
||||
@@ -36,6 +37,8 @@
|
||||
user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities.
|
||||
return 0
|
||||
on = !on
|
||||
if(on && activation_sound)
|
||||
playsound(src.loc, activation_sound, 75, 1)
|
||||
update_icon()
|
||||
user.update_action_buttons()
|
||||
return 1
|
||||
@@ -185,6 +188,7 @@
|
||||
var/on_damage = 7
|
||||
var/produce_heat = 1500
|
||||
light_wedge = LIGHT_OMNI
|
||||
activation_sound = 'sound/items/flare.ogg'
|
||||
|
||||
/obj/item/device/flashlight/flare/New()
|
||||
fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
|
||||
@@ -260,6 +264,7 @@
|
||||
uv_intensity = 255
|
||||
var/fuel = 0
|
||||
light_wedge = LIGHT_OMNI
|
||||
activation_sound = null
|
||||
|
||||
/obj/item/device/flashlight/glowstick/New()
|
||||
fuel = rand(900, 1200)
|
||||
|
||||
@@ -422,12 +422,16 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
slot_flags = SLOT_BELT
|
||||
attack_verb = list("burnt", "singed")
|
||||
var/base_state
|
||||
var/activation_sound = 'sound/items/lighter_on.ogg'
|
||||
var/desactivation_sound = 'sound/items/lighter_off.ogg'
|
||||
|
||||
/obj/item/weapon/flame/lighter/zippo
|
||||
name = "\improper Zippo lighter"
|
||||
desc = "The zippo."
|
||||
icon_state = "zippo"
|
||||
item_state = "zippo"
|
||||
activation_sound = 'sound/items/zippo_on.ogg'
|
||||
desactivation_sound = 'sound/items/zippo_off.ogg'
|
||||
|
||||
/obj/item/weapon/flame/lighter/random
|
||||
New()
|
||||
@@ -443,6 +447,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
lit = 1
|
||||
icon_state = "[base_state]on"
|
||||
item_state = "[base_state]on"
|
||||
playsound(src.loc, activation_sound, 75, 1)
|
||||
if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
|
||||
user.visible_message("<span class='rose'>Without even breaking stride, [user] flips open and lights [src] in one smooth movement.</span>")
|
||||
else
|
||||
@@ -462,6 +467,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
|
||||
lit = 0
|
||||
icon_state = "[base_state]"
|
||||
item_state = "[base_state]"
|
||||
playsound(src.loc, desactivation_sound, 75, 1)
|
||||
if(istype(src, /obj/item/weapon/flame/lighter/zippo) )
|
||||
user.visible_message("<span class='rose'>You hear a quiet click, as [user] shuts off [src] without even looking at what they're doing.</span>")
|
||||
else
|
||||
|
||||
@@ -32,10 +32,10 @@
|
||||
/obj/item/weapon/melee/chainsword/attack_self(mob/user)
|
||||
active= !active
|
||||
if(active)
|
||||
playsound(user, 'sound/weapons/chainsawhit.ogg', 50, 1)
|
||||
playsound(user, 'sound/weapons/chainsawstart.ogg', 50, 1)
|
||||
user << span("notice", "\The [src] rumbles to life.")
|
||||
force = 35
|
||||
hitsound = 'sound/weapons/chainsawhit.ogg'
|
||||
hitsound = 'sound/weapons/chainsword.ogg'
|
||||
icon_state = "chainswordon"
|
||||
slot_flags = null
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user