Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port shuttle sounds from RuPara #767

Merged
merged 11 commits into from
Nov 27, 2023
6 changes: 3 additions & 3 deletions code/modules/shuttle/emergency.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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()
Expand All @@ -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)

Expand Down
1 change: 1 addition & 0 deletions modular_ss220/aesthetics_sounds/_aesthetics_sounds.dme
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
#include "code/closet.dm"
#include "code/items.dm"
#include "code/wilhelm.dm"
#include "code/shuttle.dm"
#include "code/mindslave.dm"
8 changes: 8 additions & 0 deletions modular_ss220/aesthetics_sounds/code/shuttle.dm
Original file line number Diff line number Diff line change
@@ -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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.