diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index b96c140d126..94c7095cf81 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -225,8 +225,8 @@ var/area/area = get_area(src) for(var/obj/machinery/firealarm/FA in area) fire_alarm.triggerAlarm(loc, FA, duration) + playsound(FA.loc, 'sound/ambience/firealarm.ogg', 75, 0) update_icon() - //playsound(src.loc, 'sound/ambience/signal.ogg', 75, 0) return /obj/machinery/firealarm/proc/set_security_level(var/newlevel) diff --git a/code/modules/shuttles/shuttle.dm b/code/modules/shuttles/shuttle.dm index 9eb6187f3f1..cf501d90e12 100644 --- a/code/modules/shuttles/shuttle.dm +++ b/code/modules/shuttles/shuttle.dm @@ -126,6 +126,7 @@ else M << "The floor lurches beneath you!" shake_camera(M, 10, 1) + M.playsound_local(M.loc, 'sound/effects/shuttlelaunch.ogg', 100, 1, 0.5) if(istype(M, /mob/living/carbon)) if(!M.buckled) M.Weaken(3) diff --git a/html/changelogs/Ron-sounds.yml b/html/changelogs/Ron-sounds.yml new file mode 100644 index 00000000000..0a4f9581419 --- /dev/null +++ b/html/changelogs/Ron-sounds.yml @@ -0,0 +1,4 @@ +author: Ron +delete-after: True +changes: + - rscadd: "Added a sound for firealarms and the shuttle jumping somewhere." diff --git a/sound/ambience/firealarm.ogg b/sound/ambience/firealarm.ogg new file mode 100644 index 00000000000..ff6f8f62ad2 Binary files /dev/null and b/sound/ambience/firealarm.ogg differ diff --git a/sound/effects/shuttlelaunch.ogg b/sound/effects/shuttlelaunch.ogg new file mode 100644 index 00000000000..3be5ba46489 Binary files /dev/null and b/sound/effects/shuttlelaunch.ogg differ