diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index c12b2a35..37161d8a 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -260,7 +260,7 @@
if(locked)
return
locked = TRUE
- playsound(src,boltDown,50,0,3)
+ playsound(src,boltDown,30,0,3)
audible_message("You hear a click from the bottom of the door.", null, 1)
update_icon()
@@ -271,7 +271,7 @@
if(!locked)
return
locked = FALSE
- playsound(src,boltUp,50,0,3)
+ playsound(src,boltUp,30,0,3)
audible_message("You hear a click from the bottom of the door.", null, 1)
update_icon()
@@ -1155,7 +1155,7 @@
if(obj_flags & EMAGGED)
return FALSE
use_power(50)
- playsound(src, doorOpen, 50, 0)
+ playsound(src, doorOpen, 30, 1)
if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density)
src.closeOther.close()
else
@@ -1202,7 +1202,7 @@
if(obj_flags & EMAGGED)
return
use_power(50)
- playsound(src.loc, doorClose, 50, 0)
+ playsound(src.loc, doorClose, 30, 1)
else
playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 2b92fa1d..af95ee23 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -15,8 +15,6 @@
resistance_flags = FIRE_PROOF
damage_deflection = 70
poddoor = TRUE
- var/openSound = 'hyperstation/sound/doors/blastDoorOpen.ogg'
- var/closeSound = 'hyperstation/sound/doors/blastDoorClose.ogg'
/obj/machinery/door/poddoor/preopen
icon_state = "open"
@@ -74,10 +72,10 @@
switch(animation)
if("opening")
flick("opening", src)
- playsound(src, openSound, 25, 0)
+ playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)
if("closing")
flick("closing", src)
- playsound(src, closeSound, 25, 0)
+ playsound(src, 'sound/machines/blastdoor.ogg', 30, 1)
/obj/machinery/door/poddoor/update_icon()
if(density)
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index fa6fe46c..362dde11 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -8,8 +8,6 @@
armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 75, "bomb" = 25, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 70)
damage_deflection = 20
max_integrity = 100
- openSound = 'hyperstation/sound/doors/shutter.ogg'
- closeSound = 'hyperstation/sound/doors/shutter.ogg'
/obj/machinery/door/poddoor/shutters/preopen
icon_state = "open"
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index 6d83c2ea..14d16c2c 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -141,7 +141,7 @@
if(!src.operating) //in case of emag
operating = TRUE
do_animate("opening")
- playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 0)
+ playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
src.icon_state ="[src.base_state]open"
sleep(10)
@@ -165,7 +165,7 @@
return 0
operating = TRUE
do_animate("closing")
- playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 0)
+ playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
src.icon_state = src.base_state
density = TRUE
diff --git a/hyperstation/sound/doors/blastDoorClose.ogg b/hyperstation/sound/doors/blastDoorClose.ogg
deleted file mode 100644
index 086c6b00..00000000
Binary files a/hyperstation/sound/doors/blastDoorClose.ogg and /dev/null differ
diff --git a/hyperstation/sound/doors/blastDoorOpen.ogg b/hyperstation/sound/doors/blastDoorOpen.ogg
deleted file mode 100644
index 2c605172..00000000
Binary files a/hyperstation/sound/doors/blastDoorOpen.ogg and /dev/null differ
diff --git a/hyperstation/sound/doors/shutter.ogg b/hyperstation/sound/doors/shutter.ogg
deleted file mode 100644
index e1248aec..00000000
Binary files a/hyperstation/sound/doors/shutter.ogg and /dev/null differ
diff --git a/sound/machines/AirlockClose.ogg b/sound/machines/AirlockClose.ogg
index 332c6e04..81a1dc1f 100644
Binary files a/sound/machines/AirlockClose.ogg and b/sound/machines/AirlockClose.ogg differ
diff --git a/sound/machines/AirlockOpen.ogg b/sound/machines/AirlockOpen.ogg
index 1a5b737c..0aac107d 100644
Binary files a/sound/machines/AirlockOpen.ogg and b/sound/machines/AirlockOpen.ogg differ
diff --git a/sound/machines/BoltsDown.ogg b/sound/machines/BoltsDown.ogg
index 2e689510..b5fe8e2c 100644
Binary files a/sound/machines/BoltsDown.ogg and b/sound/machines/BoltsDown.ogg differ
diff --git a/sound/machines/BoltsUp.ogg b/sound/machines/BoltsUp.ogg
index 8d39b7ae..72898337 100644
Binary files a/sound/machines/BoltsUp.ogg and b/sound/machines/BoltsUp.ogg differ
diff --git a/sound/machines/airlock.ogg b/sound/machines/airlock.ogg
index 1a5b737c..73618807 100644
Binary files a/sound/machines/airlock.ogg and b/sound/machines/airlock.ogg differ
diff --git a/sound/machines/airlockforced.ogg b/sound/machines/airlockforced.ogg
index 4caefc0b..9f2fc486 100644
Binary files a/sound/machines/airlockforced.ogg and b/sound/machines/airlockforced.ogg differ
diff --git a/sound/machines/bigairlockopen.ogg b/sound/machines/bigairlockopen.ogg
index 1a5b737c..3fe1bd4d 100644
Binary files a/sound/machines/bigairlockopen.ogg and b/sound/machines/bigairlockopen.ogg differ
diff --git a/sound/machines/blastdoor.ogg b/sound/machines/blastdoor.ogg
index 9f2ad674..2de1b559 100644
Binary files a/sound/machines/blastdoor.ogg and b/sound/machines/blastdoor.ogg differ
diff --git a/sound/machines/windowdoor.ogg b/sound/machines/windowdoor.ogg
index 7bdeafd8..bc753a3d 100644
Binary files a/sound/machines/windowdoor.ogg and b/sound/machines/windowdoor.ogg differ