mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Adds a metric assload of sounds.
This commit is contained in:
@@ -57,7 +57,7 @@
|
||||
//closing the doors on red and opening on green provides a bit of hysteresis that will hopefully prevent fire doors from opening and closing repeatedly due to noise
|
||||
if (danger_level < 1 || danger_level >= 2)
|
||||
firedoors_update()
|
||||
|
||||
|
||||
for (var/obj/machinery/alarm/AA in src)
|
||||
AA.update_icon()
|
||||
|
||||
@@ -274,7 +274,7 @@ var/list/mob/living/forced_ambiance_list = new
|
||||
return // Being buckled to something solid keeps you in place.
|
||||
if(istype(H.shoes, /obj/item/clothing/shoes/magboots) && (H.shoes.item_flags & NOSLIP))
|
||||
return
|
||||
|
||||
|
||||
if(H.m_intent == "run")
|
||||
H.AdjustStunned(6)
|
||||
H.AdjustWeakened(6)
|
||||
@@ -282,6 +282,7 @@ var/list/mob/living/forced_ambiance_list = new
|
||||
H.AdjustStunned(3)
|
||||
H.AdjustWeakened(3)
|
||||
mob << "<span class='notice'>The sudden appearance of gravity makes you fall to the floor!</span>"
|
||||
playsound(get_turf(src), "bodyfall", 50, 1)
|
||||
|
||||
/area/proc/prison_break()
|
||||
var/obj/machinery/power/apc/theAPC = get_apc()
|
||||
|
||||
@@ -107,6 +107,7 @@
|
||||
else
|
||||
var/B_held = B.wrapped
|
||||
user << "You use \the [B] to use \the [B_held] with \the [src]."
|
||||
playsound(src, "keyboard", 100, 1, 0)
|
||||
return
|
||||
attack_hand(user)
|
||||
return
|
||||
@@ -394,14 +394,14 @@
|
||||
/obj/mecha/proc/mechstep(direction)
|
||||
var/result = step(src,direction)
|
||||
if(result)
|
||||
playsound(src,'sound/mecha/mechstep.ogg',40,1)
|
||||
playsound(src,"mechstep",40,1)
|
||||
return result
|
||||
|
||||
|
||||
/obj/mecha/proc/mechsteprand()
|
||||
var/result = step_rand(src)
|
||||
if(result)
|
||||
playsound(src,'sound/mecha/mechstep.ogg',40,1)
|
||||
playsound(src,"mechstep",40,1)
|
||||
return result
|
||||
|
||||
/obj/mecha/Bump(var/atom/obstacle)
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
#define SPACE UNDERWATER
|
||||
|
||||
var/list/shatter_sound = list('sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg')
|
||||
var/list/explosion_sound = list('sound/effects/Explosion1.ogg','sound/effects/Explosion2.ogg')
|
||||
var/list/spark_sound = list('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks4.ogg')
|
||||
var/list/explosion_sound = list('sound/effects/Explosion1.ogg','sound/effects/Explosion2.ogg','sound/effects/Explosion3.ogg','sound/effects/Explosion4.ogg','sound/effects/Explosion5.ogg','sound/effects/Explosion6.ogg')
|
||||
var/list/spark_sound = list('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks5.ogg','sound/effects/sparks6.ogg','sound/effects/sparks7.ogg')
|
||||
var/list/rustle_sound = list('sound/effects/rustle1.ogg','sound/effects/rustle2.ogg','sound/effects/rustle3.ogg','sound/effects/rustle4.ogg','sound/effects/rustle5.ogg')
|
||||
var/list/punch_sound = list('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg')
|
||||
var/list/clown_sound = list('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg')
|
||||
@@ -46,6 +46,12 @@ var/list/swing_hit_sound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genh
|
||||
var/list/hiss_sound = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
|
||||
var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg')
|
||||
var/list/fracture_sound = list('sound/effects/bonebreak1.ogg','sound/effects/bonebreak2.ogg','sound/effects/bonebreak3.ogg','sound/effects/bonebreak4.ogg')
|
||||
var/list/casing_sound = list ('sound/weapons/casingfall1.ogg','sound/weapons/casingfall2.ogg','sound/weapons/casingfall3.ogg')
|
||||
var/list/keyboard_sound = list ('sound/effects/keyboard/keyboard1.ogg','sound/effects/keyboard/keyboard2.ogg','sound/effects/keyboard/keyboard3.ogg', 'sound/effects/keyboard/keyboard4.ogg')
|
||||
var/list/mechstep_sound = list('sound/mecha/mechstep1.ogg', 'sound/mecha/mechstep2.ogg')
|
||||
var/list/bodyfall_sound = list('sound/effects/bodyfall1.ogg','sound/effects/bodyfall2.ogg','sound/effects/bodyfall3.ogg','sound/effects/bodyfall4.ogg')
|
||||
var/list/can_sound = list('sound/effects/can_open1.ogg','sound/effects/can_open2.ogg','sound/effects/can_open3.ogg','sound/effects/can_open4.ogg')
|
||||
|
||||
//var/list/gun_sound = list('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
|
||||
|
||||
/proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, var/is_global, var/frequency)
|
||||
@@ -177,5 +183,7 @@ var/const/FALLOFF_SOUNDS = 0.5
|
||||
if ("hiss") soundin = pick(hiss_sound)
|
||||
if ("pageturn") soundin = pick(page_sound)
|
||||
if ("fracture") soundin = pick(fracture_sound)
|
||||
if ("canopen") soundin = pick(can_sound)
|
||||
if ("mechstep") soundin = pick(mechstep_sound)
|
||||
//if ("gunshot") soundin = pick(gun_sound)
|
||||
return soundin
|
||||
|
||||
@@ -83,6 +83,7 @@
|
||||
switch(handle_casings)
|
||||
if(EJECT_CASINGS) //eject casing onto ground.
|
||||
chambered.loc = get_turf(src)
|
||||
playsound(src.loc, "casing", 50, 1)
|
||||
if(CYCLE_CASINGS) //cycle the casing back to the end.
|
||||
if(ammo_magazine)
|
||||
ammo_magazine.stored_ammo += chambered
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
open(user)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/proc/open(mob/user)
|
||||
playsound(loc,'sound/effects/canopen.ogg', rand(10,50), 1)
|
||||
playsound(loc,"canopen", rand(10,50), 1)
|
||||
user << "<span class='notice'>You open [src] with an audible pop!</span>"
|
||||
flags |= OPENCONTAINER
|
||||
|
||||
|
||||
36
html/changelogs/Belsima-Sounds.yml
Normal file
36
html/changelogs/Belsima-Sounds.yml
Normal file
@@ -0,0 +1,36 @@
|
||||
################################
|
||||
# Example Changelog File
|
||||
#
|
||||
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||
#
|
||||
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||
# When it is, any changes listed below will disappear.
|
||||
#
|
||||
# Valid Prefixes:
|
||||
# bugfix
|
||||
# wip (For works in progress)
|
||||
# tweak
|
||||
# soundadd
|
||||
# sounddel
|
||||
# rscadd (general adding of nice things)
|
||||
# rscdel (general deleting of nice things)
|
||||
# imageadd
|
||||
# imagedel
|
||||
# maptweak
|
||||
# spellcheck (typo fixes)
|
||||
# experiment
|
||||
#################################
|
||||
|
||||
# Your name.
|
||||
author: Belsima
|
||||
|
||||
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||
delete-after: True
|
||||
|
||||
# Any changes you've made. See valid prefix list above.
|
||||
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||
# SCREW THIS UP AND IT WON'T WORK.
|
||||
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||
changes:
|
||||
- soundadd: "Added a variety of sounds for opening cans, explosions, sparks, falling down, mechs, and bullet casings."
|
||||
BIN
sound/effects/Explosion3.ogg
Normal file
BIN
sound/effects/Explosion3.ogg
Normal file
Binary file not shown.
BIN
sound/effects/Explosion4.ogg
Normal file
BIN
sound/effects/Explosion4.ogg
Normal file
Binary file not shown.
BIN
sound/effects/Explosion5.ogg
Normal file
BIN
sound/effects/Explosion5.ogg
Normal file
Binary file not shown.
BIN
sound/effects/Explosion6.ogg
Normal file
BIN
sound/effects/Explosion6.ogg
Normal file
Binary file not shown.
BIN
sound/effects/bodyfall1.ogg
Normal file
BIN
sound/effects/bodyfall1.ogg
Normal file
Binary file not shown.
BIN
sound/effects/bodyfall2.ogg
Normal file
BIN
sound/effects/bodyfall2.ogg
Normal file
Binary file not shown.
BIN
sound/effects/bodyfall3.ogg
Normal file
BIN
sound/effects/bodyfall3.ogg
Normal file
Binary file not shown.
BIN
sound/effects/bodyfall4.ogg
Normal file
BIN
sound/effects/bodyfall4.ogg
Normal file
Binary file not shown.
BIN
sound/effects/can_open1.ogg
Normal file
BIN
sound/effects/can_open1.ogg
Normal file
Binary file not shown.
BIN
sound/effects/can_open2.ogg
Normal file
BIN
sound/effects/can_open2.ogg
Normal file
Binary file not shown.
BIN
sound/effects/can_open3.ogg
Normal file
BIN
sound/effects/can_open3.ogg
Normal file
Binary file not shown.
BIN
sound/effects/keyboard/keyboard1.ogg
Normal file
BIN
sound/effects/keyboard/keyboard1.ogg
Normal file
Binary file not shown.
BIN
sound/effects/keyboard/keyboard2.ogg
Normal file
BIN
sound/effects/keyboard/keyboard2.ogg
Normal file
Binary file not shown.
BIN
sound/effects/keyboard/keyboard3.ogg
Normal file
BIN
sound/effects/keyboard/keyboard3.ogg
Normal file
Binary file not shown.
BIN
sound/effects/keyboard/keyboard4.ogg
Normal file
BIN
sound/effects/keyboard/keyboard4.ogg
Normal file
Binary file not shown.
BIN
sound/effects/sparks5.ogg
Normal file
BIN
sound/effects/sparks5.ogg
Normal file
Binary file not shown.
BIN
sound/effects/sparks6.ogg
Normal file
BIN
sound/effects/sparks6.ogg
Normal file
Binary file not shown.
BIN
sound/effects/sparks7.ogg
Normal file
BIN
sound/effects/sparks7.ogg
Normal file
Binary file not shown.
BIN
sound/mecha/mechstep1.ogg
Normal file
BIN
sound/mecha/mechstep1.ogg
Normal file
Binary file not shown.
BIN
sound/mecha/mechstep2.ogg
Normal file
BIN
sound/mecha/mechstep2.ogg
Normal file
Binary file not shown.
BIN
sound/weapons/casingfall1.ogg
Normal file
BIN
sound/weapons/casingfall1.ogg
Normal file
Binary file not shown.
BIN
sound/weapons/casingfall2.ogg
Normal file
BIN
sound/weapons/casingfall2.ogg
Normal file
Binary file not shown.
BIN
sound/weapons/casingfall3.ogg
Normal file
BIN
sound/weapons/casingfall3.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user