diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 4d9a578b19a..4639f5d93cf 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -28,7 +28,7 @@ var/global/list/alt_heads_list = list() //stores /datum/sprite_accessory/alt_hea var/static/list/scarySounds = list('sound/weapons/thudswoosh.ogg','sound/weapons/Taser.ogg','sound/weapons/armbomb.ogg','sound/voice/hiss1.ogg','sound/voice/hiss2.ogg', \ 'sound/voice/hiss3.ogg','sound/voice/hiss4.ogg','sound/voice/hiss5.ogg','sound/voice/hiss6.ogg','sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg', \ -'sound/items/Welder.ogg','sound/items/Welder2.ogg','sound/machines/airlock.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg') +'sound/items/Welder.ogg','sound/items/Welder2.ogg','sound/machines/airlock_open.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg') // Reference list for disposal sort junctions. Set the sortType variable on disposal sort junctions to // the index of the sort department that you want. For example, sortType set to 2 will reroute all packages @@ -70,4 +70,4 @@ var/global/list/numbers_as_words = list("One", "Two", "Three", "Four", #define DBACKPACK "Department Backpack" #define DSATCHEL "Department Satchel" #define DDUFFLEBAG "Department Dufflebag" -var/global/list/backbaglist = list(DBACKPACK, DSATCHEL, DDUFFLEBAG, GBACKPACK, GSATCHEL, GDUFFLEBAG, LSATCHEL) \ No newline at end of file +var/global/list/backbaglist = list(DBACKPACK, DSATCHEL, DDUFFLEBAG, GBACKPACK, GSATCHEL, GDUFFLEBAG, LSATCHEL) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index ccacb4fef30..154b5e3d406 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -53,8 +53,8 @@ var/frozen = 0 //special condition for airlocks that are frozen shut, this will look weird on not normal airlocks because of a lack of special overlays. autoclose = 1 explosion_block = 1 - var/doorOpen = 'sound/machines/airlock.ogg' - var/doorClose = 'sound/machines/airlock.ogg' + var/doorOpen = 'sound/machines/airlock_open.ogg' + var/doorClose = 'sound/machines/airlock_close.ogg' var/doorDeni = 'sound/machines/DeniedBeep.ogg' // i'm thinkin' Deni's var/boltUp = 'sound/machines/BoltsUp.ogg' var/boltDown = 'sound/machines/BoltsDown.ogg' @@ -89,6 +89,8 @@ name = "External Airlock" icon = 'icons/obj/doors/Doorext.dmi' assembly_type = /obj/structure/door_assembly/door_assembly_ext + doorOpen = 'sound/machines/airlock_ext_open.ogg' + doorClose = 'sound/machines/airlock_ext_close.ogg' /obj/machinery/door/airlock/welded welded = 1 diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index a708e06fe93..77d0f971d6e 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -36,7 +36,7 @@ if(!density) return ..() return 0 - + /obj/machinery/door/firedoor/ex_act(severity) switch(severity) if(1.0) @@ -142,8 +142,10 @@ switch(animation) if("opening") flick("door_opening", src) + playsound(src, 'sound/machines/airlock_ext_open.ogg', 30, 1) if("closing") flick("door_closing", src) + playsound(src, 'sound/machines/airlock_ext_close.ogg', 30, 1) /obj/machinery/door/firedoor/update_icon() overlays.Cut() @@ -169,7 +171,7 @@ /obj/machinery/door/firedoor/open(auto_close = TRUE) . = ..() latetoggle(auto_close) - + if(auto_close) autoclose = TRUE diff --git a/code/modules/awaymissions/mission_code/spacehotel.dm b/code/modules/awaymissions/mission_code/spacehotel.dm index d1e9a9555be..357b0ca519e 100644 --- a/code/modules/awaymissions/mission_code/spacehotel.dm +++ b/code/modules/awaymissions/mission_code/spacehotel.dm @@ -92,8 +92,8 @@ icon = 'icons/obj/doors/Doorsand.dmi' icon_state = "door_closed" autoclose = 1 - var/doorOpen = 'sound/machines/airlock.ogg' - var/doorClose = 'sound/machines/airlock.ogg' + var/doorOpen = 'sound/machines/airlock_open.ogg' + var/doorClose = 'sound/machines/airlock_close.ogg' var/doorDeni = 'sound/machines/DeniedBeep.ogg' var/id // the room number, eg 101 var/obj/item/weapon/card/hotel_card/card// room's key card diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 26d22bc0610..a9b47376760 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -847,7 +847,7 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite // to_chat(src, "Strange Audio") switch(rand(1,18)) if(1) - playsound_local(null,'sound/machines/airlock.ogg', 15, 1) + playsound_local(null,'sound/machines/airlock_open.ogg', 15, 1) if(2) if(prob(50)) playsound_local(null,'sound/effects/Explosion1.ogg', 50, 1) diff --git a/sound/machines/airlock_close.ogg b/sound/machines/airlock_close.ogg new file mode 100644 index 00000000000..58a06817f00 Binary files /dev/null and b/sound/machines/airlock_close.ogg differ diff --git a/sound/machines/airlock_ext_close.ogg b/sound/machines/airlock_ext_close.ogg new file mode 100644 index 00000000000..7257136297b Binary files /dev/null and b/sound/machines/airlock_ext_close.ogg differ diff --git a/sound/machines/airlock_ext_open.ogg b/sound/machines/airlock_ext_open.ogg new file mode 100644 index 00000000000..e9613aaf843 Binary files /dev/null and b/sound/machines/airlock_ext_open.ogg differ diff --git a/sound/machines/airlock.ogg b/sound/machines/airlock_open.ogg similarity index 100% rename from sound/machines/airlock.ogg rename to sound/machines/airlock_open.ogg