diff --git a/code/datums/spell.dm b/code/datums/spell.dm
index 8fcd4b44ad..b267cc140e 100644
--- a/code/datums/spell.dm
+++ b/code/datums/spell.dm
@@ -80,9 +80,9 @@ var/list/spells = typesof(/obj/proc_holder/spell) //needed for the badmin verb f
if("shout")
usr.say(invocation)
if(usr.gender=="male")
- playsound(usr.loc, pick('vs_chant_conj_hm.wav','vs_chant_conj_lm.wav','vs_chant_ench_hm.wav','vs_chant_ench_lm.wav','vs_chant_evoc_hm.wav','vs_chant_evoc_lm.wav','vs_chant_illu_hm.wav','vs_chant_illu_lm.wav','vs_chant_necr_hm.wav','vs_chant_necr_lm.wav'), 100, 1)
+ playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
else
- playsound(usr.loc, pick('vs_chant_conj_hf.wav','vs_chant_conj_lf.wav','vs_chant_ench_hf.wav','vs_chant_ench_lf.wav','vs_chant_evoc_hf.wav','vs_chant_evoc_lf.wav','vs_chant_illu_hf.wav','vs_chant_illu_lf.wav','vs_chant_necr_hf.wav','vs_chant_necr_lf.wav'), 100, 1)
+ playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
if("whisper")
usr.whisper(invocation)
diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm
index cda227aa7a..fba4af6b7c 100644
--- a/code/datums/spells/area_teleport.dm
+++ b/code/datums/spells/area_teleport.dm
@@ -54,9 +54,9 @@
if("shout")
usr.say("[invocation] [uppertext(chosenarea.name)]")
if(usr.gender=="male")
- playsound(usr.loc, pick('vs_chant_conj_hm.wav','vs_chant_conj_lm.wav','vs_chant_ench_hm.wav','vs_chant_ench_lm.wav','vs_chant_evoc_hm.wav','vs_chant_evoc_lm.wav','vs_chant_illu_hm.wav','vs_chant_illu_lm.wav','vs_chant_necr_hm.wav','vs_chant_necr_lm.wav'), 100, 1)
+ playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
else
- playsound(usr.loc, pick('vs_chant_conj_hf.wav','vs_chant_conj_lf.wav','vs_chant_ench_hf.wav','vs_chant_ench_lf.wav','vs_chant_evoc_hf.wav','vs_chant_evoc_lf.wav','vs_chant_illu_hf.wav','vs_chant_illu_lf.wav','vs_chant_necr_hf.wav','vs_chant_necr_lf.wav'), 100, 1)
+ playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
if("whisper")
usr.whisper("[invocation] [uppertext(chosenarea.name)]")
diff --git a/code/defines/obj/closet.dm b/code/defines/obj/closet.dm
index 11d89844c6..2e3afcd7f9 100644
--- a/code/defines/obj/closet.dm
+++ b/code/defines/obj/closet.dm
@@ -79,7 +79,7 @@
if (isrobot(usr) || src.locked)
if(istype(O, /obj/item/device/multitool))
user << "\red Resetting circuitry..."
- playsound(user, 'lockreset.wav', 50, 1)
+ playsound(user, 'lockreset.ogg', 50, 1)
sleep(50) // Sleeping time~
src.locked = 0
user << "\blue You disable the locking modules."
@@ -137,7 +137,7 @@
sleep(50)
src.locked = 1
user << "\blue You re-enable the locking modules."
- playsound(user, 'lockenable.wav', 50, 1)
+ playsound(user, 'lockenable.ogg', 50, 1)
return
else
localopened = !localopened
diff --git a/code/game/cellautomata.dm b/code/game/cellautomata.dm
index 5e77622459..4113498c71 100644
--- a/code/game/cellautomata.dm
+++ b/code/game/cellautomata.dm
@@ -122,15 +122,15 @@
//Crispy fullban
/world/Reboot(var/reason)
spawn(0)
- world << sound(pick('newroundsexy.ogg','newroundsexy2.ogg')) // Skie
- //if(prob(40))
- // for(var/mob/M in world)
- // if(M.client)
- // M << sound('NewRound2.ogg')
- //else
- // for(var/mob/M in world)
- // if(M.client)
- // M << sound('NewRound.ogg')
+ world << sound(pick('newroundsexy.ogg','apcdestroyed.ogg')) // random end sounds!! - LastyBatsy
+ if(prob(40))
+ for(var/mob/M in world)
+ if(M.client)
+ M << sound('newroundsexy.ogg')
+ else
+ for(var/mob/M in world)
+ if(M.client)
+ M << sound('apcdestroyed.ogg')
for(var/client/C)
if (config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm
index ae2214543b..ac43a19f4c 100644
--- a/code/game/gamemodes/wizard/wizard.dm
+++ b/code/game/gamemodes/wizard/wizard.dm
@@ -663,9 +663,9 @@ Made a proc here so it's not repeated several times.*/
/mob/proc/spellvoice()
// if(!usr.miming)No longer necessary.
if(usr.gender=="male")
- playsound(usr.loc, pick('vs_chant_conj_hm.wav','vs_chant_conj_lm.wav','vs_chant_ench_hm.wav','vs_chant_ench_lm.wav','vs_chant_evoc_hm.wav','vs_chant_evoc_lm.wav','vs_chant_illu_hm.wav','vs_chant_illu_lm.wav','vs_chant_necr_hm.wav','vs_chant_necr_lm.wav'), 100, 1)
+ playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
else
- playsound(usr.loc, pick('vs_chant_conj_hf.wav','vs_chant_conj_lf.wav','vs_chant_ench_hf.wav','vs_chant_ench_lf.wav','vs_chant_evoc_hf.wav','vs_chant_evoc_lf.wav','vs_chant_illu_hf.wav','vs_chant_illu_lf.wav','vs_chant_necr_hf.wav','vs_chant_necr_lf.wav'), 100, 1)
+ playsound(usr.loc, pick('null.ogg','null.ogg'), 100, 1)
diff --git a/code/game/machinery/bots/ed209bot.dm b/code/game/machinery/bots/ed209bot.dm
index fef1990c30..bd3b4ef385 100644
--- a/code/game/machinery/bots/ed209bot.dm
+++ b/code/game/machinery/bots/ed209bot.dm
@@ -592,7 +592,7 @@ Auto Patrol: []"},
src.target = C
src.oldtarget_name = C.name
src.speak("Level [src.threatlevel] infraction alert!")
- playsound(src.loc, pick('ed209_20sec.ogg', 'ed209_15sec.ogg'), 50, 0)
+ playsound(src.loc, pick('ed209_20sec.ogg', 'EDPlaceholder.ogg'), 50, 0)
src.visible_message("[src] points at [C.name]!")
mode = SECBOT_HUNT
spawn(0)
diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm
index e29870c13d..eb7f3146bd 100644
--- a/code/game/objects/items/weapons/guns_new.dm
+++ b/code/game/objects/items/weapons/guns_new.dm
@@ -1078,7 +1078,7 @@
desc = "A heavy-duty laser cannon."
icon_state = "lasercannon"
force = 15
- fire_sound = 'lasercannonfire.wav'
+ fire_sound = 'lasercannonfire.ogg'
origin_tech = "combat=4;materials=3;powerstorage=3"
load_into_chamber()
if(in_chamber)
@@ -1098,7 +1098,7 @@
switch(mode)
if(0)
user << "\red [src.name] is now set to laser cannon."
- fire_sound = 'lasercannonfire.wav'
+ fire_sound = 'lasercannonfire.ogg'
charge_cost = 100
if(1)
user << "\red [src.name] is now set to laser."
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 042a5a4981..b8c126dbb5 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -98,10 +98,10 @@ KNIFE
M.weakened += 1
user.take_organ_damage(2)
if(prob(50))
- playsound(M, 'trayhit1.wav', 50, 1)
+ playsound(M, 'trayhit1.ogg', 50, 1)
return
else
- playsound(M, 'trayhit2.wav', 50, 1) //sound playin'
+ playsound(M, 'trayhit2.ogg', 50, 1) //sound playin'
return //it always returns, but I feel like adding an extra return just for safety's sakes. EDIT; Oh well I won't :3
var/mob/living/carbon/human/H = M ///////////////////////////////////// /Let's have this ready for later.
@@ -175,11 +175,11 @@ KNIFE
location.add_blood(H)
if(prob(50))
- // playsound(M, 'trayhit1.wav', 50, 1)
+ // playsound(M, 'trayhit1.ogg', 50, 1)
for(var/mob/O in viewers(M, null))
O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1)
else
- //playsound(M, 'trayhit2.wav', 50, 1) //sound playin' again
+ //playsound(M, 'trayhit2.ogg', 50, 1) //sound playin' again
for(var/mob/O in viewers(M, null))
O.show_message(text("\red [] slams [] in the face with the tray!", user, M), 1)
if(prob(30))
diff --git a/code/game/objects/mineral_doors.dm b/code/game/objects/mineral_doors.dm
index 9f43a0540f..c086926ea9 100644
--- a/code/game/objects/mineral_doors.dm
+++ b/code/game/objects/mineral_doors.dm
@@ -69,7 +69,7 @@
proc/Open()
isSwitchingStates = 1
- playsound(loc, 'stonedoor_openclose.wav', 100, 1)
+ playsound(loc, 'stonedoor_openclose.ogg', 100, 1)
flick("[mineralType]opening",src)
sleep(10)
density = 0
@@ -80,7 +80,7 @@
proc/Close()
isSwitchingStates = 1
- playsound(loc, 'stonedoor_openclose.wav', 100, 1)
+ playsound(loc, 'stonedoor_openclose.ogg', 100, 1)
flick("[mineralType]closing",src)
sleep(10)
density = 1
diff --git a/code/game/sound.dm b/code/game/sound.dm
index dcbd8aff63..51769e08e7 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -87,7 +87,7 @@ client/verb/Toggle_Soundscape()
if ("Engine Control") sound = pick('ambisin1.ogg','ambisin2.ogg','ambisin3.ogg','ambisin4.ogg')
if ("Atmospherics") sound = pick('ambiatm1.ogg')
if ("Mine")
- sound = pick('ambimine1.ogg','ambimine2.ogg')
+ sound = pick('null.ogg','null.ogg')
musVolume = 60
else sound = pick('ambigen1.ogg','ambigen3.ogg','ambigen4.ogg','ambigen5.ogg','ambigen6.ogg','ambigen7.ogg','ambigen8.ogg','ambigen9.ogg','ambigen10.ogg','ambigen11.ogg','ambigen12.ogg','ambigen14.ogg')
diff --git a/sound/ambience/signal.ogg b/sound/ambience/signal.ogg
new file mode 100644
index 0000000000..83de659ba7
Binary files /dev/null and b/sound/ambience/signal.ogg differ
diff --git a/sound/announcer/aliens.ogg b/sound/announcer/aliens.ogg
index 7488682cd1..f7d1746247 100644
Binary files a/sound/announcer/aliens.ogg and b/sound/announcer/aliens.ogg differ
diff --git a/sound/announcer/animes.ogg b/sound/announcer/animes.ogg
index 04b4f5ef25..a46a207edc 100644
Binary files a/sound/announcer/animes.ogg and b/sound/announcer/animes.ogg differ
diff --git a/sound/announcer/commandreport.ogg b/sound/announcer/commandreport.ogg
index 0979e57546..82e4ca425d 100644
Binary files a/sound/announcer/commandreport.ogg and b/sound/announcer/commandreport.ogg differ
diff --git a/sound/announcer/granomalies.ogg b/sound/announcer/granomalies.ogg
index 9debabcd06..89b368d596 100644
Binary files a/sound/announcer/granomalies.ogg and b/sound/announcer/granomalies.ogg differ
diff --git a/sound/announcer/intercept.ogg b/sound/announcer/intercept.ogg
index ede4cb1c19..040b4e4f8d 100644
Binary files a/sound/announcer/intercept.ogg and b/sound/announcer/intercept.ogg differ
diff --git a/sound/announcer/ionstorm.ogg b/sound/announcer/ionstorm.ogg
index fc8d11ca82..9f39713de6 100644
Binary files a/sound/announcer/ionstorm.ogg and b/sound/announcer/ionstorm.ogg differ
diff --git a/sound/announcer/meteors.ogg b/sound/announcer/meteors.ogg
index d6d5d8ec7b..8f1c3aeacb 100644
Binary files a/sound/announcer/meteors.ogg and b/sound/announcer/meteors.ogg differ
diff --git a/sound/announcer/newroundsexy.ogg b/sound/announcer/newroundsexy.ogg
index d0db1d9526..afe5630f04 100644
Binary files a/sound/announcer/newroundsexy.ogg and b/sound/announcer/newroundsexy.ogg differ
diff --git a/sound/announcer/newroundsexy2.ogg b/sound/announcer/newroundsexy2.ogg
index 5921576678..531bba1001 100644
Binary files a/sound/announcer/newroundsexy2.ogg and b/sound/announcer/newroundsexy2.ogg differ
diff --git a/sound/announcer/outbreak5.ogg b/sound/announcer/outbreak5.ogg
index 78406fbc87..39c79c920f 100644
Binary files a/sound/announcer/outbreak5.ogg and b/sound/announcer/outbreak5.ogg differ
diff --git a/sound/announcer/outbreak7.ogg b/sound/announcer/outbreak7.ogg
index 1ee09e4497..f21d4fca44 100644
Binary files a/sound/announcer/outbreak7.ogg and b/sound/announcer/outbreak7.ogg differ
diff --git a/sound/announcer/poweroff.ogg b/sound/announcer/poweroff.ogg
index c842b931f5..1c6377c9d8 100644
Binary files a/sound/announcer/poweroff.ogg and b/sound/announcer/poweroff.ogg differ
diff --git a/sound/announcer/poweron.ogg b/sound/announcer/poweron.ogg
index 891ad3beb2..9d18797d6e 100644
Binary files a/sound/announcer/poweron.ogg and b/sound/announcer/poweron.ogg differ
diff --git a/sound/announcer/radiation.ogg b/sound/announcer/radiation.ogg
index 29deae8342..ef395af310 100644
Binary files a/sound/announcer/radiation.ogg and b/sound/announcer/radiation.ogg differ
diff --git a/sound/announcer/shuttlecalled.ogg b/sound/announcer/shuttlecalled.ogg
index 4ccbb26172..716bf82465 100644
Binary files a/sound/announcer/shuttlecalled.ogg and b/sound/announcer/shuttlecalled.ogg differ
diff --git a/sound/announcer/shuttledock.ogg b/sound/announcer/shuttledock.ogg
index 460f41831b..0f70bebc75 100644
Binary files a/sound/announcer/shuttledock.ogg and b/sound/announcer/shuttledock.ogg differ
diff --git a/sound/announcer/shuttlerecalled.ogg b/sound/announcer/shuttlerecalled.ogg
index c1a8638a78..5f6db404b8 100644
Binary files a/sound/announcer/shuttlerecalled.ogg and b/sound/announcer/shuttlerecalled.ogg differ
diff --git a/sound/announcer/spanomalies.ogg b/sound/announcer/spanomalies.ogg
index 47b482e222..7680726f15 100644
Binary files a/sound/announcer/spanomalies.ogg and b/sound/announcer/spanomalies.ogg differ
diff --git a/sound/announcer/welcome.ogg b/sound/announcer/welcome.ogg
index 20d804b8b7..c7013dcbd5 100644
Binary files a/sound/announcer/welcome.ogg and b/sound/announcer/welcome.ogg differ
diff --git a/sound/bots/EDPlaceholder.ogg b/sound/bots/EDPlaceholder.ogg
new file mode 100644
index 0000000000..501f8f33c3
Binary files /dev/null and b/sound/bots/EDPlaceholder.ogg differ
diff --git a/sound/bots/ed209_20sec.ogg b/sound/bots/ed209_20sec.ogg
index cf2ce43429..d1ab901084 100644
Binary files a/sound/bots/ed209_20sec.ogg and b/sound/bots/ed209_20sec.ogg differ
diff --git a/sound/effects/bubbles2.ogg b/sound/effects/bubbles2.ogg
index 8f946d733b..6cd52f0f43 100644
Binary files a/sound/effects/bubbles2.ogg and b/sound/effects/bubbles2.ogg differ
diff --git a/sound/effects/stonedoor_openclose.ogg b/sound/effects/stonedoor_openclose.ogg
new file mode 100644
index 0000000000..9f3919ed65
Binary files /dev/null and b/sound/effects/stonedoor_openclose.ogg differ
diff --git a/sound/items/AirHorn.ogg b/sound/items/AirHorn.ogg
index f7068fd1bf..f70e6bf137 100644
Binary files a/sound/items/AirHorn.ogg and b/sound/items/AirHorn.ogg differ
diff --git a/sound/items/trayhit1.ogg b/sound/items/trayhit1.ogg
new file mode 100644
index 0000000000..4eb48c680e
Binary files /dev/null and b/sound/items/trayhit1.ogg differ
diff --git a/sound/items/trayhit2.ogg b/sound/items/trayhit2.ogg
new file mode 100644
index 0000000000..066e44bf0b
Binary files /dev/null and b/sound/items/trayhit2.ogg differ
diff --git a/sound/machines/Alarm.ogg b/sound/machines/Alarm.ogg
index 5d4d1333a7..2aec35bd32 100644
Binary files a/sound/machines/Alarm.ogg and b/sound/machines/Alarm.ogg differ
diff --git a/sound/machines/blender.ogg b/sound/machines/blender.ogg
index 55caddd813..2497b97e01 100644
Binary files a/sound/machines/blender.ogg and b/sound/machines/blender.ogg differ
diff --git a/sound/machines/juicer.ogg b/sound/machines/juicer.ogg
index 43c5edb661..dad905fc6c 100644
Binary files a/sound/machines/juicer.ogg and b/sound/machines/juicer.ogg differ
diff --git a/sound/misc/apcdestroyed.ogg b/sound/misc/apcdestroyed.ogg
new file mode 100644
index 0000000000..7fe77dd523
Binary files /dev/null and b/sound/misc/apcdestroyed.ogg differ
diff --git a/sound/misc/bangindonk.ogg b/sound/misc/bangindonk.ogg
new file mode 100644
index 0000000000..b3a3624de5
Binary files /dev/null and b/sound/misc/bangindonk.ogg differ
diff --git a/sound/misc/lockenable.ogg b/sound/misc/lockenable.ogg
new file mode 100644
index 0000000000..5003b3fe15
Binary files /dev/null and b/sound/misc/lockenable.ogg differ
diff --git a/sound/misc/lockreset.ogg b/sound/misc/lockreset.ogg
new file mode 100644
index 0000000000..6f61430ad7
Binary files /dev/null and b/sound/misc/lockreset.ogg differ
diff --git a/sound/voice/hiss1.ogg b/sound/voice/hiss1.ogg
index ccb6161da0..f226d32c4a 100644
Binary files a/sound/voice/hiss1.ogg and b/sound/voice/hiss1.ogg differ
diff --git a/sound/voice/hiss2.ogg b/sound/voice/hiss2.ogg
index 1646ae98d6..f518943aec 100644
Binary files a/sound/voice/hiss2.ogg and b/sound/voice/hiss2.ogg differ
diff --git a/sound/voice/hiss3.ogg b/sound/voice/hiss3.ogg
index 79dfae542e..380f43194f 100644
Binary files a/sound/voice/hiss3.ogg and b/sound/voice/hiss3.ogg differ
diff --git a/sound/voice/hiss4.ogg b/sound/voice/hiss4.ogg
index 3e1867dc5e..7a3365610d 100644
Binary files a/sound/voice/hiss4.ogg and b/sound/voice/hiss4.ogg differ
diff --git a/sound/voice/hiss5.ogg b/sound/voice/hiss5.ogg
index 10ddbe0769..522ead8751 100644
Binary files a/sound/voice/hiss5.ogg and b/sound/voice/hiss5.ogg differ
diff --git a/sound/voice/hiss6.ogg b/sound/voice/hiss6.ogg
index 6c7b75d8a2..af82cbd975 100644
Binary files a/sound/voice/hiss6.ogg and b/sound/voice/hiss6.ogg differ
diff --git a/sound/voice/nominal.ogg b/sound/voice/nominal.ogg
index 96ddea32c1..3b44021e78 100644
Binary files a/sound/voice/nominal.ogg and b/sound/voice/nominal.ogg differ
diff --git a/sound/weapons/lasercannonfire.ogg b/sound/weapons/lasercannonfire.ogg
new file mode 100644
index 0000000000..612d608db8
Binary files /dev/null and b/sound/weapons/lasercannonfire.ogg differ