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.

Sign up for GitHub

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
Merged

Port shuttle sounds from RuPara #767

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62d03ea
Port shuttle sounds from RuParadise
AADry Nov 25, 2023
b999d7b
Merge branch 'master' of https://github.com/BoryaYeltsin/Paradise-SS220
AADry Nov 25, 2023
aa459a4
Place everything in aesthetics sounds module
HelmsDeepState Nov 26, 2023
54ea55b
place all in one aesthetics sounds
HelmsDeepState Nov 26, 2023
04372d1
small fixes
HelmsDeepState Nov 26, 2023
1225e9a
small fixes
HelmsDeepState Nov 26, 2023
4bb7bfa
Merge branch 'master' into master
HelmsDeepState Nov 27, 2023
d8f4bde
moved all code to shuttle.dm
HelmsDeepState Nov 27, 2023
2bbe524
Merge branch 'master' of https://github.com/BoryaYeltsin/Paradise-SS220
HelmsDeepState Nov 27, 2023
d535e06
small fix
HelmsDeepState Nov 27, 2023
284728e
Merge branch 'master' into master
AyIong Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/modules/shuttle/emergency.dm
View file
Open in desktop
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/shuttle_sounds/sound/hyperspace_begin_new.ogg') //SS220 EDIT
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
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/shuttle_sounds/sound/hyperspace_progress_new.ogg') //SS220 EDIT
HelmsDeepState marked this conversation as resolved.
Show resolved Hide resolved
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/shuttle_sounds/sound/hyperspace_end_new.ogg')
dj-34 marked this conversation as resolved.
Show resolved Hide resolved
for(var/area/shuttle/escape/E in world)
SEND_SOUND(E, hyperspace_end_sound)

Expand Down
1 change: 1 addition & 0 deletions modular_ss220/modular_ss220.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
#include "mecha_skins/mecha_skins.dme"
#include "queue/_queue.dme"
#include "phrases/_phrases.dme"
#include "shuttle_sounds/_shuttle_sounds.dme"

// --- PRIME --- //
// #define MODPACK_MAIN_ONLY
Expand Down
4 changes: 4 additions & 0 deletions modular_ss220/shuttle_sounds/_shuttle_sounds.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/datum/modpack/shuttle_sounds
name = "Shuttle sounds"
desc = "Новые звуки для шаттлов"
author = "HelmsDeepState, Captainelly, Furrior"
HelmsDeepState marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions modular_ss220/shuttle_sounds/_shuttle_sounds.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "_shuttle_sounds.dm"

#include "code/shuttle.dm"
#include "code/SSshuttles.dm"
5 changes: 5 additions & 0 deletions modular_ss220/shuttle_sounds/code/SSshuttles.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/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
2 changes: 2 additions & 0 deletions modular_ss220/shuttle_sounds/code/shuttle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/obj/docking_port/mobile
var/fly_sound = 'modular_ss220/shuttle_sounds/sound/hyperspace_mini.ogg'
Binary file added modular_ss220/shuttle_sounds/sound/hyperspace_begin_new.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/shuttle_sounds/sound/hyperspace_end_new.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/shuttle_sounds/sound/hyperspace_mini.ogg
View file
Open in desktop
Binary file not shown.
Binary file added modular_ss220/shuttle_sounds/sound/hyperspace_progress_new.ogg
View file
Open in desktop
Binary file not shown.
Loading