diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 37161d8a..2a94c8bb 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -79,8 +79,8 @@ var/doorOpen = 'sound/machines/airlock.ogg' var/doorClose = 'sound/machines/airlockclose.ogg' var/doorDeni = 'sound/machines/deniedbeep.ogg' // i'm thinkin' Deni's - var/boltUp = 'sound/machines/boltsup.ogg' - var/boltDown = 'sound/machines/boltsdown.ogg' + var/boltUp = 'hyperstation/sound/machines/BoltsUp.ogg' + var/boltDown = 'hyperstation/sound/machines/BoltsDown.ogg' var/noPower = 'sound/machines/doorclick.ogg' var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass" @@ -1155,7 +1155,7 @@ if(obj_flags & EMAGGED) return FALSE use_power(50) - playsound(src, doorOpen, 30, 1) + playsound(src, doorOpen, 40, 0) 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, 30, 1) + playsound(src.loc, doorClose, 40, 0) 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 af95ee23..3c496396 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -15,6 +15,8 @@ resistance_flags = FIRE_PROOF damage_deflection = 70 poddoor = TRUE + var/openSound = 'hyperstation/sound/machines/blastDoorOpen.ogg' + var/closeSound = 'hyperstation/sound/machines/blastDoorClose.ogg' /obj/machinery/door/poddoor/preopen icon_state = "open" @@ -72,10 +74,10 @@ switch(animation) if("opening") flick("opening", src) - playsound(src, 'sound/machines/blastdoor.ogg', 30, 1) + playsound(src, openSound, 20, 0) if("closing") flick("closing", src) - playsound(src, 'sound/machines/blastdoor.ogg', 30, 1) + playsound(src, closeSound, 20, 0) /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 362dde11..2ff25953 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -8,6 +8,8 @@ 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/machines/shutter.ogg' + closeSound = 'hyperstation/sound/machines/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 14d16c2c..26a2951e 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, 1) + playsound(src.loc, 'hyperstation/sound/machines/windowdoor.ogg', 70, 0) 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, 1) + playsound(src.loc, 'hyperstation/sound/machines/windowdoor.ogg', 70, 0) src.icon_state = src.base_state density = TRUE diff --git a/hyperstation/sound/machines/BoltsDown.ogg b/hyperstation/sound/machines/BoltsDown.ogg new file mode 100644 index 00000000..263776de Binary files /dev/null and b/hyperstation/sound/machines/BoltsDown.ogg differ diff --git a/hyperstation/sound/machines/BoltsUp.ogg b/hyperstation/sound/machines/BoltsUp.ogg new file mode 100644 index 00000000..202765c6 Binary files /dev/null and b/hyperstation/sound/machines/BoltsUp.ogg differ diff --git a/hyperstation/sound/machines/blastDoorClose.ogg b/hyperstation/sound/machines/blastDoorClose.ogg new file mode 100644 index 00000000..086c6b00 Binary files /dev/null and b/hyperstation/sound/machines/blastDoorClose.ogg differ diff --git a/hyperstation/sound/machines/blastDoorOpen.ogg b/hyperstation/sound/machines/blastDoorOpen.ogg new file mode 100644 index 00000000..2c605172 Binary files /dev/null and b/hyperstation/sound/machines/blastDoorOpen.ogg differ diff --git a/hyperstation/sound/machines/shutter.ogg b/hyperstation/sound/machines/shutter.ogg new file mode 100644 index 00000000..e1248aec Binary files /dev/null and b/hyperstation/sound/machines/shutter.ogg differ diff --git a/hyperstation/sound/machines/windowdoor.ogg b/hyperstation/sound/machines/windowdoor.ogg new file mode 100644 index 00000000..7bdeafd8 Binary files /dev/null and b/hyperstation/sound/machines/windowdoor.ogg differ