Merge pull request #4138 from Fox-McCloud/door-sounds

New Airlock Sounds

code/datums/wires/wires.dm

@@ -113,6 +113,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 			holder.add_hiddenprint(L)
 			if(href_list["cut"]) // Toggles the cut/mend status
 				if(istype(I, /obj/item/weapon/wirecutters))
+					playsound(holder, 'sound/items/Wirecutter.ogg', 20, 1)
 					var/colour = href_list["cut"]
 					CutWireColour(colour)
 				else
@@ -120,6 +121,7 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown",
 
 			else if(href_list["pulse"])
 				if(istype(I, /obj/item/device/multitool))
+					playsound(holder, 'sound/weapons/empty.ogg', 20, 1)
 					var/colour = href_list["pulse"]
 					PulseColour(colour)
 				else

code/game/machinery/doors/airlock.dm

@@ -53,6 +53,11 @@
 	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/doorDeni = 'sound/machines/DeniedBeep.ogg' // i'm thinkin' Deni's
+	var/boltUp = 'sound/machines/BoltsUp.ogg'
+	var/boltDown = 'sound/machines/BoltsDown.ogg'
 
 /obj/machinery/door/airlock/command
 	name = "Airlock"
@@ -89,6 +94,8 @@
 	icon = 'icons/obj/doors/Doorglass.dmi'
 	opacity = 0
 	glass = 1
+	doorOpen = 'sound/machines/windowdoor.ogg'
+	doorClose = 'sound/machines/windowdoor.ogg'
 
 /obj/machinery/door/airlock/centcom
 	name = "Airlock"
@@ -249,11 +256,15 @@
 	name = "Bananium Airlock"
 	icon = 'icons/obj/doors/Doorbananium.dmi'
 	mineral = "clown"
+	doorOpen = 'sound/items/bikehorn.ogg'
+	doorClose = 'sound/items/bikehorn.ogg'
 
 /obj/machinery/door/airlock/mime
 	name = "Tranquillite Airlock"
 	icon = 'icons/obj/doors/Doorfreezer.dmi'
 	mineral = "mime"
+	doorOpen = null
+	doorClose = null
 
 /obj/machinery/door/airlock/sandstone
 	name = "Sandstone Airlock"
@@ -441,7 +452,7 @@ About the new airlock wires panel:
 	if(electrified_timer)
 		deltimer(electrified_timer)
 		electrified_timer = null
-	
+
 	var/message = ""
 	if(isWireCut(AIRLOCK_WIRE_ELECTRIFY) && arePowerSystemsOn())
 		message = text("The electrification wire is cut - Door permanently electrified.")
@@ -530,6 +541,7 @@ About the new airlock wires panel:
 				flick("door_spark", src)
 		if("deny")
 			if(density && src.arePowerSystemsOn())
+				playsound(src, doorDeni, 50, 0, 3)
 				flick("door_deny", src)
 	return
 
@@ -884,14 +896,8 @@ About the new airlock wires panel:
 	use_power(360)	//360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people
 	if(forced)
 		playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
-	else if(istype(src, /obj/machinery/door/airlock/glass))
-		playsound(src.loc, 'sound/machines/windowdoor.ogg', 100, 1)
-	else if(istype(src, /obj/machinery/door/airlock/clown))
-		playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
-	else if(istype(src, /obj/machinery/door/airlock/mime))
-		// Play nothing
 	else
-		playsound(src.loc, 'sound/machines/airlock.ogg', 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()
 	return ..()
@@ -915,14 +921,8 @@ About the new airlock wires panel:
 	use_power(360)	//360 W seems much more appropriate for an actuator moving an industrial door capable of crushing people
 	if(forced)
 		playsound(src.loc, 'sound/machines/airlockforced.ogg', 30, 1)
-	else if(istype(src, /obj/machinery/door/airlock/glass))
-		playsound(src.loc, 'sound/machines/windowdoor.ogg', 30, 1)
-	else if(istype(src, /obj/machinery/door/airlock/clown))
-		playsound(src.loc, 'sound/items/bikehorn.ogg', 30, 1)
-	else if(istype(src, /obj/machinery/door/airlock/mime))
-		// Do nothing
 	else
-		playsound(src.loc, 'sound/machines/airlock.ogg', 30, 1)
+		playsound(src.loc, doorClose, 30, 1)
 	var/obj/structure/window/killthis = (locate(/obj/structure/window) in get_turf(src))
 	if(killthis)
 		killthis.ex_act(2)//Smashin windows
@@ -956,8 +956,7 @@ About the new airlock wires panel:
 	if (operating && !forced) return 0
 
 	src.locked = 1
-	for(var/mob/M in range(1,src))
-		M.show_message("You hear a click from the bottom of the door.", 2)
+	playsound(src, boltDown, 30, 0, 3)
 	update_icon()
 	return 1
 
@@ -969,8 +968,7 @@ About the new airlock wires panel:
 		if(operating || !src.arePowerSystemsOn() || isWireCut(AIRLOCK_WIRE_DOOR_BOLTS)) return
 
 	src.locked = 0
-	for(var/mob/M in range(1,src))
-		M.show_message("You hear a click from the bottom of the door.", 2)
+	playsound(src,boltUp, 30, 0, 3)
 	update_icon()
 	return 1
 

code/game/machinery/doors/door.dm

@@ -74,7 +74,7 @@
 			if(mecha.occupant && (src.allowed(mecha.occupant) || src.check_access_list(mecha.operation_req_access) || emergency == 1))
 				open()
 			else
-				flick("door_deny", src)
+				do_animate("deny")
 		return
 	return
 
@@ -102,7 +102,7 @@
 				var/mob/living/simple_animal/bot/B = user
 				B.door_opened(src)
 		else
-			flick("door_deny", src)
+			do_animate("deny")
 	return
 
 /obj/machinery/door/attack_ai(mob/user as mob)
@@ -135,7 +135,7 @@
 			close()
 		return
 	if(src.density)
-		flick("door_deny", src)
+		do_animate("deny")
 	return
 
 /obj/machinery/door/emag_act(user as mob)