Skip to content

Commit

Permalink
Port shuttle sounds from RuPara (#767)
Browse files Browse the repository at this point in the history
## Что этот PR делает
Добавляет микрошаттлам звук перелёта. Меняет звук эвакуационному шаттлу.
closes #324


## Почему это хорошо для игры
Звук микрошаттлам меняется модульно, как сделать то же у эвакуационного
не додумался. Посмотрел прошлые ПРы на изменение звука, путь меняли
хардкодом xdd
Если критично, можно зарезать немодульные изменения и оставить звук
микрошаттлам.


## Тестирование
Trust me bro

## Changelog

:cl:
soundadd: Портировал звук шаттлу шахты и каторги. Портировал звук Харону
/:cl:

---------

Co-authored-by: AADry <[email protected]>
Co-authored-by: Aylong <[email protected]>
  • Loading branch information
3 people authored Nov 27, 2023
1 parent 3036f03 commit 8691e60
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 3 deletions.
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.

0 comments on commit 8691e60

Please sign in to comment.