diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 1d700fb7598..ac8d87c82be 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -53,7 +53,12 @@ var/list/airlock_overlays = list() var/autoclose = 1 var/obj/item/device/doorCharge/charge = null //If applied, causes an explosion upon opening the door var/detonated = 0 - var/doorsound = 'sound/machines/airlock.ogg' + 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/noPower = 'sound/machines/DoorClick.ogg' var/airlock_material = null //material of inner filling; if its an airlock with glass, this should be set to "glass" var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' @@ -87,6 +92,7 @@ var/list/airlock_overlays = list() if(locked) return locked = 1 + playsound(src,boltDown,30,0,3) update_icon() /obj/machinery/door/airlock/unlock() @@ -96,6 +102,7 @@ var/list/airlock_overlays = list() if(!locked) return locked = 0 + playsound(src,boltUp,30,0,3) update_icon() /obj/machinery/door/airlock/Destroy() @@ -348,6 +355,7 @@ var/list/airlock_overlays = list() update_icon(AIRLOCK_CLOSING) if("deny") update_icon(AIRLOCK_DENY) + playsound(src,doorDeni,50,0,3) sleep(6) update_icon(AIRLOCK_CLOSED) icon_state = "closed" @@ -957,7 +965,7 @@ var/list/airlock_overlays = list() if(emagged) return 0 use_power(50) - playsound(src.loc, doorsound, 30, 1) + playsound(src.loc, doorOpen, 30, 1) if(src.closeOther != null && istype(src.closeOther, /obj/machinery/door/airlock/) && !src.closeOther.density) src.closeOther.close() else @@ -1003,7 +1011,7 @@ var/list/airlock_overlays = list() if(emagged) return use_power(50) - playsound(src.loc, doorsound, 30, 1) + playsound(src.loc, doorClose, 30, 1) else playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 3e029901c3c..6e2e2e0b075 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -183,7 +183,7 @@ desc = "Honkhonkhonk" icon = 'icons/obj/doors/airlocks/station/bananium.dmi' var/mineral = "bananium" - doorsound = 'sound/items/bikehorn.ogg' + doorOpen = 'sound/items/bikehorn.ogg' doortype = /obj/structure/door_assembly/door_assembly_clown /obj/machinery/door/airlock/sandstone diff --git a/html/changelogs/cuboos.yml b/html/changelogs/cuboos.yml new file mode 100644 index 00000000000..9db289cef2d --- /dev/null +++ b/html/changelogs/cuboos.yml @@ -0,0 +1,35 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Cuboos + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - soundadd: "Modded the current door sound and added a few new ones, unique sound for closing, bolting up/down and a nifty denied sound." diff --git a/sound/machines/AirlockClose.ogg b/sound/machines/AirlockClose.ogg new file mode 100644 index 00000000000..58a06817f00 Binary files /dev/null and b/sound/machines/AirlockClose.ogg differ diff --git a/sound/machines/AirlockOpen.ogg b/sound/machines/AirlockOpen.ogg new file mode 100644 index 00000000000..0aac107d715 Binary files /dev/null and b/sound/machines/AirlockOpen.ogg differ diff --git a/sound/machines/BoltsDown.ogg b/sound/machines/BoltsDown.ogg new file mode 100644 index 00000000000..c7320a04dfe Binary files /dev/null and b/sound/machines/BoltsDown.ogg differ diff --git a/sound/machines/BoltsUp.ogg b/sound/machines/BoltsUp.ogg new file mode 100644 index 00000000000..bc422e28726 Binary files /dev/null and b/sound/machines/BoltsUp.ogg differ diff --git a/sound/machines/DeniedBeep.ogg b/sound/machines/DeniedBeep.ogg new file mode 100644 index 00000000000..2bcb70e70fb Binary files /dev/null and b/sound/machines/DeniedBeep.ogg differ diff --git a/sound/machines/DoorClick.ogg b/sound/machines/DoorClick.ogg new file mode 100644 index 00000000000..5a73889fb80 Binary files /dev/null and b/sound/machines/DoorClick.ogg differ