diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index a7f036afaf97..2522c6b93e61 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -392,7 +392,7 @@ if(time_left <= 50 && !sound_played) //4 seconds left - should sync up with the launch sound_played = 1 - var/hyperspace_sound = sound('sound/effects/hyperspace_begin.ogg') + var/hyperspace_sound = sound('modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_begin_new.ogg') //SS220 EDIT for(var/area/shuttle/escape/E in world) SEND_SOUND(E, hyperspace_sound) @@ -402,7 +402,7 @@ if(is_station_level(M.z)) //Will not launch from the mine/planet M.enterTransit() //now move the actual emergency shuttle to its transit dock - var/hyperspace_progress_sound = sound('sound/effects/hyperspace_progress.ogg') + var/hyperspace_progress_sound = sound('modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_progress_new.ogg') //SS220 EDIT for(var/area/shuttle/escape/E in world) SEND_SOUND(E, hyperspace_progress_sound) enterTransit() @@ -419,7 +419,7 @@ for(var/obj/docking_port/mobile/pod/M in SSshuttle.mobile) M.dock(SSshuttle.getDock("[M.id]_away")) - var/hyperspace_end_sound = sound('sound/effects/hyperspace_end.ogg') + var/hyperspace_end_sound = sound('modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_end_new.ogg') //SS220 EDIT for(var/area/shuttle/escape/E in world) SEND_SOUND(E, hyperspace_end_sound) diff --git a/modular_ss220/aesthetics_sounds/_aesthetics_sounds.dme b/modular_ss220/aesthetics_sounds/_aesthetics_sounds.dme index 2da956ec596f..6f194a6b7ed5 100644 --- a/modular_ss220/aesthetics_sounds/_aesthetics_sounds.dme +++ b/modular_ss220/aesthetics_sounds/_aesthetics_sounds.dme @@ -4,4 +4,5 @@ #include "code/closet.dm" #include "code/items.dm" #include "code/wilhelm.dm" +#include "code/shuttle.dm" #include "code/mindslave.dm" diff --git a/modular_ss220/aesthetics_sounds/code/shuttle.dm b/modular_ss220/aesthetics_sounds/code/shuttle.dm new file mode 100644 index 000000000000..b3e6346bb0ae --- /dev/null +++ b/modular_ss220/aesthetics_sounds/code/shuttle.dm @@ -0,0 +1,8 @@ +/obj/docking_port/mobile + var/fly_sound = 'modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_mini.ogg' + +/datum/controller/subsystem/shuttle/moveShuttle(shuttleId, dockId, timed, mob/user) + . = ..() + if(. == 0) + var/obj/docking_port/mobile/M = getShuttle(shuttleId) + M.areaInstance << M.fly_sound diff --git a/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_begin_new.ogg b/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_begin_new.ogg new file mode 100644 index 000000000000..a3c03f88a3f0 Binary files /dev/null and b/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_begin_new.ogg differ diff --git a/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_end_new.ogg b/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_end_new.ogg new file mode 100644 index 000000000000..8f8629e581f7 Binary files /dev/null and b/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_end_new.ogg differ diff --git a/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_mini.ogg b/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_mini.ogg new file mode 100644 index 000000000000..ee4d43fbb69c Binary files /dev/null and b/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_mini.ogg differ diff --git a/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_progress_new.ogg b/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_progress_new.ogg new file mode 100644 index 000000000000..d2b22b592be5 Binary files /dev/null and b/modular_ss220/aesthetics_sounds/sound/shuttle/hyperspace_progress_new.ogg differ