diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index b8db1c386a1..dd77e660bdf 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -376,6 +376,7 @@
if(best)
C << "You are now running on internals from [tankcheck[best]] [from] your [nicename[best]]."
+ playsound(usr, 'sound/effects/internals.ogg', 100, 1)
C.internal = tankcheck[best]
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 4c4fc65a95f..3d03b6339f6 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -15,8 +15,8 @@
var/storage_capacity = 40 //Tying this to mob sizes was dumb
//This is so that someone can't pack hundreds of items in a locker/crate
//then open it in a populated area to crash clients.
- var/open_sound = 'sound/machines/click.ogg'
- var/close_sound = 'sound/machines/click.ogg'
+ var/open_sound = 'sound/effects/locker_open.ogg'
+ var/close_sound = 'sound/effects/locker_close.ogg'
var/store_misc = 1
var/store_items = 1
@@ -135,7 +135,7 @@
src.icon_state = src.icon_closed
src.opened = 0
- playsound(src.loc, close_sound, 15, 1, -3)
+ playsound(src.loc, close_sound, 25, 0, -3)
density = 1
return 1
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index c8ccd4b32bd..3c9ea96225d 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -21,6 +21,7 @@
contents += O
has_extinguisher = O
user << "You place [O] in [src]."
+ playsound(src.loc, 'sound/effects/extin.ogg', 50, 0)
else
opened = !opened
else
@@ -42,6 +43,7 @@
if(has_extinguisher)
user.put_in_hands(has_extinguisher)
user << "You take [has_extinguisher] from [src]."
+ playsound(src.loc, 'sound/effects/extout.ogg', 50, 0)
has_extinguisher = null
opened = 1
else
diff --git a/code/game/sound.dm b/code/game/sound.dm
index a4c20342206..245883760ca 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -45,6 +45,7 @@ var/list/clown_sound = list('sound/effects/clownstep1.ogg','sound/effects/clowns
var/list/swing_hit_sound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
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')
//FOOTSTEPS
var/list/defaultfootsteps = list('sound/effects/footsteps/tile1.wav','sound/effects/footsteps/tile2.wav','sound/effects/footsteps/tile3.wav','sound/effects/footsteps/tile4.wav')
@@ -202,6 +203,7 @@ var/const/FALLOFF_SOUNDS = 0.5
if ("swing_hit") soundin = pick(swing_hit_sound)
if ("hiss") soundin = pick(hiss_sound)
if ("pageturn") soundin = pick(page_sound)
+ if ("fracture") soundin = pick(fracture_sound)
//if ("gunshot") soundin = pick(gun_sound)
if ("defaultstep") soundin = pick(defaultfootsteps)
if ("concretestep") soundin = pick(concretefootsteps)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index cba6aad1dfb..859cf5be23c 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -954,6 +954,8 @@
if(prob(80)) T.break_tile_to_plating()
else T.break_tile()
+ playsound(T, 'sound/effects/yamato_fire.ogg', 75, 1)
+
if(M.health == 1)
M.gib()
else
diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm
index 24db0a687d9..fb869443d55 100644
--- a/code/modules/awaymissions/bluespaceartillery.dm
+++ b/code/modules/awaymissions/bluespaceartillery.dm
@@ -26,7 +26,7 @@
dat += "Locked on
"
dat += "Charge progress: [reload]/180:
"
dat += "Open Fire
"
- dat += "Deployment of weapon authorized by
[company_name] Naval Command
Remember, friendly fire is grounds for termination of your contract and life.
"
+ dat += "Deployment of weapon authorized by
[company_name] Chief Naval Director
Remember, friendly fire is grounds for termination of your contract and life.
"
user << browse(dat, "window=scroll")
onclose(user, "scroll")
return
@@ -43,6 +43,7 @@
if(src.reload < 180) return
if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
command_announcement.Announce("Bluespace artillery fire detected. Brace for impact.")
+ world << sound('sound/effects/yamato_fire.ogg')
message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1)
var/list/L = list()
for(var/turf/T in get_area_turfs(thearea.type))
diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm
index 0e300b195da..fa4e1c3f530 100644
--- a/code/modules/multiz/structures.dm
+++ b/code/modules/multiz/structures.dm
@@ -17,6 +17,7 @@
var/base_icon = "ladder"
var/const/climb_time = 2 SECONDS
+ var/static/list/climbsounds = list('sound/effects/ladder.ogg','sound/effects/ladder2.ogg','sound/effects/ladder3.ogg','sound/effects/ladder4.ogg')
/obj/structure/ladder/Initialize()
. = ..()
@@ -54,15 +55,15 @@
var/obj/structure/ladder/target_ladder = getTargetLadder(M)
if(!target_ladder)
return
-
+
var/obj/item/weapon/grab/G = M.l_hand
if (!istype(G))
G = M.r_hand
-
+
if(!M.Move(get_turf(src)))
to_chat(M, "You fail to reach \the [src].")
return
-
+
if (istype(G))
G.affecting.forceMove(get_turf(src))
@@ -134,6 +135,8 @@
if(!A.CanPass(M, M.loc, 1.5, 0))
to_chat(M, "\The [A] is blocking \the [src].")
return FALSE
+ playsound(src, pick(climbsounds), 50)
+ playsound(target_ladder, pick(climbsounds), 50)
var/obj/item/weapon/grab/G = M.l_hand
if (!istype(G))
G = M.r_hand
diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm
index 3bf11af498d..cffd3632427 100644
--- a/code/modules/organs/organ_external.dm
+++ b/code/modules/organs/organ_external.dm
@@ -896,6 +896,7 @@ Note that amputating the affected organ does in fact remove the infection from t
if(owner.species && !(owner.species.flags & NO_PAIN))
owner.emote("scream")
+ playsound(src.loc, "fracture", 100, 1, -2)
status |= ORGAN_BROKEN
broken_description = pick("Broken","Fracture","Hairline fracture")
perma_injury = brute_dam
diff --git a/sound/effects/bonebreak1.ogg b/sound/effects/bonebreak1.ogg
new file mode 100644
index 00000000000..96e6487a240
Binary files /dev/null and b/sound/effects/bonebreak1.ogg differ
diff --git a/sound/effects/bonebreak2.ogg b/sound/effects/bonebreak2.ogg
new file mode 100644
index 00000000000..6f8c3c3806a
Binary files /dev/null and b/sound/effects/bonebreak2.ogg differ
diff --git a/sound/effects/bonebreak3.ogg b/sound/effects/bonebreak3.ogg
new file mode 100644
index 00000000000..54b90aa8471
Binary files /dev/null and b/sound/effects/bonebreak3.ogg differ
diff --git a/sound/effects/bonebreak4.ogg b/sound/effects/bonebreak4.ogg
new file mode 100644
index 00000000000..2139d1ad9e5
Binary files /dev/null and b/sound/effects/bonebreak4.ogg differ
diff --git a/sound/effects/extin.ogg b/sound/effects/extin.ogg
new file mode 100644
index 00000000000..30bbebeb118
Binary files /dev/null and b/sound/effects/extin.ogg differ
diff --git a/sound/effects/extout.ogg b/sound/effects/extout.ogg
new file mode 100644
index 00000000000..e1716a99d13
Binary files /dev/null and b/sound/effects/extout.ogg differ
diff --git a/sound/effects/internals.ogg b/sound/effects/internals.ogg
new file mode 100644
index 00000000000..a8c951df5e6
Binary files /dev/null and b/sound/effects/internals.ogg differ
diff --git a/sound/effects/ladder.ogg b/sound/effects/ladder.ogg
new file mode 100644
index 00000000000..7872c8a68a0
Binary files /dev/null and b/sound/effects/ladder.ogg differ
diff --git a/sound/effects/ladder2.ogg b/sound/effects/ladder2.ogg
new file mode 100644
index 00000000000..1af48947f97
Binary files /dev/null and b/sound/effects/ladder2.ogg differ
diff --git a/sound/effects/ladder3.ogg b/sound/effects/ladder3.ogg
new file mode 100644
index 00000000000..5d10cd6bcde
Binary files /dev/null and b/sound/effects/ladder3.ogg differ
diff --git a/sound/effects/ladder4.ogg b/sound/effects/ladder4.ogg
new file mode 100644
index 00000000000..94790afb9f7
Binary files /dev/null and b/sound/effects/ladder4.ogg differ
diff --git a/sound/effects/locker_close.ogg b/sound/effects/locker_close.ogg
new file mode 100644
index 00000000000..86913e51a26
Binary files /dev/null and b/sound/effects/locker_close.ogg differ
diff --git a/sound/effects/locker_open.ogg b/sound/effects/locker_open.ogg
new file mode 100644
index 00000000000..4a254c2b0b8
Binary files /dev/null and b/sound/effects/locker_open.ogg differ
diff --git a/sound/effects/yamato_fire.ogg b/sound/effects/yamato_fire.ogg
new file mode 100644
index 00000000000..3b38cb999ef
Binary files /dev/null and b/sound/effects/yamato_fire.ogg differ