diff --git a/code/game/machinery/doors/passworddoor.dm b/code/game/machinery/doors/passworddoor.dm index 7ef5462f688..2bd3a5320b4 100644 --- a/code/game/machinery/doors/passworddoor.dm +++ b/code/game/machinery/doors/passworddoor.dm @@ -60,10 +60,10 @@ switch(animation) if("opening") flick("opening", src) - playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE) + playsound(src, 'sound/machines/blastdoor.ogg', 50, TRUE) if("closing") flick("closing", src) - playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE) + playsound(src, 'sound/machines/blastdoor.ogg', 50, TRUE) if("deny") //Deny animation would be nice to have. playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index 929ec982f92..0924bcea712 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -14,9 +14,14 @@ resistance_flags = FIRE_PROOF damage_deflection = 70 can_open_with_hands = FALSE + /// The recipe for this door var/datum/crafting_recipe/recipe_type = /datum/crafting_recipe/blast_doors - var/deconstruction = BLASTDOOR_FINISHED // deconstruction step + /// The current deconstruction step + var/deconstruction = BLASTDOOR_FINISHED + /// The door's ID (used for buttons, etc to control the door) var/id = 1 + /// The sound that plays when the door opens/closes + var/animation_sound = 'sound/machines/blastdoor.ogg' /datum/armor/door_poddoor melee = 50 @@ -132,10 +137,10 @@ switch(animation) if("opening") flick("opening", src) - playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE) + playsound(src, animation_sound, 50, TRUE) if("closing") flick("closing", src) - playsound(src, 'sound/machines/blastdoor.ogg', 30, TRUE) + playsound(src, animation_sound, 50, TRUE) /obj/machinery/door/poddoor/update_icon_state() . = ..() diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm index c5c2940b408..5d390019f9b 100644 --- a/code/game/machinery/doors/shutters.dm +++ b/code/game/machinery/doors/shutters.dm @@ -9,6 +9,7 @@ armor_type = /datum/armor/poddoor_shutters max_integrity = 100 recipe_type = /datum/crafting_recipe/shutters + animation_sound = 'sound/machines/shutter.ogg' /obj/machinery/door/poddoor/shutters/preopen icon_state = "open" diff --git a/sound/effects/blastdoor.ogg b/sound/effects/blastdoor.ogg new file mode 100644 index 00000000000..5d62c271306 Binary files /dev/null and b/sound/effects/blastdoor.ogg differ diff --git a/sound/machines/license.txt b/sound/machines/license.txt index 7f3f99c7ed7..6a54969a191 100644 --- a/sound/machines/license.txt +++ b/sound/machines/license.txt @@ -5,3 +5,6 @@ They have been licensed under CC-BY 3.0, which can be found at http://creativeco coffeemaker_brew.ogg originally made by Adriana Lopez (Acekat13X31), edited to reduce length and added fade (https://freesound.org/people/Acekat13X31/sounds/515685/) This is licensed under CC-BY 4.0, found at https://creativecommons.org/licenses/by/4.0/ + +shutter.ogg adapted from Joseph Sardin on BigSoundBank +https://bigsoundbank.com/detail-2475-manual-roller-shutter-closing-out-2.html \ No newline at end of file diff --git a/sound/machines/shutter.ogg b/sound/machines/shutter.ogg new file mode 100644 index 00000000000..244a33c73b9 Binary files /dev/null and b/sound/machines/shutter.ogg differ