diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 6ce2de18d3b..0eb0321f135 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -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 << "The sudden appearance of gravity makes you fall to the floor!"
+ playsound(get_turf(src), "bodyfall", 50, 1)
/area/proc/prison_break()
var/obj/machinery/power/apc/theAPC = get_apc()
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index a75b494ceaa..320e829bead 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -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
\ No newline at end of file
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 6f117b2f3e0..dd3940d4219 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -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)
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 803a6687616..c23614942bc 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -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
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index b3f9984d6a3..f1ff50698f9 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -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
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 163fd1161fb..4146c967c83 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -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 << "You open [src] with an audible pop!"
flags |= OPENCONTAINER
diff --git a/html/changelogs/Belsima-Sounds.yml b/html/changelogs/Belsima-Sounds.yml
new file mode 100644
index 00000000000..bb47a40ce4a
--- /dev/null
+++ b/html/changelogs/Belsima-Sounds.yml
@@ -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."
diff --git a/sound/effects/Explosion3.ogg b/sound/effects/Explosion3.ogg
new file mode 100644
index 00000000000..9182446665a
Binary files /dev/null and b/sound/effects/Explosion3.ogg differ
diff --git a/sound/effects/Explosion4.ogg b/sound/effects/Explosion4.ogg
new file mode 100644
index 00000000000..c81a9f39796
Binary files /dev/null and b/sound/effects/Explosion4.ogg differ
diff --git a/sound/effects/Explosion5.ogg b/sound/effects/Explosion5.ogg
new file mode 100644
index 00000000000..c02afed043f
Binary files /dev/null and b/sound/effects/Explosion5.ogg differ
diff --git a/sound/effects/Explosion6.ogg b/sound/effects/Explosion6.ogg
new file mode 100644
index 00000000000..dfe002e49b9
Binary files /dev/null and b/sound/effects/Explosion6.ogg differ
diff --git a/sound/effects/bodyfall1.ogg b/sound/effects/bodyfall1.ogg
new file mode 100644
index 00000000000..cf217a8e077
Binary files /dev/null and b/sound/effects/bodyfall1.ogg differ
diff --git a/sound/effects/bodyfall2.ogg b/sound/effects/bodyfall2.ogg
new file mode 100644
index 00000000000..49f6cdd39ad
Binary files /dev/null and b/sound/effects/bodyfall2.ogg differ
diff --git a/sound/effects/bodyfall3.ogg b/sound/effects/bodyfall3.ogg
new file mode 100644
index 00000000000..5a3817510d7
Binary files /dev/null and b/sound/effects/bodyfall3.ogg differ
diff --git a/sound/effects/bodyfall4.ogg b/sound/effects/bodyfall4.ogg
new file mode 100644
index 00000000000..e6a1661c931
Binary files /dev/null and b/sound/effects/bodyfall4.ogg differ
diff --git a/sound/effects/can_open1.ogg b/sound/effects/can_open1.ogg
new file mode 100644
index 00000000000..4b38ab77038
Binary files /dev/null and b/sound/effects/can_open1.ogg differ
diff --git a/sound/effects/can_open2.ogg b/sound/effects/can_open2.ogg
new file mode 100644
index 00000000000..0b054c23c69
Binary files /dev/null and b/sound/effects/can_open2.ogg differ
diff --git a/sound/effects/can_open3.ogg b/sound/effects/can_open3.ogg
new file mode 100644
index 00000000000..4523c6f1fec
Binary files /dev/null and b/sound/effects/can_open3.ogg differ
diff --git a/sound/effects/canopen.ogg b/sound/effects/can_open4.ogg
similarity index 100%
rename from sound/effects/canopen.ogg
rename to sound/effects/can_open4.ogg
diff --git a/sound/effects/keyboard/keyboard1.ogg b/sound/effects/keyboard/keyboard1.ogg
new file mode 100644
index 00000000000..dc2b4bf3432
Binary files /dev/null and b/sound/effects/keyboard/keyboard1.ogg differ
diff --git a/sound/effects/keyboard/keyboard2.ogg b/sound/effects/keyboard/keyboard2.ogg
new file mode 100644
index 00000000000..35fbaedbf73
Binary files /dev/null and b/sound/effects/keyboard/keyboard2.ogg differ
diff --git a/sound/effects/keyboard/keyboard3.ogg b/sound/effects/keyboard/keyboard3.ogg
new file mode 100644
index 00000000000..01bd8d900c1
Binary files /dev/null and b/sound/effects/keyboard/keyboard3.ogg differ
diff --git a/sound/effects/keyboard/keyboard4.ogg b/sound/effects/keyboard/keyboard4.ogg
new file mode 100644
index 00000000000..8647c2b310d
Binary files /dev/null and b/sound/effects/keyboard/keyboard4.ogg differ
diff --git a/sound/effects/sparks5.ogg b/sound/effects/sparks5.ogg
new file mode 100644
index 00000000000..5ca7930dc8b
Binary files /dev/null and b/sound/effects/sparks5.ogg differ
diff --git a/sound/effects/sparks6.ogg b/sound/effects/sparks6.ogg
new file mode 100644
index 00000000000..4b0b268a0cf
Binary files /dev/null and b/sound/effects/sparks6.ogg differ
diff --git a/sound/effects/sparks7.ogg b/sound/effects/sparks7.ogg
new file mode 100644
index 00000000000..8abe22df91e
Binary files /dev/null and b/sound/effects/sparks7.ogg differ
diff --git a/sound/mecha/mechstep1.ogg b/sound/mecha/mechstep1.ogg
new file mode 100644
index 00000000000..ce7f51ad23e
Binary files /dev/null and b/sound/mecha/mechstep1.ogg differ
diff --git a/sound/mecha/mechstep2.ogg b/sound/mecha/mechstep2.ogg
new file mode 100644
index 00000000000..e828d9eadd4
Binary files /dev/null and b/sound/mecha/mechstep2.ogg differ
diff --git a/sound/weapons/casingfall1.ogg b/sound/weapons/casingfall1.ogg
new file mode 100644
index 00000000000..3f040fcbe27
Binary files /dev/null and b/sound/weapons/casingfall1.ogg differ
diff --git a/sound/weapons/casingfall2.ogg b/sound/weapons/casingfall2.ogg
new file mode 100644
index 00000000000..4372563dfba
Binary files /dev/null and b/sound/weapons/casingfall2.ogg differ
diff --git a/sound/weapons/casingfall3.ogg b/sound/weapons/casingfall3.ogg
new file mode 100644
index 00000000000..53c2395dcc0
Binary files /dev/null and b/sound/weapons/casingfall3.ogg differ