cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds more sounds (#2590)

Browse Source 
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:
Alberyk
2017-06-04 13:32:49 +03:00
committed by skull132
parent 27e6b355b7
commit 264b12ce42
41 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/weapon.dm
+2 -1
View File
@@ -101,7 +101,7 @@
if(concealed_blade)
user.visible_message("<span class='warning'>[user] has unsheathed \a [concealed_blade] from \his [src]!</span>", "You unsheathe \the [concealed_blade] from \the [src].")
// Calling drop/put in hands to properly call item drop/pickup procs
playsound(user.loc, 'sound/weapons/flipblade.ogg', 50, 1)
playsound(user.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1)
user.drop_from_inventory(src)
user.put_in_hands(concealed_blade)
user.put_in_hands(src)
@@ -114,6 +114,7 @@
/obj/item/weapon/cane/concealed/attackby(var/obj/item/weapon/canesword/W, var/mob/user)
if(!src.concealed_blade && istype(W))
user.visible_message("<span class='warning'>[user] has sheathed \a [W] into \his [src]!</span>", "You sheathe \the [W] into \the [src].")
playsound(user.loc, 'sound/weapons/blade_sheath.ogg', 50, 1)
user.drop_from_inventory(W)
W.loc = src
src.concealed_blade = W
code/game/machinery/vending.dm
+1
View File
@@ -566,6 +566,7 @@
if (src.icon_vend) //Show the vending animation if needed
flick(src.icon_vend,src)
spawn(src.vend_delay)
playsound(src.loc, 'sound/machines/vending.ogg', 35, 1)
new R.product_path(get_turf(src))
src.status_message = ""
src.status_error = 0
code/game/objects/items/devices/flashlight.dm
+5
View File
@@ -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)
code/game/objects/items/weapons/cigs_lighters.dm
+6
View File
@@ -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
code/game/objects/items/weapons/melee/misc.dm
+2 -2
View File
@@ -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
code/modules/games/cards.dm
+2 -1
View File
@@ -154,6 +154,7 @@
newcards += P
cards -= P
cards = newcards
playsound(src.loc, 'sound/items/cardshuffle.ogg', 100, 1, -4)
user.visible_message("\The [user] shuffles [src].")
/obj/item/weapon/deck/MouseDrop(atom/over)
@@ -302,4 +303,4 @@
update_icon()
/obj/item/weapon/hand/pickup(mob/user as mob)
src.update_icon()
src.update_icon()
code/modules/mining/coins.dm
+1
View File
@@ -77,5 +77,6 @@
comment = "tails"
else if(result == 2)
comment = "heads"
playsound(src.loc, 'sound/items/coinflip.ogg', 100, 1, -4)
user.visible_message("<span class='notice'>[user] has thrown \the [src]. It lands on [comment]! </span>", \
"<span class='notice'>You throw \the [src]. It lands on [comment]! </span>")
code/modules/mining/mine_items.dm
+4 -4
View File
@@ -212,7 +212,7 @@
desc = "Yours is the drill that will pierce through the rock walls."
drill_verb = "drilling"
autodrill = 1
drill_sound = 'sound/weapons/circsawhit.ogg'
drill_sound = 'sound/weapons/drill.ogg'
digspeed = 20
digspeed_unwielded = 30
force_unwielded = 15.0
@@ -231,7 +231,7 @@
desc = "Cracks rocks with sonic blasts, perfect for killing cave lizards."
drill_verb = "hammering"
autodrill = 1
drill_sound = 'sound/weapons/resonator_blast.ogg'
drill_sound = 'sound/weapons/sonic_jackhammer.ogg'
digspeed = 15
digspeed_unwielded = 15
force_unwielded = 25.0
@@ -276,7 +276,7 @@
desc = "Yours is the drill that will pierce the heavens!"
drill_verb = "drilling"
autodrill = 1
drill_sound = 'sound/weapons/circsawhit.ogg'
drill_sound = 'sound/weapons/drill.ogg'
excavation_amount = 100
can_wield = 0
@@ -297,7 +297,7 @@
desc = ""
drill_verb = "drilling"
autodrill = 1
drill_sound = 'sound/weapons/circsawhit.ogg'
drill_sound = 'sound/weapons/drill.ogg'
can_wield = 0
force = 15.0
excavation_amount = 100
code/modules/projectiles/guns/energy/special.dm
+1 -1
View File
@@ -253,7 +253,7 @@
if(!wielded)
user << "<span class='danger'>You cannot fire this weapon with just one hand!</span>"
return 0
playsound(src, 'sound/weapons/chainsawhit.ogg', 90, 1)
playsound(src, 'sound/weapons/chainsawstart.ogg', 90, 1)
user.visible_message(
"<span class='danger'>\The [user] begins spinning [src]'s barrels!</span>",
"<span class='danger'>You begin spinning [src]'s barrels!</span>",
code/modules/projectiles/guns/launcher/grenade_launcher.dm
+2 -2
View File
@@ -6,7 +6,7 @@
w_class = 4
force = 10
fire_sound = 'sound/weapons/empty.ogg'
fire_sound = 'sound/weapons/grenadelaunch.ogg'
fire_sound_text = "a metallic thunk"
recoil = 0
throw_distance = 7
@@ -113,4 +113,4 @@
user.visible_message("[user] removes \a [chambered] from [src].", "<span class='notice'>You remove \a [chambered] from [src].</span>")
chambered = null
else
user << "<span class='warning'>[src] is empty.</span>"
user << "<span class='warning'>[src] is empty.</span>"
code/modules/projectiles/guns/projectile/automatic.dm
+4 -1
View File
@@ -95,6 +95,7 @@
origin_tech = list(TECH_COMBAT = 6, TECH_MATERIAL = 1, TECH_ILLEGAL = 4)
slot_flags = SLOT_BACK
load_method = MAGAZINE
fire_sound = 'sound/weapons/rifleshot.ogg'
magazine_type = /obj/item/ammo_magazine/c762
allowed_magazines = list(/obj/item/ammo_magazine/c762)
@@ -222,7 +223,7 @@
slot_flags = SLOT_BACK
ammo_type = "/obj/item/ammo_casing/a762"
allowed_magazines = list(/obj/item/ammo_magazine/a762)
fire_sound = 'sound/weapons/Gunshot_light.ogg'
fire_sound = 'sound/weapons/gunshot_saw.ogg'
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/a762
@@ -284,6 +285,7 @@
load_method = MAGAZINE
magazine_type = /obj/item/ammo_magazine/tommymag
allowed_magazines = list(/obj/item/ammo_magazine/tommymag, /obj/item/ammo_magazine/tommydrum)
fire_sound = 'sound/weapons/tommygun_shoot.ogg'
/obj/item/weapon/gun/projectile/automatic/tommygun/update_icon()
..()
@@ -387,6 +389,7 @@
auto_eject = 1
auto_eject_sound = 'sound/weapons/smg_empty_alarm.ogg'
recoil = 3
fire_sound = 'sound/weapons/shotgun_shoot.ogg'
accuracy = -2
fire_delay = 10
code/modules/projectiles/guns/projectile/improvised.dm
+1
View File
@@ -18,6 +18,7 @@
handle_casings = CYCLE_CASINGS
load_method = SINGLE_CASING
var/fail_chance = 35
fire_sound = 'sound/weapons/shotgun.ogg'
/obj/item/weapon/gun/projectile/shotgun/improvised/special_check(var/mob/living/carbon/human/M)
if(prob(fail_chance))
code/modules/projectiles/guns/projectile/revolver.dm
+2
View File
@@ -8,6 +8,7 @@
handle_casings = CYCLE_CASINGS
max_shells = 7
ammo_type = /obj/item/ammo_casing/a357
fire_sound = 'sound/weapons/revolver_shoot.ogg'
var/chamber_offset = 0 //how many empty chambers in the cylinder until you hit a round
/obj/item/weapon/gun/projectile/revolver/verb/spin_cylinder()
@@ -73,6 +74,7 @@
icon_state = "deckard-empty"
caliber = "38"
ammo_type = /obj/item/ammo_casing/c38
fire_sound = 'sound/weapons/Gunshot_light.ogg'
/obj/item/weapon/gun/projectile/revolver/deckard/update_icon()
..()
code/modules/projectiles/guns/projectile/shotgun.dm
+3
View File
@@ -13,6 +13,7 @@
load_method = SINGLE_CASING|SPEEDLOADER
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
handle_casings = HOLD_CASINGS
fire_sound = 'sound/weapons/shotgun.ogg'
var/recentpump = 0 // to prevent spammage
action_button_name = "Wield rifle"
@@ -67,6 +68,7 @@
origin_tech = list(TECH_COMBAT = 5, TECH_MATERIAL = 2)
max_shells = 7 //match the ammo box capacity, also it can hold a round in the chamber anyways, for a total of 8.
ammo_type = /obj/item/ammo_casing/shotgun
fire_sound = 'sound/weapons/shotgun_shoot.ogg'
/obj/item/weapon/gun/projectile/shotgun/doublebarrel
name = "double-barreled shotgun"
@@ -85,6 +87,7 @@
caliber = "shotgun"
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 1)
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
fire_sound = 'sound/weapons/shotgun.ogg'
burst_delay = 0
firemodes = list(
code/modules/projectiles/guns/projectile/sniper.dm
+2
View File
@@ -18,6 +18,8 @@
scoped_accuracy = 2
var/bolt_open = 0
fire_sound = 'sound/weapons/Gunshot_DMR.ogg'
recoil_wielded = 2
accuracy_wielded = -1
code/modules/vehicles/bike.dm
+3
View File
@@ -39,6 +39,7 @@
if(!on)
turn_on()
src.visible_message("\The [src] rumbles to life.", "You hear something rumble deeply.")
playsound(src, 'sound/misc/bike_start.ogg', 50, 1)
else
turn_off()
src.visible_message("\The [src] putters before turning off.", "You hear something putter slowly.")
@@ -52,11 +53,13 @@
if(kickstand)
src.visible_message("\The [usr] puts up \the [src]'s kickstand.", "You put up \the [src]'s kickstand.", "You hear a thunk.")
playsound(src, 'sound/misc/bike_stand_up.ogg', 50, 1)
else
if(istype(src.loc,/turf/space))
usr << "<span class='warning'>You don't think kickstands work in space...</span>"
return
src.visible_message("\The [usr] puts down \the [src]'s kickstand.", "You put down \the [src]'s kickstand.", "You hear a thunk.")
playsound(src, 'sound/misc/bike_stand_down.ogg', 50, 1)
if(pulledby)
pulledby.stop_pulling()